diff --git a/README.txt b/README.txt index 024548d..b967678 100644 --- a/README.txt +++ b/README.txt @@ -60,6 +60,7 @@ Action controls: I - Enter inventory. Q - Examine pointed block. H - Use item in hand. +======= T - Talk / commands. K - Toggle fly mode. F1 - Hide / show hud. diff --git a/data/textures/apple_blossom.png b/data/textures/apple_blossom.png index 4189c31..3d70ea4 100644 Binary files a/data/textures/apple_blossom.png and b/data/textures/apple_blossom.png differ diff --git a/data/textures/apple_leaves.png b/data/textures/apple_leaves.png index b5e2a5e..7823544 100644 Binary files a/data/textures/apple_leaves.png and b/data/textures/apple_leaves.png differ diff --git a/data/textures/bed_bottom.png b/data/textures/bed_bottom.png index eb93ce1..2dfe02f 100644 Binary files a/data/textures/bed_bottom.png and b/data/textures/bed_bottom.png differ diff --git a/data/textures/bucket_lava.png b/data/textures/bucket_lava.png new file mode 100644 index 0000000..7148698 Binary files /dev/null and b/data/textures/bucket_lava.png differ diff --git a/data/textures/bucket_water.png b/data/textures/bucket_water.png new file mode 100644 index 0000000..a81db5c Binary files /dev/null and b/data/textures/bucket_water.png differ diff --git a/data/textures/clay_black.png b/data/textures/clay_black.png index d98c240..6a2d7e0 100644 Binary files a/data/textures/clay_black.png and b/data/textures/clay_black.png differ diff --git a/data/textures/clay_blue.png b/data/textures/clay_blue.png index 3e50c1d..91aebe1 100644 Binary files a/data/textures/clay_blue.png and b/data/textures/clay_blue.png differ diff --git a/data/textures/clay_green.png b/data/textures/clay_green.png index b20732f..90bf5e7 100644 Binary files a/data/textures/clay_green.png and b/data/textures/clay_green.png differ diff --git a/data/textures/clay_orange.png b/data/textures/clay_orange.png index a7df91d..741965a 100644 Binary files a/data/textures/clay_orange.png and b/data/textures/clay_orange.png differ diff --git a/data/textures/clay_purple.png b/data/textures/clay_purple.png index f355886..4fca0b7 100644 Binary files a/data/textures/clay_purple.png and b/data/textures/clay_purple.png differ diff --git a/data/textures/clay_red.png b/data/textures/clay_red.png index b17f364..c9c050d 100644 Binary files a/data/textures/clay_red.png and b/data/textures/clay_red.png differ diff --git a/data/textures/clay_yellow.png b/data/textures/clay_yellow.png index 21cbe22..23c3360 100644 Binary files a/data/textures/clay_yellow.png and b/data/textures/clay_yellow.png differ diff --git a/data/textures/clothes_player_boots_fur.png b/data/textures/clothes_player_boots_fur.png index 0b47e1f..9a4226f 100644 Binary files a/data/textures/clothes_player_boots_fur.png and b/data/textures/clothes_player_boots_fur.png differ diff --git a/data/textures/clothes_player_boots_fur_black.png b/data/textures/clothes_player_boots_fur_black.png index 3df15b6..64f987a 100644 Binary files a/data/textures/clothes_player_boots_fur_black.png and b/data/textures/clothes_player_boots_fur_black.png differ diff --git a/data/textures/clothes_player_boots_fur_blue.png b/data/textures/clothes_player_boots_fur_blue.png index 642b28f..a1f9dd3 100644 Binary files a/data/textures/clothes_player_boots_fur_blue.png and b/data/textures/clothes_player_boots_fur_blue.png differ diff --git a/data/textures/clothes_player_boots_fur_brown.png b/data/textures/clothes_player_boots_fur_brown.png index 93f9efc..9a4226f 100644 Binary files a/data/textures/clothes_player_boots_fur_brown.png and b/data/textures/clothes_player_boots_fur_brown.png differ diff --git a/data/textures/clothes_player_boots_fur_green.png b/data/textures/clothes_player_boots_fur_green.png index be0d157..3d3e21f 100644 Binary files a/data/textures/clothes_player_boots_fur_green.png and b/data/textures/clothes_player_boots_fur_green.png differ diff --git a/data/textures/clothes_player_boots_fur_orange.png b/data/textures/clothes_player_boots_fur_orange.png index 0b7c68a..affb2f8 100644 Binary files a/data/textures/clothes_player_boots_fur_orange.png and b/data/textures/clothes_player_boots_fur_orange.png differ diff --git a/data/textures/clothes_player_boots_fur_purple.png b/data/textures/clothes_player_boots_fur_purple.png index d247535..1de51c9 100644 Binary files a/data/textures/clothes_player_boots_fur_purple.png and b/data/textures/clothes_player_boots_fur_purple.png differ diff --git a/data/textures/clothes_player_boots_fur_red.png b/data/textures/clothes_player_boots_fur_red.png index e5cb876..88c7464 100644 Binary files a/data/textures/clothes_player_boots_fur_red.png and b/data/textures/clothes_player_boots_fur_red.png differ diff --git a/data/textures/clothes_player_boots_fur_white.png b/data/textures/clothes_player_boots_fur_white.png index 0d6907a..83226c2 100644 Binary files a/data/textures/clothes_player_boots_fur_white.png and b/data/textures/clothes_player_boots_fur_white.png differ diff --git a/data/textures/clothes_player_boots_fur_yellow.png b/data/textures/clothes_player_boots_fur_yellow.png index f8e95a3..9070864 100644 Binary files a/data/textures/clothes_player_boots_fur_yellow.png and b/data/textures/clothes_player_boots_fur_yellow.png differ diff --git a/data/textures/clothes_player_boots_space.png b/data/textures/clothes_player_boots_space.png index 5d11e7e..bfc113d 100644 Binary files a/data/textures/clothes_player_boots_space.png and b/data/textures/clothes_player_boots_space.png differ diff --git a/data/textures/clothes_player_helmet_space.png b/data/textures/clothes_player_helmet_space.png index 7fc1d58..9f0becc 100644 Binary files a/data/textures/clothes_player_helmet_space.png and b/data/textures/clothes_player_helmet_space.png differ diff --git a/data/textures/clothes_player_pants_space.png b/data/textures/clothes_player_pants_space.png index 85bda8c..8ccf8b6 100644 Binary files a/data/textures/clothes_player_pants_space.png and b/data/textures/clothes_player_pants_space.png differ diff --git a/data/textures/clothes_player_shirt_space.png b/data/textures/clothes_player_shirt_space.png index edc64d4..ead721a 100644 Binary files a/data/textures/clothes_player_shirt_space.png and b/data/textures/clothes_player_shirt_space.png differ diff --git a/data/textures/clothes_player_spaceshirt.png b/data/textures/clothes_player_spaceshirt.png index edc64d4..7f867dd 100644 Binary files a/data/textures/clothes_player_spaceshirt.png and b/data/textures/clothes_player_spaceshirt.png differ diff --git a/data/textures/cobble.png b/data/textures/cobble.png index b57fe02..23eccdc 100644 Binary files a/data/textures/cobble.png and b/data/textures/cobble.png differ diff --git a/data/textures/cotton.png b/data/textures/cotton.png index 98f59bb..99220a9 100644 Binary files a/data/textures/cotton.png and b/data/textures/cotton.png differ diff --git a/data/textures/cotton_black.png b/data/textures/cotton_black.png index 477ee70..23b2308 100644 Binary files a/data/textures/cotton_black.png and b/data/textures/cotton_black.png differ diff --git a/data/textures/cotton_blue.png b/data/textures/cotton_blue.png index 127e0e6..b78fa6c 100644 Binary files a/data/textures/cotton_blue.png and b/data/textures/cotton_blue.png differ diff --git a/data/textures/cotton_green.png b/data/textures/cotton_green.png index d76e025..0f1e003 100644 Binary files a/data/textures/cotton_green.png and b/data/textures/cotton_green.png differ diff --git a/data/textures/cotton_orange.png b/data/textures/cotton_orange.png index 3994d96..c00ddfb 100644 Binary files a/data/textures/cotton_orange.png and b/data/textures/cotton_orange.png differ diff --git a/data/textures/cotton_purple.png b/data/textures/cotton_purple.png index 1a525df..7e46a67 100644 Binary files a/data/textures/cotton_purple.png and b/data/textures/cotton_purple.png differ diff --git a/data/textures/cotton_red.png b/data/textures/cotton_red.png index 10039bc..bda08d7 100644 Binary files a/data/textures/cotton_red.png and b/data/textures/cotton_red.png differ diff --git a/data/textures/cotton_yellow.png b/data/textures/cotton_yellow.png index 2c26853..ffcc697 100644 Binary files a/data/textures/cotton_yellow.png and b/data/textures/cotton_yellow.png differ diff --git a/data/textures/door_glass_b.png b/data/textures/door_glass_b.png index f3b1ace..8bc52f2 100644 Binary files a/data/textures/door_glass_b.png and b/data/textures/door_glass_b.png differ diff --git a/data/textures/door_glass_inv.png b/data/textures/door_glass_inv.png index eb45c51..440925f 100644 Binary files a/data/textures/door_glass_inv.png and b/data/textures/door_glass_inv.png differ diff --git a/data/textures/door_glass_t.png b/data/textures/door_glass_t.png index 1db275a..e282b0f 100644 Binary files a/data/textures/door_glass_t.png and b/data/textures/door_glass_t.png differ diff --git a/data/textures/flag.png b/data/textures/flag.png index fccdb16..9b1d904 100644 Binary files a/data/textures/flag.png and b/data/textures/flag.png differ diff --git a/data/textures/flag_black.png b/data/textures/flag_black.png index f54792d..33add11 100644 Binary files a/data/textures/flag_black.png and b/data/textures/flag_black.png differ diff --git a/data/textures/flag_blue.png b/data/textures/flag_blue.png index 7ed90cc..df361eb 100644 Binary files a/data/textures/flag_blue.png and b/data/textures/flag_blue.png differ diff --git a/data/textures/flag_green.png b/data/textures/flag_green.png index a6bad0f..36875fd 100644 Binary files a/data/textures/flag_green.png and b/data/textures/flag_green.png differ diff --git a/data/textures/flag_orange.png b/data/textures/flag_orange.png index 46de64f..fa3419c 100644 Binary files a/data/textures/flag_orange.png and b/data/textures/flag_orange.png differ diff --git a/data/textures/flag_purple.png b/data/textures/flag_purple.png index 490b04f..b7f0290 100644 Binary files a/data/textures/flag_purple.png and b/data/textures/flag_purple.png differ diff --git a/data/textures/flag_red.png b/data/textures/flag_red.png index cf34e8a..7db8586 100644 Binary files a/data/textures/flag_red.png and b/data/textures/flag_red.png differ diff --git a/data/textures/flag_yellow.png b/data/textures/flag_yellow.png index 40f3434..e8607e4 100644 Binary files a/data/textures/flag_yellow.png and b/data/textures/flag_yellow.png differ diff --git a/data/textures/footsteps.png b/data/textures/footsteps.png index 5dbfd2c..d29c901 100644 Binary files a/data/textures/footsteps.png and b/data/textures/footsteps.png differ diff --git a/data/textures/gate_steel.png b/data/textures/gate_steel.png deleted file mode 100644 index 751cbfe..0000000 Binary files a/data/textures/gate_steel.png and /dev/null differ diff --git a/data/textures/gate_wood.png b/data/textures/gate_wood.png deleted file mode 100644 index 4dab536..0000000 Binary files a/data/textures/gate_wood.png and /dev/null differ diff --git a/data/textures/glass.png b/data/textures/glass.png index d9a2e86..3884899 100644 Binary files a/data/textures/glass.png and b/data/textures/glass.png differ diff --git a/data/textures/glass_black.png b/data/textures/glass_black.png deleted file mode 100644 index 475bf9b..0000000 Binary files a/data/textures/glass_black.png and /dev/null differ diff --git a/data/textures/glass_blue.png b/data/textures/glass_blue.png deleted file mode 100644 index 93246d8..0000000 Binary files a/data/textures/glass_blue.png and /dev/null differ diff --git a/data/textures/glass_green.png b/data/textures/glass_green.png deleted file mode 100644 index ef8e097..0000000 Binary files a/data/textures/glass_green.png and /dev/null differ diff --git a/data/textures/glass_orange.png b/data/textures/glass_orange.png deleted file mode 100644 index f924751..0000000 Binary files a/data/textures/glass_orange.png and /dev/null differ diff --git a/data/textures/glass_pane_black_side.png b/data/textures/glass_pane_black_side.png index b215ebf..eb2e9d5 100644 Binary files a/data/textures/glass_pane_black_side.png and b/data/textures/glass_pane_black_side.png differ diff --git a/data/textures/glass_pane_blue_side.png b/data/textures/glass_pane_blue_side.png index a372531..0edf491 100644 Binary files a/data/textures/glass_pane_blue_side.png and b/data/textures/glass_pane_blue_side.png differ diff --git a/data/textures/glass_pane_green_side.png b/data/textures/glass_pane_green_side.png index cce2df9..6cb444f 100644 Binary files a/data/textures/glass_pane_green_side.png and b/data/textures/glass_pane_green_side.png differ diff --git a/data/textures/glass_pane_orange_side.png b/data/textures/glass_pane_orange_side.png index bd215ed..afc2439 100644 Binary files a/data/textures/glass_pane_orange_side.png and b/data/textures/glass_pane_orange_side.png differ diff --git a/data/textures/glass_pane_purple_side.png b/data/textures/glass_pane_purple_side.png index 4646f4b..5a9edb4 100644 Binary files a/data/textures/glass_pane_purple_side.png and b/data/textures/glass_pane_purple_side.png differ diff --git a/data/textures/glass_pane_red_side.png b/data/textures/glass_pane_red_side.png index f8d17f9..a5716b7 100644 Binary files a/data/textures/glass_pane_red_side.png and b/data/textures/glass_pane_red_side.png differ diff --git a/data/textures/glass_pane_side.png b/data/textures/glass_pane_side.png index 72dc274..6b0c4d1 100644 Binary files a/data/textures/glass_pane_side.png and b/data/textures/glass_pane_side.png differ diff --git a/data/textures/glass_pane_yellow_side.png b/data/textures/glass_pane_yellow_side.png index 57abe1e..38f8cff 100644 Binary files a/data/textures/glass_pane_yellow_side.png and b/data/textures/glass_pane_yellow_side.png differ diff --git a/data/textures/glass_purple.png b/data/textures/glass_purple.png deleted file mode 100644 index d6b003d..0000000 Binary files a/data/textures/glass_purple.png and /dev/null differ diff --git a/data/textures/glass_red.png b/data/textures/glass_red.png deleted file mode 100644 index 28cf1fe..0000000 Binary files a/data/textures/glass_red.png and /dev/null differ diff --git a/data/textures/glass_slab.png b/data/textures/glass_slab.png index 77f86cb..b9f386d 100644 Binary files a/data/textures/glass_slab.png and b/data/textures/glass_slab.png differ diff --git a/data/textures/glass_slab_black.png b/data/textures/glass_slab_black.png deleted file mode 100644 index 1a6e120..0000000 Binary files a/data/textures/glass_slab_black.png and /dev/null differ diff --git a/data/textures/glass_slab_blue.png b/data/textures/glass_slab_blue.png deleted file mode 100644 index 4719805..0000000 Binary files a/data/textures/glass_slab_blue.png and /dev/null differ diff --git a/data/textures/glass_slab_green.png b/data/textures/glass_slab_green.png deleted file mode 100644 index 32014f7..0000000 Binary files a/data/textures/glass_slab_green.png and /dev/null differ diff --git a/data/textures/glass_slab_orange.png b/data/textures/glass_slab_orange.png deleted file mode 100644 index e2ba011..0000000 Binary files a/data/textures/glass_slab_orange.png and /dev/null differ diff --git a/data/textures/glass_slab_purple.png b/data/textures/glass_slab_purple.png deleted file mode 100644 index b1103e7..0000000 Binary files a/data/textures/glass_slab_purple.png and /dev/null differ diff --git a/data/textures/glass_slab_red.png b/data/textures/glass_slab_red.png deleted file mode 100644 index aa863c2..0000000 Binary files a/data/textures/glass_slab_red.png and /dev/null differ diff --git a/data/textures/glass_slab_yellow.png b/data/textures/glass_slab_yellow.png deleted file mode 100644 index 91c180d..0000000 Binary files a/data/textures/glass_slab_yellow.png and /dev/null differ diff --git a/data/textures/glass_yellow.png b/data/textures/glass_yellow.png deleted file mode 100644 index 13f8e47..0000000 Binary files a/data/textures/glass_yellow.png and /dev/null differ diff --git a/data/textures/grass.png b/data/textures/grass.png index e8bb80d..c501c68 100644 Binary files a/data/textures/grass.png and b/data/textures/grass.png differ diff --git a/data/textures/grass_autumn.png b/data/textures/grass_autumn.png index 7696601..2c9686f 100644 Binary files a/data/textures/grass_autumn.png and b/data/textures/grass_autumn.png differ diff --git a/data/textures/grass_corner.png b/data/textures/grass_corner.png index 46a84bf..c854d07 100644 Binary files a/data/textures/grass_corner.png and b/data/textures/grass_corner.png differ diff --git a/data/textures/grass_corner_autumn.png b/data/textures/grass_corner_autumn.png new file mode 100644 index 0000000..f0f4efb Binary files /dev/null and b/data/textures/grass_corner_autumn.png differ diff --git a/data/textures/grass_corner_jungle.png b/data/textures/grass_corner_jungle.png index 361da15..1178847 100644 Binary files a/data/textures/grass_corner_jungle.png and b/data/textures/grass_corner_jungle.png differ diff --git a/data/textures/grass_corner_spring.png b/data/textures/grass_corner_spring.png index 21eb24b..b6f90b0 100644 Binary files a/data/textures/grass_corner_spring.png and b/data/textures/grass_corner_spring.png differ diff --git a/data/textures/grass_growing.png b/data/textures/grass_growing.png index 4d38e65..efd7578 100644 Binary files a/data/textures/grass_growing.png and b/data/textures/grass_growing.png differ diff --git a/data/textures/grass_growing_autumn.png b/data/textures/grass_growing_autumn.png index 3268ba0..188b190 100644 Binary files a/data/textures/grass_growing_autumn.png and b/data/textures/grass_growing_autumn.png differ diff --git a/data/textures/grass_growing_jungle.png b/data/textures/grass_growing_jungle.png index d25e443..ff92a8f 100644 Binary files a/data/textures/grass_growing_jungle.png and b/data/textures/grass_growing_jungle.png differ diff --git a/data/textures/grass_jungle.png b/data/textures/grass_jungle.png index 8888c07..9d8344a 100644 Binary files a/data/textures/grass_jungle.png and b/data/textures/grass_jungle.png differ diff --git a/data/textures/grass_side.png b/data/textures/grass_side.png index 7218e5e..b436e65 100644 Binary files a/data/textures/grass_side.png and b/data/textures/grass_side.png differ diff --git a/data/textures/grass_side_autumn.png b/data/textures/grass_side_autumn.png index 5521de3..c57dc66 100644 Binary files a/data/textures/grass_side_autumn.png and b/data/textures/grass_side_autumn.png differ diff --git a/data/textures/grass_side_jungle.png b/data/textures/grass_side_jungle.png index 77e329c..58fdead 100644 Binary files a/data/textures/grass_side_jungle.png and b/data/textures/grass_side_jungle.png differ diff --git a/data/textures/jungleleaves.png b/data/textures/jungleleaves.png index 1572243..f61bfea 100644 Binary files a/data/textures/jungleleaves.png and b/data/textures/jungleleaves.png differ diff --git a/data/textures/jungletree.png b/data/textures/jungletree.png index a101403..4b4e181 100644 Binary files a/data/textures/jungletree.png and b/data/textures/jungletree.png differ diff --git a/data/textures/jungletree_top.png b/data/textures/jungletree_top.png index f0585dc..433bed2 100644 Binary files a/data/textures/jungletree_top.png and b/data/textures/jungletree_top.png differ diff --git a/data/textures/lava.png b/data/textures/lava.png index a4cf649..ef56526 100644 Binary files a/data/textures/lava.png and b/data/textures/lava.png differ diff --git a/data/textures/leaves.png b/data/textures/leaves.png index f9c4bb7..3e3ad93 100644 Binary files a/data/textures/leaves.png and b/data/textures/leaves.png differ diff --git a/data/textures/limestone.png b/data/textures/limestone.png index a7270dc..05d64c4 100644 Binary files a/data/textures/limestone.png and b/data/textures/limestone.png differ diff --git a/data/textures/mob_fish.png b/data/textures/mob_fish.png index f674d62..78d89aa 100644 Binary files a/data/textures/mob_fish.png and b/data/textures/mob_fish.png differ diff --git a/data/textures/mossycobble.png b/data/textures/mossycobble.png index f4d7d90..11e9606 100644 Binary files a/data/textures/mossycobble.png and b/data/textures/mossycobble.png differ diff --git a/data/textures/mud.png b/data/textures/mud.png index 2353df7..6fe0789 100644 Binary files a/data/textures/mud.png and b/data/textures/mud.png differ diff --git a/data/textures/snow.png b/data/textures/snow.png index d9bdf67..a5e423b 100644 Binary files a/data/textures/snow.png and b/data/textures/snow.png differ diff --git a/data/textures/snow_side.png b/data/textures/snow_side.png index 6909fc3..55f58b1 100644 Binary files a/data/textures/snow_side.png and b/data/textures/snow_side.png differ diff --git a/data/textures/stone.png b/data/textures/stone.png index 3463833..7e87645 100644 Binary files a/data/textures/stone.png and b/data/textures/stone.png differ diff --git a/data/textures/tool_steelbucket.png b/data/textures/tool_steelbucket.png index 57f7718..7ef4297 100644 Binary files a/data/textures/tool_steelbucket.png and b/data/textures/tool_steelbucket.png differ diff --git a/data/textures/tool_steelbucket_lava.png b/data/textures/tool_steelbucket_lava.png deleted file mode 100644 index 9821e5d..0000000 Binary files a/data/textures/tool_steelbucket_lava.png and /dev/null differ diff --git a/data/textures/tool_steelbucket_water.png b/data/textures/tool_steelbucket_water.png deleted file mode 100644 index 686cde9..0000000 Binary files a/data/textures/tool_steelbucket_water.png and /dev/null differ diff --git a/data/textures/tool_tinbucket.png b/data/textures/tool_tinbucket.png index ca364ff..e862306 100644 Binary files a/data/textures/tool_tinbucket.png and b/data/textures/tool_tinbucket.png differ diff --git a/data/textures/tool_woodbucket.png b/data/textures/tool_woodbucket.png index 0ac233f..6acb34b 100644 Binary files a/data/textures/tool_woodbucket.png and b/data/textures/tool_woodbucket.png differ diff --git a/data/textures/tool_woodbucket_water.png b/data/textures/tool_woodbucket_water.png deleted file mode 100644 index 25fff45..0000000 Binary files a/data/textures/tool_woodbucket_water.png and /dev/null differ diff --git a/data/textures/tree.png b/data/textures/tree.png index 4dc2a7d..ee8a3de 100644 Binary files a/data/textures/tree.png and b/data/textures/tree.png differ diff --git a/data/textures/wood.png b/data/textures/wood.png index 674c581..faa1ab3 100644 Binary files a/data/textures/wood.png and b/data/textures/wood.png differ diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index 0126eca..1388b00 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -890,11 +890,11 @@ void content_mapnode_init(bool repeat) f->draw_type = CDT_GLASSLIKE; f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; - f->setAllTextures("glass_blue.png"); + f->setAllTextures("glass.png^glass_pane_blue_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif - f->setInventoryTextureCube("glass_blue.png", "glass_blue.png", "glass_blue.png"); + f->setInventoryTextureCube("glass.png^glass_pane_blue_side.png", "glass.png^glass_pane_blue_side.png", "glass.png^glass_pane_blue_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_GLASS,CONTENT_GLASS_BLUE); @@ -910,11 +910,11 @@ void content_mapnode_init(bool repeat) f->draw_type = CDT_GLASSLIKE; f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; - f->setAllTextures("glass_green.png"); + f->setAllTextures("glass.png^glass_pane_green_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif - f->setInventoryTextureCube("glass_green.png", "glass_green.png", "glass_green.png"); + f->setInventoryTextureCube("glass.png^glass_pane_green_side.png", "glass.png^glass_pane_green_side.png", "glass.png^glass_pane_green_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_GREEN,CONTENT_GLASS,CONTENT_GLASS_GREEN); @@ -930,11 +930,11 @@ void content_mapnode_init(bool repeat) f->draw_type = CDT_GLASSLIKE; f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; - f->setAllTextures("glass_orange.png"); + f->setAllTextures("glass.png^glass_pane_orange_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif - f->setInventoryTextureCube("glass_orange.png", "glass_orange.png", "glass_orange.png"); + f->setInventoryTextureCube("glass.png^glass_pane_orange_side.png", "glass.png^glass_pane_orange_side.png", "glass.png^glass_pane_orange_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_ORANGE,CONTENT_GLASS,CONTENT_GLASS_ORANGE); @@ -950,11 +950,11 @@ void content_mapnode_init(bool repeat) f->draw_type = CDT_GLASSLIKE; f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; - f->setAllTextures("glass_purple.png"); + f->setAllTextures("glass.png^glass_pane_purple_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif - f->setInventoryTextureCube("glass_purple.png", "glass_purple.png", "glass_purple.png"); + f->setInventoryTextureCube("glass.png^glass_pane_purple_side.png", "glass.png^glass_pane_purple_side.png", "glass.png^glass_pane_purple_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_PURPLE,CONTENT_GLASS,CONTENT_GLASS_PURPLE); @@ -970,11 +970,11 @@ void content_mapnode_init(bool repeat) f->draw_type = CDT_GLASSLIKE; f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; - f->setAllTextures("glass_red.png"); + f->setAllTextures("glass.png^glass_pane_red_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif - f->setInventoryTextureCube("glass_red.png", "glass_red.png", "glass_red.png"); + f->setInventoryTextureCube("glass.png^glass_pane_red_side.png", "glass.png^glass_pane_red_side.png", "glass.png^glass_pane_red_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_RED,CONTENT_GLASS,CONTENT_GLASS_RED); @@ -990,11 +990,11 @@ void content_mapnode_init(bool repeat) f->draw_type = CDT_GLASSLIKE; f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; - f->setAllTextures("glass_yellow.png"); + f->setAllTextures("glass.png^glass_pane_yellow_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif - f->setInventoryTextureCube("glass_yellow.png", "glass_yellow.png", "glass_yellow.png"); + f->setInventoryTextureCube("glass.png^glass_pane_yellow_side.png", "glass.png^glass_pane_yellow_side.png", "glass.png^glass_pane_yellow_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_GLASS,CONTENT_GLASS_YELLOW); @@ -1010,11 +1010,11 @@ void content_mapnode_init(bool repeat) f->draw_type = CDT_GLASSLIKE; f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; - f->setAllTextures("glass_black.png"); + f->setAllTextures("glass.png^glass_pane_black_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif - f->setInventoryTextureCube("glass_black.png", "glass_black.png", "glass_black.png"); + f->setInventoryTextureCube("glass.png^glass_pane_black_side.png", "glass.png^glass_pane_black_side.png", "glass.png^glass_pane_black_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLACK,CONTENT_GLASS,CONTENT_GLASS_BLACK); @@ -1065,8 +1065,8 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->setAllTextures("glass_pane_blue_side.png"); - f->setTexture(4,"glass_blue.png"); - f->setTexture(5,"glass_blue.png"); + f->setTexture(4,"glass.png^glass_pane_blue_side.png"); + f->setTexture(5,"glass.png^glass_pane_blue_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif @@ -1078,7 +1078,7 @@ void content_mapnode_init(bool repeat) 0.5*BS, 0.05*BS )); - f->setInventoryTextureNodeBox(i,"glass_pane_blue_side.png", "glass_blue.png", "glass_pane_blue_side.png"); + f->setInventoryTextureNodeBox(i,"glass_pane_blue_side.png", "glass.png^glass_pane_blue_side.png", "glass_pane_blue_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->pressure_type = CST_CRUSHABLE; @@ -1099,8 +1099,8 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->setAllTextures("glass_pane_green_side.png"); - f->setTexture(4,"glass_green.png"); - f->setTexture(5,"glass_green.png"); + f->setTexture(4,"glass.png^glass_pane_green_side.png"); + f->setTexture(5,"glass.png^glass_pane_green_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif @@ -1112,7 +1112,7 @@ void content_mapnode_init(bool repeat) 0.5*BS, 0.05*BS )); - f->setInventoryTextureNodeBox(i,"glass_pane_green_side.png", "glass_green.png", "glass_pane_green_side.png"); + f->setInventoryTextureNodeBox(i,"glass_pane_green_side.png", "glass.png^glass_pane_green_side.png", "glass_pane_green_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->pressure_type = CST_CRUSHABLE; @@ -1133,8 +1133,8 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->setAllTextures("glass_pane_orange_side.png"); - f->setTexture(4,"glass_orange.png"); - f->setTexture(5,"glass_orange.png"); + f->setTexture(4,"glass.png^glass_pane_orange_side.png"); + f->setTexture(5,"glass.png^glass_pane_orange_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif @@ -1146,7 +1146,7 @@ void content_mapnode_init(bool repeat) 0.5*BS, 0.05*BS )); - f->setInventoryTextureNodeBox(i,"glass_pane_orange_side.png", "glass_orange.png", "glass_pane_orange_side.png"); + f->setInventoryTextureNodeBox(i,"glass_pane_orange_side.png", "glass.png^glass_pane_orange_side.png", "glass_pane_orange_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->pressure_type = CST_CRUSHABLE; @@ -1167,8 +1167,8 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->setAllTextures("glass_pane_purple_side.png"); - f->setTexture(4,"glass_purple.png"); - f->setTexture(5,"glass_purple.png"); + f->setTexture(4,"glass.png^glass_pane_purple_side.png"); + f->setTexture(5,"glass.png^glass_pane_purple_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif @@ -1180,7 +1180,7 @@ void content_mapnode_init(bool repeat) 0.5*BS, 0.05*BS )); - f->setInventoryTextureNodeBox(i,"glass_pane_purple_side.png", "glass_purple.png", "glass_pane_purple_side.png"); + f->setInventoryTextureNodeBox(i,"glass_pane_purple_side.png", "glass.png^glass_pane_purple_side.png", "glass_pane_purple_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->pressure_type = CST_CRUSHABLE; @@ -1201,8 +1201,8 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->setAllTextures("glass_pane_red_side.png"); - f->setTexture(4,"glass_red.png"); - f->setTexture(5,"glass_red.png"); + f->setTexture(4,"glass.png^glass_pane_red_side.png"); + f->setTexture(5,"glass.png^glass_pane_red_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif @@ -1214,7 +1214,7 @@ void content_mapnode_init(bool repeat) 0.5*BS, 0.05*BS )); - f->setInventoryTextureNodeBox(i,"glass_pane_red_side.png", "glass_red.png", "glass_pane_red_side.png"); + f->setInventoryTextureNodeBox(i,"glass_pane_red_side.png", "glass.png^glass_pane_red_side.png", "glass_pane_red_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->pressure_type = CST_CRUSHABLE; @@ -1235,8 +1235,8 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->setAllTextures("glass_pane_yellow_side.png"); - f->setTexture(4,"glass_yellow.png"); - f->setTexture(5,"glass_yellow.png"); + f->setTexture(4,"glass.png^glass_pane_yellow_side.png"); + f->setTexture(5,"glass.png^glass_pane_yellow_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif @@ -1248,7 +1248,7 @@ void content_mapnode_init(bool repeat) 0.5*BS, 0.05*BS )); - f->setInventoryTextureNodeBox(i,"glass_pane_yellow_side.png", "glass_yellow.png", "glass_pane_yellow_side.png"); + f->setInventoryTextureNodeBox(i,"glass_pane_yellow_side.png", "glass.png^glass_pane_yellow_side.png", "glass_pane_yellow_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->pressure_type = CST_CRUSHABLE; @@ -1269,8 +1269,8 @@ void content_mapnode_init(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->setAllTextures("glass_pane_black_side.png"); - f->setTexture(4,"glass_black.png"); - f->setTexture(5,"glass_black.png"); + f->setTexture(4,"glass.png^glass_pane_black_side.png"); + f->setTexture(5,"glass.png^glass_pane_black_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif @@ -1282,7 +1282,7 @@ void content_mapnode_init(bool repeat) 0.5*BS, 0.05*BS )); - f->setInventoryTextureNodeBox(i,"glass_pane_black_side.png", "glass_black.png", "glass_pane_black_side.png"); + f->setInventoryTextureNodeBox(i,"glass_pane_black_side.png", "glass.png^glass_pane_black_side.png", "glass_pane_black_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->pressure_type = CST_CRUSHABLE; diff --git a/src/content_mapnode_door.cpp b/src/content_mapnode_door.cpp index 09983a0..02ec3bb 100644 --- a/src/content_mapnode_door.cpp +++ b/src/content_mapnode_door.cpp @@ -156,6 +156,9 @@ void content_mapnode_door(bool repeat) f->setTexture(2,"door_glass_b.png^[transformFX"); f->setTexture(3,"door_glass_b.png^[transformFX"); f->setTexture(4,"door_glass_b.png^[transformFX"); +#ifndef SERVER + f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); +#endif f->setInventoryTexture("door_glass_inv.png"); f->wield_nodebox = false; f->param_type = CPT_LIGHT; @@ -181,6 +184,9 @@ void content_mapnode_door(bool repeat) f->setTexture(2,"door_glass_t.png^[transformFX"); f->setTexture(3,"door_glass_t.png^[transformFX"); f->setTexture(4,"door_glass_t.png^[transformFX"); +#ifndef SERVER + f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); +#endif f->setInventoryTexture("door_glass_inv.png"); f->wield_nodebox = false; f->param_type = CPT_LIGHT; @@ -389,6 +395,9 @@ void content_mapnode_door(bool repeat) f->setTexture(2,"door_glass_b.png"); f->setTexture(3,"door_glass_b.png"); f->setTexture(4,"door_glass_b.png"); +#ifndef SERVER + f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); +#endif f->setInventoryTexture("door_glass_inv.png^[transformFX"); f->wield_nodebox = false; f->param_type = CPT_LIGHT; @@ -415,6 +424,9 @@ void content_mapnode_door(bool repeat) f->setTexture(2,"door_glass_t.png"); f->setTexture(3,"door_glass_t.png"); f->setTexture(4,"door_glass_t.png"); +#ifndef SERVER + f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); +#endif f->setInventoryTexture("door_glass_inv.png^[transformFX"); f->wield_nodebox = false; f->param_type = CPT_LIGHT; @@ -670,6 +682,9 @@ void content_mapnode_door(bool repeat) f->description = wgettext("Glass Door"); f->setAllTextures("door_glass_b.png"); f->setTexture(3,"door_glass_b.png^[transformFX"); +#ifndef SERVER + f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); +#endif f->setInventoryTexture("door_glass_inv.png"); f->wield_nodebox = false; f->param_type = CPT_LIGHT; @@ -694,6 +709,9 @@ void content_mapnode_door(bool repeat) f->description = wgettext("Glass Door"); f->setAllTextures("door_glass_t.png"); f->setTexture(3,"door_glass_t.png^[transformFX"); +#ifndef SERVER + f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); +#endif f->setInventoryTexture("door_glass_inv.png"); f->wield_nodebox = false; f->param_type = CPT_LIGHT; @@ -934,6 +952,9 @@ void content_mapnode_door(bool repeat) f->setTexture(2,"door_glass_b.png^[transformFX"); f->setTexture(3,"door_glass_b.png^[transformFX"); f->setTexture(4,"door_glass_b.png^[transformFX"); +#ifndef SERVER + f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); +#endif f->setInventoryTexture("door_glass_inv.png^[transformFX"); f->wield_nodebox = false; f->param_type = CPT_LIGHT; @@ -960,6 +981,9 @@ void content_mapnode_door(bool repeat) f->setTexture(2,"door_glass_t.png^[transformFX"); f->setTexture(3,"door_glass_t.png^[transformFX"); f->setTexture(4,"door_glass_t.png^[transformFX"); +#ifndef SERVER + f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); +#endif f->setInventoryTexture("door_glass_inv.png^[transformFX"); f->wield_nodebox = false; f->param_type = CPT_LIGHT; @@ -972,7 +996,6 @@ void content_mapnode_door(bool repeat) f->onact_also_affects = v3s16(0,-1,0); f->onpunch_replace_node = CONTENT_GLASS_DOOR_RT; f->sound_punch = "env-doorclose"; - f->fuel_time = 30; content_nodebox_dooror(f); f->type = CMT_GLASS; f->hardness = 0.15; @@ -1437,7 +1460,7 @@ void content_mapnode_door(bool repeat) f = &content_features(i); f->param2_type = CPT_FACEDIR_SIMPLE; f->description = wgettext("Wood Gate"); - f->setAllTextures("gate_wood.png"); + f->setAllTextures("wood.png"); f->rotate_tile_with_nodebox = true; f->setInventoryTexture("gate_wood_inv.png"); f->wield_nodebox = false; @@ -1462,7 +1485,7 @@ void content_mapnode_door(bool repeat) f = &content_features(i); f->param2_type = CPT_FACEDIR_SIMPLE; f->description = wgettext("Steel Gate"); - f->setAllTextures("gate_steel.png"); + f->setAllTextures("steel.png"); f->rotate_tile_with_nodebox = true; f->setInventoryTexture("gate_steel_inv.png"); f->wield_nodebox = false; diff --git a/src/content_mapnode_slab.cpp b/src/content_mapnode_slab.cpp index 870ed85..6026a6c 100644 --- a/src/content_mapnode_slab.cpp +++ b/src/content_mapnode_slab.cpp @@ -196,7 +196,7 @@ void content_mapnode_slab(bool repeat) f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slab(f); - f->setInventoryTextureNodeBox(i,"glass.png", "glass_slab.png", "glass_slab.png"); + f->setInventoryTextureNodeBox(i,"glass.png", "glass_slab.png", "glass_slab.png^glass.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -214,14 +214,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_BLUE; - f->setAllTextures("glass_slab_blue.png"); - f->setTexture(0,"glass_blue.png"); - f->setTexture(1,"glass_blue.png"); + f->setAllTextures("glass_slab.png^glass_pane_blue_side.png"); + f->setTexture(0,"glass.png^glass_pane_blue_side.png"); + f->setTexture(1,"glass.png^glass_pane_blue_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slab(f); - f->setInventoryTextureNodeBox(i,"glass_blue.png", "glass_slab_blue.png", "glass_slab_blue.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_blue_side.png", "glass_slab.png^glass_pane_blue_side.png", "glass_slab.png^glass_pane_blue_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -240,14 +240,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_GREEN; - f->setAllTextures("glass_slab_green.png"); - f->setTexture(0,"glass_green.png"); - f->setTexture(1,"glass_green.png"); + f->setAllTextures("glass_slab.png^glass_pane_green_side.png"); + f->setTexture(0,"glass.png^glass_pane_green_side.png"); + f->setTexture(1,"glass.png^glass_pane_green_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slab(f); - f->setInventoryTextureNodeBox(i,"glass_green.png", "glass_slab_green.png", "glass_slab_green.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_green_side.png", "glass_slab.png^glass_pane_green_side.png", "glass_slab.png^glass_pane_green_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -266,14 +266,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_ORANGE; - f->setAllTextures("glass_slab_orange.png"); - f->setTexture(0,"glass_orange.png"); + f->setAllTextures("glass_slab.png^glass_pane_orange_side.png"); + f->setTexture(0,"glass.png^glass_pane_orange_side.png"); f->setTexture(1,"glass_oange.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slab(f); - f->setInventoryTextureNodeBox(i,"glass_orange.png", "glass_slab_orange.png", "glass_slab_orange.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_orange_side.png", "glass_slab.png^glass_pane_orange_side.png", "glass_slab.png^glass_pane_orange_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -292,14 +292,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_PURPLE; - f->setAllTextures("glass_slab_purple.png"); - f->setTexture(0,"glass_purple.png"); - f->setTexture(1,"glass_purple.png"); + f->setAllTextures("glass_slab.png^glass_pane_purple_side.png"); + f->setTexture(0,"glass.png^glass_pane_purple_side.png"); + f->setTexture(1,"glass.png^glass_pane_purple_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slab(f); - f->setInventoryTextureNodeBox(i,"glass_purple.png", "glass_slab_purple.png", "glass_slab_purple.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_purple_side.png", "glass_slab.png^glass_pane_purple_side.png", "glass_slab.png^glass_pane_purple_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -318,14 +318,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_RED; - f->setAllTextures("glass_slab_red.png"); - f->setTexture(0,"glass_red.png"); - f->setTexture(1,"glass_red.png"); + f->setAllTextures("glass_slab.png^glass_pane_red_side.png"); + f->setTexture(0,"glass.png^glass_pane_red_side.png"); + f->setTexture(1,"glass.png^glass_pane_red_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slab(f); - f->setInventoryTextureNodeBox(i,"glass_red.png", "glass_slab_red.png", "glass_slab_red.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_red_side.png", "glass_slab.png^glass_pane_red_side.png", "glass_slab.png^glass_pane_red_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -344,14 +344,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_YELLOW; - f->setAllTextures("glass_slab_yellow.png"); - f->setTexture(0,"glass_yellow.png"); - f->setTexture(1,"glass_yellow.png"); + f->setAllTextures("glass_slab.png^glass_pane_yellow_side.png"); + f->setTexture(0,"glass.png^glass_pane_yellow_side.png"); + f->setTexture(1,"glass.png^glass_pane_yellow_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slab(f); - f->setInventoryTextureNodeBox(i,"glass_yellow.png", "glass_slab_yellow.png", "glass_slab_yellow.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_yellow_side.png", "glass_slab.png^glass_pane_yellow_side.png", "glass_slab.png^glass_pane_yellow_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -370,14 +370,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_BLACK; - f->setAllTextures("glass_slab_black.png"); - f->setTexture(0,"glass_black.png"); - f->setTexture(1,"glass_black.png"); + f->setAllTextures("glass_slab.png^glass_pane_black_side.png"); + f->setTexture(0,"glass.png^glass_pane_black_side.png"); + f->setTexture(1,"glass.png^glass_pane_black_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slab(f); - f->setInventoryTextureNodeBox(i,"glass_black.png", "glass_slab_black.png", "glass_slab_black.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_black_side.png", "glass_slab.png^glass_pane_black_side.png", "glass_slab.png^glass_pane_black_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -531,14 +531,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS; - f->setAllTextures("glass_slab.png"); + f->setAllTextures("glass_slab.png^glass.png"); f->setTexture(0,"glass.png"); f->setTexture(1,"glass.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slabud(f); - f->setInventoryTextureNodeBox(i,"glass.png", "glass_slab.png", "glass_slab.png"); + f->setInventoryTextureNodeBox(i,"glass.png", "glass_slab.png^glass.png", "glass_slab.png^glass.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -553,14 +553,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_BLUE; - f->setAllTextures("glass_slab_blue.png"); - f->setTexture(0,"glass_blue.png"); - f->setTexture(1,"glass_blue.png"); + f->setAllTextures("glass_slab.png^glass_pane_blue_side.png"); + f->setTexture(0,"glass.png^glass_pane_blue_side.png"); + f->setTexture(1,"glass.png^glass_pane_blue_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slabud(f); - f->setInventoryTextureNodeBox(i,"glass_blue.png", "glass_slab_blue.png", "glass_slab_blue.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_blue_side.png", "glass_slab.png^glass_pane_blue_side.png", "glass_slab.png^glass_pane_blue_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -575,14 +575,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_GREEN; - f->setAllTextures("glass_slab_green.png"); - f->setTexture(0,"glass_green.png"); - f->setTexture(1,"glass_green.png"); + f->setAllTextures("glass_slab.png^glass_pane_green_side.png"); + f->setTexture(0,"glass.png^glass_pane_green_side.png"); + f->setTexture(1,"glass.png^glass_pane_green_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slabud(f); - f->setInventoryTextureNodeBox(i,"glass_green.png", "glass_slab_green.png", "glass_slab_green.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_green_side.png", "glass_slab.png^glass_pane_green_side.png", "glass_slab.png^glass_pane_green_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -597,14 +597,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_ORANGE; - f->setAllTextures("glass_slab_orange.png"); - f->setTexture(0,"glass_orange.png"); - f->setTexture(1,"glass_orange.png"); + f->setAllTextures("glass_slab.png^glass_pane_orange_side.png"); + f->setTexture(0,"glass.png^glass_pane_orange_side.png"); + f->setTexture(1,"glass.png^glass_pane_orange_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slabud(f); - f->setInventoryTextureNodeBox(i,"glass_orange.png", "glass_slab_orange.png", "glass_slab_orange.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_orange_side.png", "glass_slab.png^glass_pane_orange_side.png", "glass_slab.png^glass_pane_orange_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -619,14 +619,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_PURPLE; - f->setAllTextures("glass_slab_purple.png"); - f->setTexture(0,"glass_purple.png"); - f->setTexture(1,"glass_purple.png"); + f->setAllTextures("glass_slab.png^glass_pane_purple_side.png"); + f->setTexture(0,"glass.png^glass_pane_purple_side.png"); + f->setTexture(1,"glass.png^glass_pane_purple_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slabud(f); - f->setInventoryTextureNodeBox(i,"glass_purple.png", "glass_slab_purple.png", "glass_slab_purple.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_purple_side.png", "glass_slab.png^glass_pane_purple_side.png", "glass_slab.png^glass_pane_purple_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -641,14 +641,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_RED; - f->setAllTextures("glass_slab_red.png"); - f->setTexture(0,"glass_red.png"); - f->setTexture(1,"glass_red.png"); + f->setAllTextures("glass_slab.png^glass_pane_red_side.png"); + f->setTexture(0,"glass.png^glass_pane_red_side.png"); + f->setTexture(1,"glass.png^glass_pane_red_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slabud(f); - f->setInventoryTextureNodeBox(i,"glass_red.png", "glass_slab_red.png", "glass_slab_red.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_red_side.png", "glass_slab.png^glass_pane_red_side.png", "glass_slab.png^glass_pane_red_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -663,14 +663,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_YELLOW; - f->setAllTextures("glass_slab_yellow.png"); - f->setTexture(0,"glass_yellow.png"); - f->setTexture(1,"glass_yellow.png"); + f->setAllTextures("glass_slab.png^glass_pane_yellow_side.png"); + f->setTexture(0,"glass.png^glass_pane_yellow_side.png"); + f->setTexture(1,"glass.png^glass_pane_yellow_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slabud(f); - f->setInventoryTextureNodeBox(i,"glass_yellow.png", "glass_slab_yellow.png", "glass_slab_yellow.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_yellow_side.png", "glass_slab.png^glass_pane_yellow_side.png", "glass_slab.png^glass_pane_yellow_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; @@ -685,14 +685,14 @@ void content_mapnode_slab(bool repeat) f->is_ground_content = true; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->special_alternate_node = CONTENT_GLASS_BLACK; - f->setAllTextures("glass_slab_black.png"); - f->setTexture(0,"glass_black.png"); - f->setTexture(1,"glass_black.png"); + f->setAllTextures("glass_slab.png^glass_pane_black_side.png"); + f->setTexture(0,"glass.png^glass_pane_black_side.png"); + f->setTexture(1,"glass.png^glass_pane_black_side.png"); #ifndef SERVER f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); #endif content_nodebox_slabud(f); - f->setInventoryTextureNodeBox(i,"glass_black.png", "glass_slab_black.png", "glass_slab_black.png"); + f->setInventoryTextureNodeBox(i,"glass.png^glass_pane_black_side.png", "glass_slab.png^glass_pane_black_side.png", "glass_slab.png^glass_pane_black_side.png"); f->type = CMT_GLASS; f->hardness = 0.15; f->suffocation_per_second = 0; diff --git a/src/content_toolitem.cpp b/src/content_toolitem.cpp index f33c919..ff48c71 100644 --- a/src/content_toolitem.cpp +++ b/src/content_toolitem.cpp @@ -513,7 +513,7 @@ void content_toolitem_init() i = CONTENT_TOOLITEM_WBUCKET_WATER; f = &g_content_toolitem_features[i]; f->content = i; - f->texture = "tool_woodbucket_water.png"; + f->texture = "tool_woodbucket.png^bucket_water.png"; f->name = "WBucket_water"; f->description = wgettext("Wooden Bucket of Water"); f->type = TT_SPECIAL; @@ -524,7 +524,7 @@ void content_toolitem_init() i = CONTENT_TOOLITEM_TINBUCKET_WATER; f = &g_content_toolitem_features[i]; f->content = i; - f->texture = "tool_tinbucket_water.png"; + f->texture = "tool_tinbucket.png^bucket_water.png"; f->name = "TinBucket_water"; f->description = wgettext("Tin Bucket of Water"); f->type = TT_SPECIAL; @@ -550,7 +550,7 @@ void content_toolitem_init() i = CONTENT_TOOLITEM_STEELBUCKET_WATER; f = &g_content_toolitem_features[i]; f->content = i; - f->texture = "tool_steelbucket_water.png"; + f->texture = "tool_steelbucket.png^bucket_water.png"; f->name = "SteelBucket_water"; f->description = wgettext("Steel Bucket of Water"); f->type = TT_SPECIAL; @@ -561,7 +561,7 @@ void content_toolitem_init() i = CONTENT_TOOLITEM_STEELBUCKET_LAVA; f = &g_content_toolitem_features[i]; f->content = i; - f->texture = "tool_steelbucket_lava.png"; + f->texture = "tool_steelbucket.png^bucket_lava.png"; f->name = "SteelBucket_lava"; f->description = wgettext("Steel Bucket of Lava"); f->onplace_node = CONTENT_LAVASOURCE;