Merge pull request #4 from Bastrabun/master

textures adhere to naming convention. Solves #2
h-v-smacker · Aug 5, 2021 · 4d061e9 · 4d061e9
2 parents 755526d + 9a5dcfe
commit 4d061e9
Show file tree

Hide file tree

Showing 34 changed files with 7 additions and 7 deletions.
diff --git a/init.lua b/init.lua
@@ -22,7 +22,7 @@
 if minetest.get_modpath("unified_inventory") and unified_inventory.register_craft_type then
 		unified_inventory.register_craft_type("pickling", {
 				description = "Dark room, wooden shelf",
-				icon = "pickling_icon.png",
+				icon = "canned_food_pickling_icon.png",
 				width = 1,
 				height = 1,
 				uses_crafting_grid = false,
@@ -305,9 +305,9 @@ for product, def in pairs(canned_food_definitions) do
 			local nodetable = {
 				description = def.proper_name,
 				drawtype = "plantlike",
-				tiles = {product .. ".png"},
-				inventory_image = product .. ".png",
-				wield_image = product .. ".png",
+				tiles = {"canned_food_" .. product .. ".png"},
+				inventory_image = "canned_food_" .. product .. ".png",
+				wield_image = "canned_food_" .. product .. ".png",
 				paramtype = "light",
 				is_ground_content = false,
 				walkable = false,
@@ -367,9 +367,9 @@ for product, def in pairs(canned_food_definitions) do
 				minetest.register_node("canned_food:" .. product .."_plus", {
 					description = def.transforms,
 					drawtype = "plantlike",
-					tiles = {product .. ".png^paper_lid_cover.png"},
-					inventory_image = product .. ".png^paper_lid_cover.png",
-					wield_image = product .. ".png^paper_lid_cover.png",
+					tiles = {"canned_food_" .. product .. ".png^canned_food_paper_lid_cover.png"},
+					inventory_image = "canned_food_" .. product .. ".png^canned_food_paper_lid_cover.png",
+					wield_image = "canned_food_" .. product .. ".png^canned_food_paper_lid_cover.png",
 					paramtype = "light",
 					is_ground_content = false,
 					walkable = false,

diff --git a/textures/apple_jam.png → textures/canned_food_apple_jam.png b/textures/apple_jam.png → textures/canned_food_apple_jam.png
diff --git a/textures/banana_jam.png → textures/canned_food_banana_jam.png b/textures/banana_jam.png → textures/canned_food_banana_jam.png
diff --git a/textures/blackberry_jam.png → textures/canned_food_blackberry_jam.png b/textures/blackberry_jam.png → textures/canned_food_blackberry_jam.png
diff --git a/textures/blueberry_jam.png → textures/canned_food_blueberry_jam.png b/textures/blueberry_jam.png → textures/canned_food_blueberry_jam.png
diff --git a/textures/canned_beans.png → textures/canned_food_canned_beans.png b/textures/canned_beans.png → textures/canned_food_canned_beans.png
diff --git a/textures/canned_beetroot.png → textures/canned_food_canned_beetroot.png b/textures/canned_beetroot.png → textures/canned_food_canned_beetroot.png
diff --git a/textures/canned_carrot.png → textures/canned_food_canned_carrot.png b/textures/canned_carrot.png → textures/canned_food_canned_carrot.png
diff --git a/textures/canned_chili_pepper.png → textures/canned_food_canned_chili_pepper.png b/textures/canned_chili_pepper.png → textures/canned_food_canned_chili_pepper.png
diff --git a/textures/canned_coconut.png → textures/canned_food_canned_coconut.png b/textures/canned_coconut.png → textures/canned_food_canned_coconut.png
diff --git a/textures/canned_corn.png → textures/canned_food_canned_corn.png b/textures/canned_corn.png → textures/canned_food_canned_corn.png
diff --git a/textures/canned_cucumber.png → textures/canned_food_canned_cucumber.png b/textures/canned_cucumber.png → textures/canned_food_canned_cucumber.png
diff --git a/textures/canned_garlic_cloves.png → ...ures/canned_food_canned_garlic_cloves.png b/textures/canned_garlic_cloves.png → ...ures/canned_food_canned_garlic_cloves.png
diff --git a/textures/canned_mushrooms.png → textures/canned_food_canned_mushrooms.png b/textures/canned_mushrooms.png → textures/canned_food_canned_mushrooms.png
diff --git a/textures/canned_onion.png → textures/canned_food_canned_onion.png b/textures/canned_onion.png → textures/canned_food_canned_onion.png
diff --git a/textures/canned_peas.png → textures/canned_food_canned_peas.png b/textures/canned_peas.png → textures/canned_food_canned_peas.png
diff --git a/textures/canned_pineapple.png → textures/canned_food_canned_pineapple.png b/textures/canned_pineapple.png → textures/canned_food_canned_pineapple.png
diff --git a/textures/canned_potato.png → textures/canned_food_canned_potato.png b/textures/canned_potato.png → textures/canned_food_canned_potato.png
diff --git a/textures/canned_pumpkin.png → textures/canned_food_canned_pumpkin.png b/textures/canned_pumpkin.png → textures/canned_food_canned_pumpkin.png
diff --git a/textures/canned_tomato.png → textures/canned_food_canned_tomato.png b/textures/canned_tomato.png → textures/canned_food_canned_tomato.png
diff --git a/textures/canned_wild_onion.png → textures/canned_food_canned_wild_onion.png b/textures/canned_wild_onion.png → textures/canned_food_canned_wild_onion.png
diff --git a/textures/dandelion_jam.png → textures/canned_food_dandelion_jam.png b/textures/dandelion_jam.png → textures/canned_food_dandelion_jam.png
diff --git a/textures/grape_jam.png → textures/canned_food_grape_jam.png b/textures/grape_jam.png → textures/canned_food_grape_jam.png
diff --git a/textures/honey_jar.png → textures/canned_food_honey_jar.png b/textures/honey_jar.png → textures/canned_food_honey_jar.png
diff --git a/textures/melon_jam.png → textures/canned_food_melon_jam.png b/textures/melon_jam.png → textures/canned_food_melon_jam.png
diff --git a/textures/orange_jam.png → textures/canned_food_orange_jam.png b/textures/orange_jam.png → textures/canned_food_orange_jam.png
diff --git a/textures/paper_lid_cover.png → textures/canned_food_paper_lid_cover.png b/textures/paper_lid_cover.png → textures/canned_food_paper_lid_cover.png
diff --git a/textures/pickling_icon.png → textures/canned_food_pickling_icon.png b/textures/pickling_icon.png → textures/canned_food_pickling_icon.png
diff --git a/textures/pine_nuts_jar.png → textures/canned_food_pine_nuts_jar.png b/textures/pine_nuts_jar.png → textures/canned_food_pine_nuts_jar.png
diff --git a/textures/raspberry_jam.png → textures/canned_food_raspberry_jam.png b/textures/raspberry_jam.png → textures/canned_food_raspberry_jam.png
diff --git a/textures/rhubarb_jam.png → textures/canned_food_rhubarb_jam.png b/textures/rhubarb_jam.png → textures/canned_food_rhubarb_jam.png
diff --git a/textures/rose_jam.png → textures/canned_food_rose_jam.png b/textures/rose_jam.png → textures/canned_food_rose_jam.png
diff --git a/textures/strawberry_jam.png → textures/canned_food_strawberry_jam.png b/textures/strawberry_jam.png → textures/canned_food_strawberry_jam.png
diff --git a/textures/wild_blueberry_jam.png → textures/canned_food_wild_blueberry_jam.png b/textures/wild_blueberry_jam.png → textures/canned_food_wild_blueberry_jam.png