apple planks and some texture fixes

src/content_craft.cpp

@@ -463,6 +463,8 @@ void setSignRecipe(u16 input, u16 result)
 	setRecipe(r,result,1);
 	r[7] = CONTENT_CRAFTITEM_JUNGLE_PLANK;
 	setRecipe(r,result,1);
+	r[7] = CONTENT_CRAFTITEM_APPLE_PLANK;
+	setRecipe(r,result,1);
 }
 // shears recipe, input is blade yields one result
 void setShearsRecipe(u16 input, u16 result)
@@ -495,6 +497,12 @@ void setShovelRecipe(u16 input, u16 result)
 		CONTENT_IGNORE,	CONTENT_CRAFTITEM_JUNGLE_PLANK,	CONTENT_IGNORE
 	};
 	setRecipe(r2,result,0);
+	u16 r3[9] = {
+		CONTENT_IGNORE,	input,				CONTENT_IGNORE,
+		CONTENT_IGNORE,	CONTENT_CRAFTITEM_APPLE_PLANK,	CONTENT_IGNORE,
+		CONTENT_IGNORE,	CONTENT_CRAFTITEM_APPLE_PLANK,	CONTENT_IGNORE
+	};
+	setRecipe(r3,result,0);
 }
 // spear recipe, input is blade yields one result
 void setSpearRecipe(u16 input, u16 result)
@@ -545,6 +553,18 @@ void setAxeRecipe(u16 input, u16 result)
 		CONTENT_IGNORE,	CONTENT_CRAFTITEM_JUNGLE_PLANK,	CONTENT_IGNORE
 	};
 	setRecipe(r5,result,0);
+	u16 r6[9] = {
+		input,		input,				CONTENT_IGNORE,
+		input,		CONTENT_CRAFTITEM_APPLE_PLANK,	CONTENT_IGNORE,
+		CONTENT_IGNORE,	CONTENT_CRAFTITEM_APPLE_PLANK,	CONTENT_IGNORE
+	};
+	setRecipe(r6,result,0);
+	u16 r7[9] = {
+		CONTENT_IGNORE,	input,				input,
+		CONTENT_IGNORE,	CONTENT_CRAFTITEM_APPLE_PLANK,	input,
+		CONTENT_IGNORE,	CONTENT_CRAFTITEM_APPLE_PLANK,	CONTENT_IGNORE
+	};
+	setRecipe(r7,result,0);
 }
 // pick recipe, input is blade yields one result
 void setPickRecipe(u16 input, u16 result)
@@ -567,6 +587,12 @@ void setPickRecipe(u16 input, u16 result)
 		CONTENT_IGNORE,	CONTENT_CRAFTITEM_JUNGLE_PLANK,	CONTENT_IGNORE
 	};
 	setRecipe(r2,result,0);
+	u16 r3[9] = {
+		input,		input,				input,
+		CONTENT_IGNORE,	CONTENT_CRAFTITEM_APPLE_PLANK,	CONTENT_IGNORE,
+		CONTENT_IGNORE,	CONTENT_CRAFTITEM_APPLE_PLANK,	CONTENT_IGNORE
+	};
+	setRecipe(r3,result,0);
 }
 // sword recipe, input is blade yields one result
 void setSwordRecipe(u16 input, u16 result)
@@ -589,6 +615,12 @@ void setSwordRecipe(u16 input, u16 result)
 		CONTENT_IGNORE,	CONTENT_CRAFTITEM_JUNGLE_PLANK,	CONTENT_IGNORE
 	};
 	setRecipe(r2,result,0);
+	u16 r3[9] = {
+		CONTENT_IGNORE,	input,				CONTENT_IGNORE,
+		CONTENT_IGNORE,	input,				CONTENT_IGNORE,
+		CONTENT_IGNORE,	CONTENT_CRAFTITEM_APPLE_PLANK,	CONTENT_IGNORE
+	};
+	setRecipe(r3,result,0);
 }
 // gate recipe 1 2 1 in two rows yields one result
 void setGateRecipe(u16 input1, u16 input2, u16 result)

src/content_craftitem.cpp

@@ -88,6 +88,16 @@ void content_craftitem_init()
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
 
