Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

New glass and wood textures, glass doors may not be used as fuel

This commit is contained in:
sdzen 2016-02-13 20:34:22 -05:00
parent 3e04d6987d
commit 966c43c417
29 changed files with 117 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/textures/circuit_solarpanel_top.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 974 B

After

Width:  |  Height:  |  Size: 879 B

BIN
data/textures/clay_black.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
data/textures/clay_blue.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
data/textures/clay_green.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
data/textures/clay_orange.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
data/textures/clay_purple.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
data/textures/clay_red.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 334 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
data/textures/clay_yellow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 520 B

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
data/textures/door_glass_b.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 359 B

After

Width:  |  Height:  |  Size: 601 B

BIN
data/textures/door_glass_inv.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 530 B

BIN
data/textures/door_glass_t.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 602 B

BIN
data/textures/gate_steel.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 622 B

BIN
data/textures/glass.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 572 B

BIN
data/textures/glass_pane_black_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 70 B

BIN
data/textures/glass_pane_blue_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 70 B

BIN
data/textures/glass_pane_green_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 70 B

BIN
data/textures/glass_pane_orange_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 70 B

BIN
data/textures/glass_pane_purple_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 70 B

BIN
data/textures/glass_pane_red_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 70 B

BIN
data/textures/glass_pane_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 900 B

After

Width:  |  Height:  |  Size: 70 B

BIN
data/textures/glass_pane_yellow_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 127 B

After

Width:  |  Height:  |  Size: 70 B

BIN
data/textures/glass_slab.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 521 B

BIN
data/textures/lava.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 172 B

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
data/textures/snow_side.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 940 B

After

Width:  |  Height:  |  Size: 752 B

BIN
data/textures/tool_tinbucket_water.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 274 B

BIN
data/textures/wood.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 672 B

After

Width:  |  Height:  |  Size: 1.8 KiB

70
src/content_mapnode.cpp
View File

