mtcontrib
/
3d_armor
mirror of https://github.com/minetest-mods/3d_armor.git
1
0
Fork 2
Code Issues Releases Wiki Activity

Replace `3d_armor_trans.png` w/ engine provided `blank.png` (#143)

This commit is contained in:
Niklp 2024-04-04 07:25:05 +02:00 committed by GitHub
parent fb86c02e43
commit 1fcbf64d53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d_armor/api.lua
View File

@ -373,7 +373,7 @@ armor.set_player_armor = function(self, player)
local state = 0 local state = 0
local count = 0 local count = 0
local preview = armor:get_preview(name) local preview = armor:get_preview(name)
local texture = "3d_armor_trans.png" local texture = "blank.png"
local physics = {} local physics = {}
local attributes = {} local attributes = {}
local levels = {} local levels = {}

8
3d_armor/init.lua
View File

@ -268,8 +268,8 @@ local function init_player_armor(initplayer)
local skin = armor:get_player_skin(name) local skin = armor:get_player_skin(name)
armor.textures[name] = { armor.textures[name] = {
skin = skin, skin = skin,
armor = "3d_armor_trans.png", armor = "blank.png",
wielditem = "3d_armor_trans.png", wielditem = "blank.png",
preview = armor.default_skin.."_preview.png", preview = armor.default_skin.."_preview.png",
} }
local texture_path = minetest.get_modpath("player_textures") local texture_path = minetest.get_modpath("player_textures")
@ -291,8 +291,8 @@ player_api.register_model("3d_armor_character.b3d", {
animation_speed = 30, animation_speed = 30,
textures = { textures = {
armor.default_skin..".png", armor.default_skin..".png",
"3d_armor_trans.png", "blank.png",
"3d_armor_trans.png", "blank.png",
}, },
animations = { animations = {
stand = {x=0, y=79}, stand = {x=0, y=79},

BIN
3d_armor/textures/3d_armor_trans.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 274 B

6
3d_armor_stand/init.lua
View File

@ -62,7 +62,7 @@ local function update_entity(pos)
object = minetest.add_entity(pos, "3d_armor_stand:armor_entity") object = minetest.add_entity(pos, "3d_armor_stand:armor_entity")
end end
if object then if object then
local texture = "3d_armor_trans.png" local texture = "blank.png"
local textures = {} local textures = {}
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
@ -146,7 +146,7 @@ minetest.register_node("3d_armor_stand:top", {
groups = {not_in_creative_inventory = 1}, groups = {not_in_creative_inventory = 1},
is_ground_content = false, is_ground_content = false,
on_blast = function() end, on_blast = function() end,
tiles = {"3d_armor_trans.png"}, tiles = {"blank.png"},
}) })
minetest.register_node("3d_armor_stand:armor_stand", { minetest.register_node("3d_armor_stand:armor_stand", {
@ -388,7 +388,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
mesh = "3d_armor_entity.obj", mesh = "3d_armor_entity.obj",
visual_size = {x=1, y=1}, visual_size = {x=1, y=1},
collisionbox = {0,0,0,0,0,0}, collisionbox = {0,0,0,0,0,0},
textures = {"3d_armor_trans.png"}, textures = {"blank.png"},
}, },
_pos = nil, _pos = nil,
on_activate = function(self) on_activate = function(self)

10
wieldview/get_texture.lua
View File

@ -92,7 +92,7 @@ local get_image_from_tile = memoize(function(tile)
end end
end end
return "3d_armor_trans.png" return "blank.png"
end) end)
local function get_image_cube(tiles) local function get_image_cube(tiles)
@ -139,7 +139,7 @@ local function get_image_cube(tiles)
) )
end end
return "3d_armor_trans.png" return "blank.png"
end end
local function is_normal_node(drawtype) local function is_normal_node(drawtype)
@ -158,7 +158,7 @@ armor.get_wield_image = memoize(function(item)
item = ItemStack(item) item = ItemStack(item)
if item:is_empty() then if item:is_empty() then
return "3d_armor_trans.png" return "blank.png"
end end
local def = item:get_definition() local def = item:get_definition()
@ -169,7 +169,7 @@ armor.get_wield_image = memoize(function(item)
local meta = item:get_meta() local meta = item:get_meta()
local color = meta:get("color") or def.color local color = meta:get("color") or def.color
local image = "3d_armor_trans.png" local image = "blank.png"
if def.wield_image and def.wield_image ~= "" then if def.wield_image and def.wield_image ~= "" then
local parts = {def.wield_image} local parts = {def.wield_image}
@ -193,7 +193,7 @@ armor.get_wield_image = memoize(function(item)
elseif def.type == "node" then elseif def.type == "node" then
if def.drawtype == "nodebox" or def.drawtype == "mesh" then if def.drawtype == "nodebox" or def.drawtype == "mesh" then
image = "3d_armor_trans.png" image = "blank.png"
else else
local tiles = def.tiles local tiles = def.tiles

2
wieldview/init.lua
View File

@ -14,7 +14,7 @@ dofile(minetest.get_modpath(minetest.get_current_modname()).."/get_texture.lua")
dofile(minetest.get_modpath(minetest.get_current_modname()).."/transform.lua") dofile(minetest.get_modpath(minetest.get_current_modname()).."/transform.lua")
wieldview.get_item_texture = function(self, item) wieldview.get_item_texture = function(self, item)
local texture = "3d_armor_trans.png" local texture = "blank.png"
if item ~= "" then if item ~= "" then
texture = armor.get_wield_image(item) texture = armor.get_wield_image(item)