+	i = CONTENT_CRAFTITEM_PADLOCK;
+	f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)];
+	f->content = CONTENT_CRAFTITEM_PADLOCK;
+	f->texture = "padlock.png";
+	f->name = "padlock";
+	f->description = gettext("Padlock");
+	crafting::set1over1Recipe(CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_CRAFTITEM_COPPER_INGOT,CONTENT_CRAFTITEM_PADLOCK);
+	content_list_add("craftguide",i,1,0);
+	content_list_add("creative",i,1,0);
+
 	i = CONTENT_CRAFTITEM_CHARCOAL;
 	f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)];
 	f->content = CONTENT_CRAFTITEM_CHARCOAL;
@@ -430,6 +440,7 @@ void content_craftitem_init()
 	crafting::set1To2Recipe(CONTENT_CRAFTITEM_PINE_PLANK,CONTENT_CRAFTITEM_STICK);
 	crafting::set1To2Recipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_CRAFTITEM_STICK);
 	crafting::set1To2Recipe(CONTENT_CRAFTITEM_JUNGLE_PLANK,CONTENT_CRAFTITEM_STICK);
+	crafting::set1To2Recipe(CONTENT_CRAFTITEM_APPLE_PLANK,CONTENT_CRAFTITEM_STICK);
 	crafting::set1To2Recipe(CONTENT_LEAVES,CONTENT_CRAFTITEM_STICK);
 	crafting::set1To2Recipe(CONTENT_APPLE_LEAVES,CONTENT_CRAFTITEM_STICK);
 	crafting::set1To2Recipe(CONTENT_JUNGLELEAVES,CONTENT_CRAFTITEM_STICK);
@@ -449,6 +460,18 @@ void content_craftitem_init()
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
 
+	i = CONTENT_CRAFTITEM_APPLE_PLANK;
+	f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)];
+	f->content = CONTENT_CRAFTITEM_APPLE_PLANK;
+	f->texture = "applewood_plank.png";
+	f->name = "applewood_plank";
+	f->description = gettext("Apple Wood Plank");
+	f->fuel_time = 30/16;
+	crafting::set1To4Recipe(CONTENT_APPLEWOOD,CONTENT_CRAFTITEM_APPLE_PLANK);
+	crafting::set1To2Recipe(CONTENT_YOUNG_APPLE_TREE,CONTENT_CRAFTITEM_APPLE_PLANK);
+	content_list_add("craftguide",i,1,0);
+	content_list_add("creative",i,1,0);
+
 	i = CONTENT_CRAFTITEM_WOOD_PLANK;
 	f = &g_content_craftitem_features[(i&~CONTENT_CRAFTITEM_MASK)];
 	f->content = CONTENT_CRAFTITEM_WOOD_PLANK;

src/content_craftitem.h

@@ -82,6 +82,7 @@ void content_craftitem_init();
 CraftItemFeatures *content_craftitem_features(content_t i);
 
 #define CONTENT_CRAFTITEM_PAPER (CONTENT_CRAFTITEM_MASK | 0x01)
+#define CONTENT_CRAFTITEM_PADLOCK (CONTENT_CRAFTITEM_MASK | 0x02)
 #define CONTENT_CRAFTITEM_CHARCOAL (CONTENT_CRAFTITEM_MASK | 0x03)
 #define CONTENT_CRAFTITEM_COAL (CONTENT_CRAFTITEM_MASK | 0x04)
 #define CONTENT_CRAFTITEM_IRON (CONTENT_CRAFTITEM_MASK | 0x05)
@@ -100,6 +101,7 @@ CraftItemFeatures *content_craftitem_features(content_t i);
 #define CONTENT_CRAFTITEM_CLAY_BRICK (CONTENT_CRAFTITEM_MASK | 0x12)
 #define CONTENT_CRAFTITEM_RAT (CONTENT_CRAFTITEM_MASK | 0x13)
 #define CONTENT_CRAFTITEM_COOKED_RAT (CONTENT_CRAFTITEM_MASK | 0x14)
+#define CONTENT_CRAFTITEM_APPLE_PLANK (CONTENT_CRAFTITEM_MASK | 0x15)
 #define CONTENT_CRAFTITEM_FIREFLY (CONTENT_CRAFTITEM_MASK | 0x16)
 #define CONTENT_CRAFTITEM_APPLE (CONTENT_CRAFTITEM_MASK | 0x17)
 #define CONTENT_CRAFTITEM_APPLE_IRON (CONTENT_CRAFTITEM_MASK | 0x18)

src/content_mapnode.cpp

