From bb1a2c9314b37ecd6c34cf4a3be63a4dd434c0cf Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Tue, 28 May 2019 06:38:18 -0400 Subject: [PATCH] follow proper naming conventions (or at least, make it better than it was :P ) --- homedecor_3d_extras/init.lua | 40 +++++++++--------- ...okshelf.obj => homedecor_3d_bookshelf.obj} | 0 ...le.obj => homedecor_3d_vessels_bottle.obj} | 0 ... => homedecor_3d_vessels_bottle_steel.obj} | 0 ...ink.obj => homedecor_3d_vessels_drink.obj} | 0 ...elf.obj => homedecor_3d_vessels_shelf.obj} | 0 ...s.png => homedecor_3d_bookshelf_books.png} | Bin ...=> homedecor_3d_bookshelf_inside_back.png} | Bin ...g => homedecor_3d_bottle_metal_bright.png} | Bin ...medecor_3d_vessels_drinking_glass_inv.png} | Bin ...homedecor_3d_vessels_glass_bottle_inv.png} | Bin ...g => homedecor_3d_vessels_shelf_glass.png} | Bin ...homedecor_3d_vessels_steel_bottle_inv.png} | Bin 13 files changed, 20 insertions(+), 20 deletions(-) rename homedecor_3d_extras/models/{3dbookshelf.obj => homedecor_3d_bookshelf.obj} (100%) rename homedecor_3d_extras/models/{3dvessels_bottle.obj => homedecor_3d_vessels_bottle.obj} (100%) rename homedecor_3d_extras/models/{3dvessels_bottle_steel.obj => homedecor_3d_vessels_bottle_steel.obj} (100%) rename homedecor_3d_extras/models/{3dvessels_drink.obj => homedecor_3d_vessels_drink.obj} (100%) rename homedecor_3d_extras/models/{3dvessels_shelf.obj => homedecor_3d_vessels_shelf.obj} (100%) rename homedecor_3d_extras/textures/{3dbookshelf_books.png => homedecor_3d_bookshelf_books.png} (100%) rename homedecor_3d_extras/textures/{3dbookshelf_inside_back.png => homedecor_3d_bookshelf_inside_back.png} (100%) rename homedecor_3d_extras/textures/{bottle_metal_bright.png => homedecor_3d_bottle_metal_bright.png} (100%) rename homedecor_3d_extras/textures/{3dvessels_drinking_glass_inv.png => homedecor_3d_vessels_drinking_glass_inv.png} (100%) rename homedecor_3d_extras/textures/{3dvessels_glass_bottle_inv.png => homedecor_3d_vessels_glass_bottle_inv.png} (100%) rename homedecor_3d_extras/textures/{3dvessels_shelf_glass.png => homedecor_3d_vessels_shelf_glass.png} (100%) rename homedecor_3d_extras/textures/{3dvessels_steel_bottle_inv.png => homedecor_3d_vessels_steel_bottle_inv.png} (100%) diff --git a/homedecor_3d_extras/init.lua b/homedecor_3d_extras/init.lua index ca1331f8..01132dfb 100644 --- a/homedecor_3d_extras/init.lua +++ b/homedecor_3d_extras/init.lua @@ -1,10 +1,10 @@ minetest.override_item("default:bookshelf", { drawtype = "mesh", - mesh = "3dbookshelf.obj", + mesh = "homedecor_3d_bookshelf.obj", tiles = { "default_wood.png", - "default_wood.png^3dbookshelf_inside_back.png", - "3dbookshelf_books.png", + "default_wood.png^homedecor_3d_bookshelf_inside_back.png", + "homedecor_3d_bookshelf_books.png", }, paramtype = "light", paramtype2 = "facedir", @@ -13,11 +13,11 @@ minetest.override_item("default:bookshelf", { if minetest.get_modpath("vessels") then minetest.override_item("vessels:shelf", { drawtype = "mesh", - mesh = "3dvessels_shelf.obj", + mesh = "homedecor_3d_vessels_shelf.obj", tiles = { "default_wood.png", - "default_wood.png^3dbookshelf_inside_back.png", - "3dvessels_shelf_glass.png", + "default_wood.png^homedecor_3d_bookshelf_inside_back.png", + "homedecor_3d_vessels_shelf_glass.png", }, paramtype = "light", paramtype2 = "facedir", @@ -31,29 +31,29 @@ if minetest.get_modpath("vessels") then minetest.override_item("vessels:glass_bottle", { drawtype = "mesh", - mesh = "3dvessels_bottle.obj", - tiles = {"3dvessels_shelf_glass.png"}, - inventory_image = "3dvessels_glass_bottle_inv.png", - wield_image = "3dvessels_glass_bottle_inv.png", + mesh = "homedecor_3d_vessels_bottle.obj", + tiles = {"homedecor_3d_vessels_shelf_glass.png"}, + inventory_image = "homedecor_3d_vessels_glass_bottle_inv.png", + wield_image = "homedecor_3d_vessels_glass_bottle_inv.png", use_texture_alpha = true, selection_box = sbox }) minetest.override_item("vessels:steel_bottle", { drawtype = "mesh", - mesh = "3dvessels_bottle_steel.obj", - tiles = {"bottle_metal_bright.png"}, - inventory_image = "3dvessels_steel_bottle_inv.png", - wield_image = "3dvessels_steel_bottle_inv.png", + mesh = "homedecor_3d_vessels_bottle_steel.obj", + tiles = {"homedecor_3d_bottle_metal_bright.png"}, + inventory_image = "homedecor_3d_vessels_steel_bottle_inv.png", + wield_image = "homedecor_3d_vessels_steel_bottle_inv.png", selection_box = sbox }) minetest.override_item("vessels:drinking_glass", { drawtype = "mesh", - mesh = "3dvessels_drink.obj", - tiles = {"3dvessels_shelf_glass.png"}, - inventory_image = "3dvessels_drinking_glass_inv.png", - wield_image = "3dvessels_drinking_glass_inv.png", + mesh = "homedecor_3d_vessels_drink.obj", + tiles = {"homedecor_3d_vessels_shelf_glass.png"}, + inventory_image = "homedecor_3d_vessels_drinking_glass_inv.png", + wield_image = "homedecor_3d_vessels_drinking_glass_inv.png", use_texture_alpha = true, selection_box = sbox }) @@ -67,8 +67,8 @@ if minetest.get_modpath("moreblocks") then "default_wood.png", "default_wood.png^[transformR90", "default_wood.png^[transformR270", - "default_wood.png^3dbookshelf_inside_back.png", - "default_wood.png^3dbookshelf_inside_back.png" + "default_wood.png^homedecor_3d_bookshelf_inside_back.png", + "default_wood.png^homedecor_3d_bookshelf_inside_back.png" }, paramtype = "light", paramtype2 = "facedir", diff --git a/homedecor_3d_extras/models/3dbookshelf.obj b/homedecor_3d_extras/models/homedecor_3d_bookshelf.obj similarity index 100% rename from homedecor_3d_extras/models/3dbookshelf.obj rename to homedecor_3d_extras/models/homedecor_3d_bookshelf.obj diff --git a/homedecor_3d_extras/models/3dvessels_bottle.obj b/homedecor_3d_extras/models/homedecor_3d_vessels_bottle.obj similarity index 100% rename from homedecor_3d_extras/models/3dvessels_bottle.obj rename to homedecor_3d_extras/models/homedecor_3d_vessels_bottle.obj diff --git a/homedecor_3d_extras/models/3dvessels_bottle_steel.obj b/homedecor_3d_extras/models/homedecor_3d_vessels_bottle_steel.obj similarity index 100% rename from homedecor_3d_extras/models/3dvessels_bottle_steel.obj rename to homedecor_3d_extras/models/homedecor_3d_vessels_bottle_steel.obj diff --git a/homedecor_3d_extras/models/3dvessels_drink.obj b/homedecor_3d_extras/models/homedecor_3d_vessels_drink.obj similarity index 100% rename from homedecor_3d_extras/models/3dvessels_drink.obj rename to homedecor_3d_extras/models/homedecor_3d_vessels_drink.obj diff --git a/homedecor_3d_extras/models/3dvessels_shelf.obj b/homedecor_3d_extras/models/homedecor_3d_vessels_shelf.obj similarity index 100% rename from homedecor_3d_extras/models/3dvessels_shelf.obj rename to homedecor_3d_extras/models/homedecor_3d_vessels_shelf.obj diff --git a/homedecor_3d_extras/textures/3dbookshelf_books.png b/homedecor_3d_extras/textures/homedecor_3d_bookshelf_books.png similarity index 100% rename from homedecor_3d_extras/textures/3dbookshelf_books.png rename to homedecor_3d_extras/textures/homedecor_3d_bookshelf_books.png diff --git a/homedecor_3d_extras/textures/3dbookshelf_inside_back.png b/homedecor_3d_extras/textures/homedecor_3d_bookshelf_inside_back.png similarity index 100% rename from homedecor_3d_extras/textures/3dbookshelf_inside_back.png rename to homedecor_3d_extras/textures/homedecor_3d_bookshelf_inside_back.png diff --git a/homedecor_3d_extras/textures/bottle_metal_bright.png b/homedecor_3d_extras/textures/homedecor_3d_bottle_metal_bright.png similarity index 100% rename from homedecor_3d_extras/textures/bottle_metal_bright.png rename to homedecor_3d_extras/textures/homedecor_3d_bottle_metal_bright.png diff --git a/homedecor_3d_extras/textures/3dvessels_drinking_glass_inv.png b/homedecor_3d_extras/textures/homedecor_3d_vessels_drinking_glass_inv.png similarity index 100% rename from homedecor_3d_extras/textures/3dvessels_drinking_glass_inv.png rename to homedecor_3d_extras/textures/homedecor_3d_vessels_drinking_glass_inv.png diff --git a/homedecor_3d_extras/textures/3dvessels_glass_bottle_inv.png b/homedecor_3d_extras/textures/homedecor_3d_vessels_glass_bottle_inv.png similarity index 100% rename from homedecor_3d_extras/textures/3dvessels_glass_bottle_inv.png rename to homedecor_3d_extras/textures/homedecor_3d_vessels_glass_bottle_inv.png diff --git a/homedecor_3d_extras/textures/3dvessels_shelf_glass.png b/homedecor_3d_extras/textures/homedecor_3d_vessels_shelf_glass.png similarity index 100% rename from homedecor_3d_extras/textures/3dvessels_shelf_glass.png rename to homedecor_3d_extras/textures/homedecor_3d_vessels_shelf_glass.png diff --git a/homedecor_3d_extras/textures/3dvessels_steel_bottle_inv.png b/homedecor_3d_extras/textures/homedecor_3d_vessels_steel_bottle_inv.png similarity index 100% rename from homedecor_3d_extras/textures/3dvessels_steel_bottle_inv.png rename to homedecor_3d_extras/textures/homedecor_3d_vessels_steel_bottle_inv.png