Skip to content

Commit

Permalink
Replace 3d_armor_trans.png w/ engine provided blank.png (#143)
Browse files Browse the repository at this point in the history
  • Loading branch information
Niklp09 authored Apr 4, 2024
1 parent fb86c02 commit 1fcbf64
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion 3d_armor/api.lua
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ armor.set_player_armor = function(self, player)
local state = 0
local count = 0
local preview = armor:get_preview(name)
local texture = "3d_armor_trans.png"
local texture = "blank.png"
local physics = {}
local attributes = {}
local levels = {}
Expand Down
8 changes: 4 additions & 4 deletions 3d_armor/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ local function init_player_armor(initplayer)
local skin = armor:get_player_skin(name)
armor.textures[name] = {
skin = skin,
armor = "3d_armor_trans.png",
wielditem = "3d_armor_trans.png",
armor = "blank.png",
wielditem = "blank.png",
preview = armor.default_skin.."_preview.png",
}
local texture_path = minetest.get_modpath("player_textures")
Expand All @@ -291,8 +291,8 @@ player_api.register_model("3d_armor_character.b3d", {
animation_speed = 30,
textures = {
armor.default_skin..".png",
"3d_armor_trans.png",
"3d_armor_trans.png",
"blank.png",
"blank.png",
},
animations = {
stand = {x=0, y=79},
Expand Down
Binary file removed 3d_armor/textures/3d_armor_trans.png
Binary file not shown.
6 changes: 3 additions & 3 deletions 3d_armor_stand/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ local function update_entity(pos)
object = minetest.add_entity(pos, "3d_armor_stand:armor_entity")
end
if object then
local texture = "3d_armor_trans.png"
local texture = "blank.png"
local textures = {}
local meta = minetest.get_meta(pos)
local inv = meta:get_inventory()
Expand Down Expand Up @@ -146,7 +146,7 @@ minetest.register_node("3d_armor_stand:top", {
groups = {not_in_creative_inventory = 1},
is_ground_content = false,
on_blast = function() end,
tiles = {"3d_armor_trans.png"},
tiles = {"blank.png"},
})

minetest.register_node("3d_armor_stand:armor_stand", {
Expand Down Expand Up @@ -388,7 +388,7 @@ minetest.register_entity("3d_armor_stand:armor_entity", {
mesh = "3d_armor_entity.obj",
visual_size = {x=1, y=1},
collisionbox = {0,0,0,0,0,0},
textures = {"3d_armor_trans.png"},
textures = {"blank.png"},
},
_pos = nil,
on_activate = function(self)
Expand Down
10 changes: 5 additions & 5 deletions wieldview/get_texture.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ local get_image_from_tile = memoize(function(tile)
end
end

return "3d_armor_trans.png"
return "blank.png"
end)

local function get_image_cube(tiles)
Expand Down Expand Up @@ -139,7 +139,7 @@ local function get_image_cube(tiles)
)
end

return "3d_armor_trans.png"
return "blank.png"
end

local function is_normal_node(drawtype)
Expand All @@ -158,7 +158,7 @@ armor.get_wield_image = memoize(function(item)
item = ItemStack(item)

if item:is_empty() then
return "3d_armor_trans.png"
return "blank.png"
end

local def = item:get_definition()
Expand All @@ -169,7 +169,7 @@ armor.get_wield_image = memoize(function(item)
local meta = item:get_meta()
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
local parts = {def.wield_image}
Expand All @@ -193,7 +193,7 @@ armor.get_wield_image = memoize(function(item)

elseif def.type == "node" then
if def.drawtype == "nodebox" or def.drawtype == "mesh" then
image = "3d_armor_trans.png"
image = "blank.png"

else
local tiles = def.tiles
Expand Down
2 changes: 1 addition & 1 deletion wieldview/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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")

wieldview.get_item_texture = function(self, item)
local texture = "3d_armor_trans.png"
local texture = "blank.png"
if item ~= "" then
texture = armor.get_wield_image(item)

Expand Down

0 comments on commit 1fcbf64

Please sign in to comment.