@@ -2918,7 +2918,7 @@ void content_mapnode_init(bool repeat)
 	i = CONTENT_WOOD_PINE_COLUMN_SQUARE;
 	f = &content_features(i);
 	f->description = gettext("Pine Wood Column");
-	f->setAllTextures("pine.jpg");
+	f->setAllTextures("pine.png");
 	f->param_type = CPT_LIGHT;
 	f->draw_type = CDT_NODEBOX;
 	f->is_ground_content = true;
@@ -2927,7 +2927,7 @@ void content_mapnode_init(bool repeat)
 	f->light_propagates = true;
 	f->sunlight_propagates = true;
 	content_nodebox_column_square(f);
-	f->setInventoryTextureNodeBox(i,"pine.jpg","pine.jpg","pine.jpg");
+	f->setInventoryTextureNodeBox(i,"pine.png","pine.png","pine.png");
 	f->type = CMT_WOOD;
 	f->dig_time = 0.5;
 	f->onpunch_replace_node = CONTENT_WOOD_PINE_COLUMN_SQUARE_BASE;
@@ -2943,7 +2943,7 @@ void content_mapnode_init(bool repeat)
 
 	i = CONTENT_WOOD_PINE_COLUMN_SQUARE_BASE;
 	f = &content_features(i);
-	f->setAllTextures("pine.jpg");
+	f->setAllTextures("pine.png");
 	f->param_type = CPT_LIGHT;
 	f->draw_type = CDT_NODEBOX;
 	f->is_ground_content = true;
@@ -2960,7 +2960,7 @@ void content_mapnode_init(bool repeat)
 
 	i = CONTENT_WOOD_PINE_COLUMN_SQUARE_TOP;
 	f = &content_features(i);
-	f->setAllTextures("pine.jpg");
+	f->setAllTextures("pine.png");
 	f->param_type = CPT_LIGHT;
 	f->draw_type = CDT_NODEBOX;
 	f->is_ground_content = true;
@@ -3371,7 +3371,7 @@ void content_mapnode_init(bool repeat)
 
 	i = CONTENT_WOOD_PINE_COLUMN_CROSS;
 	f = &content_features(i);
-	f->setAllTextures("pine.jpg");
+	f->setAllTextures("pine.png");
 	f->param_type = CPT_LIGHT;
 	f->draw_type = CDT_NODEBOX;
 	f->is_ground_content = true;
@@ -3389,7 +3389,7 @@ void content_mapnode_init(bool repeat)
 
 	i = CONTENT_WOOD_PINE_COLUMN_CROSS_BASE;
 	f = &content_features(i);
-	f->setAllTextures("pine.jpg");
+	f->setAllTextures("pine.png");
 	f->param_type = CPT_LIGHT;
 	f->draw_type = CDT_NODEBOX;
 	f->is_ground_content = true;
@@ -3406,7 +3406,7 @@ void content_mapnode_init(bool repeat)
 
 	i = CONTENT_WOOD_PINE_COLUMN_CROSS_TOP;
 	f = &content_features(i);
-	f->setAllTextures("pine.jpg");
+	f->setAllTextures("pine.png");
 	f->param_type = CPT_LIGHT;
 	f->draw_type = CDT_NODEBOX;
 	f->is_ground_content = true;

src/content_mapnode_door.cpp

@@ -1316,7 +1316,7 @@ void content_mapnode_door(bool repeat)
 	f = &content_features(i);
 	f->param2_type = CPT_FACEDIR_SIMPLE;
 	f->description = gettext("Steel Gate");
-	f->setAllTextures("gate_steel.png");
+	f->setAllTextures("steel_sheet.png");
 	f->rotate_tile_with_nodebox = true;
 	f->setInventoryTexture("gate_steel_inv.png");
 	f->wield_nodebox = false;
@@ -1482,7 +1482,7 @@ void content_mapnode_door(bool repeat)
 	f = &content_features(i);
 	f->param2_type = CPT_FACEDIR_SIMPLE;
 	f->description = gettext("Steel Gate");
-	f->setAllTextures("steel.png");
+	f->setAllTextures("steel_sheet.png");
 	f->rotate_tile_with_nodebox = true;
 	f->setInventoryTexture("gate_steel_inv.png");
 	f->wield_nodebox = false;

src/content_mapnode_sign.cpp