@ -890,11 +890,11 @@ void content_mapnode_init(bool repeat)
f->draw_type = CDT_GLASSLIKE; f->draw_type = CDT_GLASSLIKE;
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; 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 #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_GLASS,CONTENT_GLASS_BLUE); 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->draw_type = CDT_GLASSLIKE;
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; 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 #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_GREEN,CONTENT_GLASS,CONTENT_GLASS_GREEN); 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->draw_type = CDT_GLASSLIKE;
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; 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 #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_ORANGE,CONTENT_GLASS,CONTENT_GLASS_ORANGE); 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->draw_type = CDT_GLASSLIKE;
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; 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 #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_PURPLE,CONTENT_GLASS,CONTENT_GLASS_PURPLE); 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->draw_type = CDT_GLASSLIKE;
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; 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 #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_RED,CONTENT_GLASS,CONTENT_GLASS_RED); 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->draw_type = CDT_GLASSLIKE;
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; 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 #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_GLASS,CONTENT_GLASS_YELLOW); 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->draw_type = CDT_GLASSLIKE;
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; 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 #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_DYE_BLACK,CONTENT_GLASS,CONTENT_GLASS_BLACK); 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->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->setAllTextures("glass_pane_blue_side.png"); f->setAllTextures("glass_pane_blue_side.png");
f->setTexture(4,"glass_blue.png"); f->setTexture(4,"glass.png^glass_pane_blue_side.png");
f->setTexture(5,"glass_blue.png"); f->setTexture(5,"glass.png^glass_pane_blue_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
@ -1078,7 +1078,7 @@ void content_mapnode_init(bool repeat)
0.5*BS, 0.5*BS,
0.05*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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->pressure_type = CST_CRUSHABLE; f->pressure_type = CST_CRUSHABLE;
@ -1099,8 +1099,8 @@ void content_mapnode_init(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->setAllTextures("glass_pane_green_side.png"); f->setAllTextures("glass_pane_green_side.png");
f->setTexture(4,"glass_green.png"); f->setTexture(4,"glass.png^glass_pane_green_side.png");
f->setTexture(5,"glass_green.png"); f->setTexture(5,"glass.png^glass_pane_green_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
@ -1112,7 +1112,7 @@ void content_mapnode_init(bool repeat)
0.5*BS, 0.5*BS,
0.05*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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->pressure_type = CST_CRUSHABLE; f->pressure_type = CST_CRUSHABLE;
@ -1133,8 +1133,8 @@ void content_mapnode_init(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->setAllTextures("glass_pane_orange_side.png"); f->setAllTextures("glass_pane_orange_side.png");
f->setTexture(4,"glass_orange.png"); f->setTexture(4,"glass.png^glass_pane_orange_side.png");
f->setTexture(5,"glass_orange.png"); f->setTexture(5,"glass.png^glass_pane_orange_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
@ -1146,7 +1146,7 @@ void content_mapnode_init(bool repeat)
0.5*BS, 0.5*BS,
0.05*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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->pressure_type = CST_CRUSHABLE; f->pressure_type = CST_CRUSHABLE;
@ -1167,8 +1167,8 @@ void content_mapnode_init(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->setAllTextures("glass_pane_purple_side.png"); f->setAllTextures("glass_pane_purple_side.png");
f->setTexture(4,"glass_purple.png"); f->setTexture(4,"glass.png^glass_pane_purple_side.png");
f->setTexture(5,"glass_purple.png"); f->setTexture(5,"glass.png^glass_pane_purple_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
@ -1180,7 +1180,7 @@ void content_mapnode_init(bool repeat)
0.5*BS, 0.5*BS,
0.05*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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->pressure_type = CST_CRUSHABLE; f->pressure_type = CST_CRUSHABLE;
@ -1201,8 +1201,8 @@ void content_mapnode_init(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->setAllTextures("glass_pane_red_side.png"); f->setAllTextures("glass_pane_red_side.png");
f->setTexture(4,"glass_red.png"); f->setTexture(4,"glass.png^glass_pane_red_side.png");
f->setTexture(5,"glass_red.png"); f->setTexture(5,"glass.png^glass_pane_red_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
@ -1214,7 +1214,7 @@ void content_mapnode_init(bool repeat)
0.5*BS, 0.5*BS,
0.05*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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->pressure_type = CST_CRUSHABLE; f->pressure_type = CST_CRUSHABLE;
@ -1235,8 +1235,8 @@ void content_mapnode_init(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->setAllTextures("glass_pane_yellow_side.png"); f->setAllTextures("glass_pane_yellow_side.png");
f->setTexture(4,"glass_yellow.png"); f->setTexture(4,"glass.png^glass_pane_yellow_side.png");
f->setTexture(5,"glass_yellow.png"); f->setTexture(5,"glass.png^glass_pane_yellow_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
@ -1248,7 +1248,7 @@ void content_mapnode_init(bool repeat)
0.5*BS, 0.5*BS,
0.05*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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->pressure_type = CST_CRUSHABLE; f->pressure_type = CST_CRUSHABLE;
@ -1269,8 +1269,8 @@ void content_mapnode_init(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->setAllTextures("glass_pane_black_side.png"); f->setAllTextures("glass_pane_black_side.png");
f->setTexture(4,"glass_black.png"); f->setTexture(4,"glass.png^glass_pane_black_side.png");
f->setTexture(5,"glass_black.png"); f->setTexture(5,"glass.png^glass_pane_black_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
@ -1282,7 +1282,7 @@ void content_mapnode_init(bool repeat)
0.5*BS, 0.5*BS,
0.05*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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->pressure_type = CST_CRUSHABLE; f->pressure_type = CST_CRUSHABLE;

25
src/content_mapnode_door.cpp
View File

@ -156,6 +156,9 @@ void content_mapnode_door(bool repeat)
f->setTexture(2,"door_glass_b.png^[transformFX"); f->setTexture(2,"door_glass_b.png^[transformFX");
f->setTexture(3,"door_glass_b.png^[transformFX"); f->setTexture(3,"door_glass_b.png^[transformFX");
f->setTexture(4,"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->setInventoryTexture("door_glass_inv.png");
f->wield_nodebox = false; f->wield_nodebox = false;
f->param_type = CPT_LIGHT; 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(2,"door_glass_t.png^[transformFX");
f->setTexture(3,"door_glass_t.png^[transformFX"); f->setTexture(3,"door_glass_t.png^[transformFX");
f->setTexture(4,"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->setInventoryTexture("door_glass_inv.png");
f->wield_nodebox = false; f->wield_nodebox = false;
f->param_type = CPT_LIGHT; f->param_type = CPT_LIGHT;
@ -389,6 +395,9 @@ void content_mapnode_door(bool repeat)
f->setTexture(2,"door_glass_b.png"); f->setTexture(2,"door_glass_b.png");
f->setTexture(3,"door_glass_b.png"); f->setTexture(3,"door_glass_b.png");
f->setTexture(4,"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->setInventoryTexture("door_glass_inv.png^[transformFX");
f->wield_nodebox = false; f->wield_nodebox = false;
f->param_type = CPT_LIGHT; f->param_type = CPT_LIGHT;
@ -415,6 +424,9 @@ void content_mapnode_door(bool repeat)
f->setTexture(2,"door_glass_t.png"); f->setTexture(2,"door_glass_t.png");
f->setTexture(3,"door_glass_t.png"); f->setTexture(3,"door_glass_t.png");
f->setTexture(4,"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->setInventoryTexture("door_glass_inv.png^[transformFX");
f->wield_nodebox = false; f->wield_nodebox = false;
f->param_type = CPT_LIGHT; f->param_type = CPT_LIGHT;
@ -670,6 +682,9 @@ void content_mapnode_door(bool repeat)
f->description = wgettext("Glass Door"); f->description = wgettext("Glass Door");
f->setAllTextures("door_glass_b.png"); f->setAllTextures("door_glass_b.png");
f->setTexture(3,"door_glass_b.png^[transformFX"); f->setTexture(3,"door_glass_b.png^[transformFX");
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setInventoryTexture("door_glass_inv.png"); f->setInventoryTexture("door_glass_inv.png");
f->wield_nodebox = false; f->wield_nodebox = false;
f->param_type = CPT_LIGHT; f->param_type = CPT_LIGHT;
@ -694,6 +709,9 @@ void content_mapnode_door(bool repeat)
f->description = wgettext("Glass Door"); f->description = wgettext("Glass Door");
f->setAllTextures("door_glass_t.png"); f->setAllTextures("door_glass_t.png");
f->setTexture(3,"door_glass_t.png^[transformFX"); f->setTexture(3,"door_glass_t.png^[transformFX");
#ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif
f->setInventoryTexture("door_glass_inv.png"); f->setInventoryTexture("door_glass_inv.png");
f->wield_nodebox = false; f->wield_nodebox = false;
f->param_type = CPT_LIGHT; 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(2,"door_glass_b.png^[transformFX");
f->setTexture(3,"door_glass_b.png^[transformFX"); f->setTexture(3,"door_glass_b.png^[transformFX");
f->setTexture(4,"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->setInventoryTexture("door_glass_inv.png^[transformFX");
f->wield_nodebox = false; f->wield_nodebox = false;
f->param_type = CPT_LIGHT; 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(2,"door_glass_t.png^[transformFX");
f->setTexture(3,"door_glass_t.png^[transformFX"); f->setTexture(3,"door_glass_t.png^[transformFX");
f->setTexture(4,"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->setInventoryTexture("door_glass_inv.png^[transformFX");
f->wield_nodebox = false; f->wield_nodebox = false;
f->param_type = CPT_LIGHT; f->param_type = CPT_LIGHT;
@ -972,7 +996,6 @@ void content_mapnode_door(bool repeat)
f->onact_also_affects = v3s16(0,-1,0); f->onact_also_affects = v3s16(0,-1,0);
f->onpunch_replace_node = CONTENT_GLASS_DOOR_RT; f->onpunch_replace_node = CONTENT_GLASS_DOOR_RT;
f->sound_punch = "env-doorclose"; f->sound_punch = "env-doorclose";
f->fuel_time = 30;
content_nodebox_dooror(f); content_nodebox_dooror(f);
f->type = CMT_GLASS; f->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;

116
src/content_mapnode_slab.cpp
View File

@ -196,7 +196,7 @@ void content_mapnode_slab(bool repeat)
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slab(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -214,14 +214,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_BLUE; f->special_alternate_node = CONTENT_GLASS_BLUE;
f->setAllTextures("glass_slab_blue.png"); f->setAllTextures("glass_slab.png^glass_pane_blue_side.png");
f->setTexture(0,"glass_blue.png"); f->setTexture(0,"glass.png^glass_pane_blue_side.png");
f->setTexture(1,"glass_blue.png"); f->setTexture(1,"glass.png^glass_pane_blue_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slab(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -240,14 +240,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_GREEN; f->special_alternate_node = CONTENT_GLASS_GREEN;
f->setAllTextures("glass_slab_green.png"); f->setAllTextures("glass_slab.png^glass_pane_green_side.png");
f->setTexture(0,"glass_green.png"); f->setTexture(0,"glass.png^glass_pane_green_side.png");
f->setTexture(1,"glass_green.png"); f->setTexture(1,"glass.png^glass_pane_green_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slab(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -266,14 +266,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_ORANGE; f->special_alternate_node = CONTENT_GLASS_ORANGE;
f->setAllTextures("glass_slab_orange.png"); f->setAllTextures("glass_slab.png^glass_pane_orange_side.png");
f->setTexture(0,"glass_orange.png"); f->setTexture(0,"glass.png^glass_pane_orange_side.png");
f->setTexture(1,"glass_oange.png"); f->setTexture(1,"glass_oange.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slab(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -292,14 +292,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_PURPLE; f->special_alternate_node = CONTENT_GLASS_PURPLE;
f->setAllTextures("glass_slab_purple.png"); f->setAllTextures("glass_slab.png^glass_pane_purple_side.png");
f->setTexture(0,"glass_purple.png"); f->setTexture(0,"glass.png^glass_pane_purple_side.png");
f->setTexture(1,"glass_purple.png"); f->setTexture(1,"glass.png^glass_pane_purple_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slab(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -318,14 +318,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_RED; f->special_alternate_node = CONTENT_GLASS_RED;
f->setAllTextures("glass_slab_red.png"); f->setAllTextures("glass_slab.png^glass_pane_red_side.png");
f->setTexture(0,"glass_red.png"); f->setTexture(0,"glass.png^glass_pane_red_side.png");
f->setTexture(1,"glass_red.png"); f->setTexture(1,"glass.png^glass_pane_red_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slab(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -344,14 +344,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_YELLOW; f->special_alternate_node = CONTENT_GLASS_YELLOW;
f->setAllTextures("glass_slab_yellow.png"); f->setAllTextures("glass_slab.png^glass_pane_yellow_side.png");
f->setTexture(0,"glass_yellow.png"); f->setTexture(0,"glass.png^glass_pane_yellow_side.png");
f->setTexture(1,"glass_yellow.png"); f->setTexture(1,"glass.png^glass_pane_yellow_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slab(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -370,14 +370,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_BLACK; f->special_alternate_node = CONTENT_GLASS_BLACK;
f->setAllTextures("glass_slab_black.png"); f->setAllTextures("glass_slab.png^glass_pane_black_side.png");
f->setTexture(0,"glass_black.png"); f->setTexture(0,"glass.png^glass_pane_black_side.png");
f->setTexture(1,"glass_black.png"); f->setTexture(1,"glass.png^glass_pane_black_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slab(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -531,14 +531,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS; 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(0,"glass.png");
f->setTexture(1,"glass.png"); f->setTexture(1,"glass.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slabud(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -553,14 +553,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_BLUE; f->special_alternate_node = CONTENT_GLASS_BLUE;
f->setAllTextures("glass_slab_blue.png"); f->setAllTextures("glass_slab.png^glass_pane_blue_side.png");
f->setTexture(0,"glass_blue.png"); f->setTexture(0,"glass.png^glass_pane_blue_side.png");
f->setTexture(1,"glass_blue.png"); f->setTexture(1,"glass.png^glass_pane_blue_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slabud(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -575,14 +575,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_GREEN; f->special_alternate_node = CONTENT_GLASS_GREEN;
f->setAllTextures("glass_slab_green.png"); f->setAllTextures("glass_slab.png^glass_pane_green_side.png");
f->setTexture(0,"glass_green.png"); f->setTexture(0,"glass.png^glass_pane_green_side.png");
f->setTexture(1,"glass_green.png"); f->setTexture(1,"glass.png^glass_pane_green_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slabud(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -597,14 +597,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_ORANGE; f->special_alternate_node = CONTENT_GLASS_ORANGE;
f->setAllTextures("glass_slab_orange.png"); f->setAllTextures("glass_slab.png^glass_pane_orange_side.png");
f->setTexture(0,"glass_orange.png"); f->setTexture(0,"glass.png^glass_pane_orange_side.png");
f->setTexture(1,"glass_orange.png"); f->setTexture(1,"glass.png^glass_pane_orange_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slabud(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -619,14 +619,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_PURPLE; f->special_alternate_node = CONTENT_GLASS_PURPLE;
f->setAllTextures("glass_slab_purple.png"); f->setAllTextures("glass_slab.png^glass_pane_purple_side.png");
f->setTexture(0,"glass_purple.png"); f->setTexture(0,"glass.png^glass_pane_purple_side.png");
f->setTexture(1,"glass_purple.png"); f->setTexture(1,"glass.png^glass_pane_purple_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slabud(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -641,14 +641,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_RED; f->special_alternate_node = CONTENT_GLASS_RED;
f->setAllTextures("glass_slab_red.png"); f->setAllTextures("glass_slab.png^glass_pane_red_side.png");
f->setTexture(0,"glass_red.png"); f->setTexture(0,"glass.png^glass_pane_red_side.png");
f->setTexture(1,"glass_red.png"); f->setTexture(1,"glass.png^glass_pane_red_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slabud(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -663,14 +663,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_YELLOW; f->special_alternate_node = CONTENT_GLASS_YELLOW;
f->setAllTextures("glass_slab_yellow.png"); f->setAllTextures("glass_slab.png^glass_pane_yellow_side.png");
f->setTexture(0,"glass_yellow.png"); f->setTexture(0,"glass.png^glass_pane_yellow_side.png");
f->setTexture(1,"glass_yellow.png"); f->setTexture(1,"glass.png^glass_pane_yellow_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slabud(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;
@ -685,14 +685,14 @@ void content_mapnode_slab(bool repeat)
f->is_ground_content = true; f->is_ground_content = true;
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1"; f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->special_alternate_node = CONTENT_GLASS_BLACK; f->special_alternate_node = CONTENT_GLASS_BLACK;
f->setAllTextures("glass_slab_black.png"); f->setAllTextures("glass_slab.png^glass_pane_black_side.png");
f->setTexture(0,"glass_black.png"); f->setTexture(0,"glass.png^glass_pane_black_side.png");
f->setTexture(1,"glass_black.png"); f->setTexture(1,"glass.png^glass_pane_black_side.png");
#ifndef SERVER #ifndef SERVER
f->setAllTextureTypes(MATERIAL_ALPHA_BLEND); f->setAllTextureTypes(MATERIAL_ALPHA_BLEND);
#endif #endif
content_nodebox_slabud(f); 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->type = CMT_GLASS;
f->hardness = 0.15; f->hardness = 0.15;
f->suffocation_per_second = 0; f->suffocation_per_second = 0;