@@ -136,8 +136,7 @@ void content_mapnode_sign(bool repeat)
 	content_nodebox_sign(f);
 	f->setFaceText(5,FaceText(0.05,0.0675,0.95,0.55));
 	f->setInventoryTextureNodeBox(i,"applewood.png", "applewood.png", "applewood.png");
-/* TODO: apple planks
-	crafting::setSignRecipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_SIGN);*/
+	crafting::setSignRecipe(CONTENT_CRAFTITEM_APPLE_PLANK,CONTENT_SIGN_APPLE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
 
@@ -347,7 +346,7 @@ void content_mapnode_sign(bool repeat)
 	i = CONTENT_SIGN_STEEL;
 	f = &content_features(i);
 	f->description = gettext("Sign");
-	f->setAllTextures("steel_block.png");
+	f->setAllTextures("steel_sheet.png");
 	f->param_type = CPT_LIGHT;
 	f->light_propagates = true;
 	f->sunlight_propagates = true;
@@ -367,7 +366,7 @@ void content_mapnode_sign(bool repeat)
 	f->suffocation_per_second = 0;
 	content_nodebox_sign(f);
 	f->setFaceText(5,FaceText(0.05,0.0675,0.95,0.55));
-	f->setInventoryTextureNodeBox(i,"steel_block.png", "steel_block.png", "steel_block.png");
+	f->setInventoryTextureNodeBox(i,"steel_sheet.png", "steel_sheet.png", "steel_sheet.png");
 	crafting::setSignRecipe(CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_SIGN_STEEL);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
@@ -375,7 +374,7 @@ void content_mapnode_sign(bool repeat)
 	i = CONTENT_SIGN_WALL_STEEL;
 	f = &content_features(i);
 	f->description = gettext("Sign");
-	f->setAllTextures("steel_block.png");
+	f->setAllTextures("steel_sheet.png");
 	f->param_type = CPT_LIGHT;
 	f->param2_type = CPT_FACEDIR_WALLMOUNT;
 	f->draw_type = CDT_NODEBOX;
@@ -400,7 +399,7 @@ void content_mapnode_sign(bool repeat)
 	i = CONTENT_SIGN_UD_STEEL;
 	f = &content_features(i);
 	f->description = gettext("Sign");
-	f->setAllTextures("steel_block.png");
+	f->setAllTextures("steel_sheet.png");
 	f->param_type = CPT_LIGHT;
 	f->light_propagates = true;
 	f->sunlight_propagates = true;

src/content_mapnode_special.cpp

@@ -139,7 +139,7 @@ void content_mapnode_special(bool repeat)
 
 	i = CONTENT_APPLE_FENCE;
 	f = &content_features(i);
-	f->description = gettext("Fence");
+	f->description = gettext("Apple Wood Fence");
 	f->setAllTextures("applewood.png");
 	f->light_propagates = true;
 	f->param_type = CPT_LIGHT;
@@ -159,8 +159,7 @@ void content_mapnode_special(bool repeat)
 	content_nodebox_fence_inv(f);
 	content_nodebox_fence(f);
 	f->setInventoryTextureNodeBox(i,"applewood.png","applewood.png","applewood.png");
-/* TODO: apple planks
-	crafting::setWallRecipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_FENCE);*/
+	crafting::setWallRecipe(CONTENT_CRAFTITEM_APPLE_PLANK,CONTENT_APPLE_FENCE);
 	content_list_add("craftguide",i,1,0);
 	content_list_add("creative",i,1,0);
 

src/nodemeta/content_nodemeta_storage.cpp

@@ -179,7 +179,7 @@ void ChestNodeMetadata::inventoryModified()
 			b[0] = 1;
 			m_is_expanded = true;
 			m_expanded_slot_id = i;
-		}else if (itm->getContent() == CONTENT_TOOLITEM_KEY) {
+		}else if (itm->getContent() == CONTENT_CRAFTITEM_PADLOCK) {
 			if (m_is_exo)
 				continue;
 			a[2] = 0;
@@ -250,7 +250,7 @@ void ChestNodeMetadata::inventoryModified()
 	if (a[0])
 		l->addAllowed(CONTENT_CHEST);
 	if (a[1])
-		l->addAllowed(CONTENT_TOOLITEM_KEY);
+		l->addAllowed(CONTENT_CRAFTITEM_PADLOCK);
 	if (a[2])
 		l->addAllowed(CONTENT_CRAFTITEM_OERKKI_DUST);
 }