antumluanti/game-antum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch mod painting

Browse Source 
bdcb6727c4
This commit is contained in:
Jordan Irwin 2025-01-03 23:11:07 -08:00
parent 59b409106f
commit c2a49e33da
No known key found for this signature in database
GPG Key ID: E3E358C2F44C290A
5 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -89,7 +89,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
* [enchanting][] ([GPL / WTFPL / CC BY-SA-NA][lic.enchanting]) -- version: [dee7dde Git][ver.enchanting] *2021-06-04*
* [intllib][] ([Unlicense][lic.unlicense]) -- version: [6ebdc53][ver.intllib] *2021-02-23* ***DEPRECATED***
* [listitems][] ([MIT][lic.listitems]) -- version: [1.1][ver.listitems] *2021-08-04*
* [painting][] (WTFPL) -- version: [da8f4ba Git][ver.painting] *2021-06-25*
* [painting][] (WTFPL) -- version: [da8f4ba Git][ver.painting] *2021-06-25* ([patched][patch.painting])
* [pipeworks][] ([LGPL][lic.lgpl3.0] / [CC BY-SA][lic.ccbysa4.0]) -- version: [2670fd8 Git][ver.pipeworks] *2021-05-06* ([patched][patch.pipeworks])
* [simple_models][] ([CC0][lic.cc0]) -- version: [2021-08-16][ver.simple_models]
* [wdata][] ([MIT][lic.wdata]) -- version: [1.1][ver.wdata] *2021-06-15*
@ -733,6 +733,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[patch.motorbike]: https://github.com/AntumMT/mod-motorbike/tree/0aa5c9c
[patch.mysheetmetal]: https://github.com/AntumMT/mod-mysheetmetal/tree/2ffb3a2
[patch.nether]: https://github.com/AntumMT/mod-nether/tree/7a84ddd
[patch.painting]: https://github.com/AntumMT/mod-painting/tree/bdcb6727c49ee49d4d40c0a616464f8ac4b78cf3
[patch.pipeworks]: https://gitlab.com/AntumMT/mod-pipeworks/tree/48b082e
[patch.quartz]: https://github.com/AntumMT/mod-quartz/tree/adc759e
[patch.simple_protection]: https://github.com/AntumMT/mod-simple_protection/tree/be873b5

2
mods/misc/painting/README.md
View File

@ -1,4 +1,4 @@
painting
========
in-game painting mod for minetest
In-game painting mod for [Luanti](https://luanti.org/).

2
mods/misc/painting/description.txt
View File

@ -1 +1 @@
In-game painting mod for minetest
In-game painting mod for Luanti.

72
mods/misc/painting/init.lua
View File

@ -39,7 +39,7 @@ local picbox = {
fixed = { -0.499, -0.499, 0.499, 0.499, 0.499, 0.499 - thickness }
}
minetest.register_node("painting:pic", {
core.register_node("painting:pic", {
description = "Picture",
tiles = { "white.png" },
inventory_image = "painted.png",
@ -57,7 +57,7 @@ minetest.register_node("painting:pic", {
after_dig_node = function(pos, oldnode, oldmetadata, digger)
--find and remove the entity
for _,e in pairs(minetest.get_objects_inside_radius(pos, 0.5)) do
for _,e in pairs(core.get_objects_inside_radius(pos, 0.5)) do
if e:get_luaentity()
and e:get_luaentity().name == "painting:picent" then
@ -79,7 +79,7 @@ minetest.register_node("painting:pic", {
else
-- drop picture as item
minetest.add_item(pos, ItemStack({
core.add_item(pos, ItemStack({
name = "painting:paintedcanvas",
count = 1,
metadata = oldmetadata.fields["painting:picturedata"]
@ -91,7 +91,7 @@ minetest.register_node("painting:pic", {
local to_imagestring
-- picture texture entity
minetest.register_entity("painting:picent", {
core.register_entity("painting:picent", {
collisionbox = { 0, 0, 0, 0, 0, 0 },
visual = "upright_sprite",
textures = { "white.png" },
@ -99,10 +99,10 @@ minetest.register_entity("painting:picent", {
on_activate = function(self, staticdata)
local pos = self.object:get_pos()
local meta = minetest.get_meta(pos)
local meta = core.get_meta(pos)
local data = meta:get_string("painting:picturedata")
data = minetest.deserialize(data)
data = core.deserialize(data)
if not data or not data.grid then
return
@ -171,7 +171,7 @@ local paintbox = {
local dirs, intersect, clamp
minetest.register_entity("painting:paintent", {
core.register_entity("painting:paintent", {
collisionbox = { 0, 0, 0, 0, 0, 0 },
visual = "upright_sprite",
textures = { "white.png" },
@ -248,7 +248,7 @@ minetest.register_entity("painting:paintent", {
on_activate = function(self, staticdata)
local data = minetest.deserialize(staticdata)
local data = core.deserialize(staticdata)
if not data then
return
@ -273,7 +273,7 @@ minetest.register_entity("painting:paintent", {
local data = { fd = self.fd, res = self.res, grid = self.grid, x0 = self.x0, y0 = self.y0 }
return minetest.serialize(data)
return core.serialize(data)
end
})
@ -281,7 +281,7 @@ minetest.register_entity("painting:paintent", {
local walltoface = {-1, -1, 1, 3, 0, 2}
--paintedcanvas picture inventory item
minetest.register_craftitem("painting:paintedcanvas", {
core.register_craftitem("painting:paintedcanvas", {
description = "Painted Canvas",
inventory_image = "painted.png",
stack_max = 1,
@ -292,13 +292,13 @@ minetest.register_craftitem("painting:paintedcanvas", {
--place node
local pos = pointed_thing.above
if minetest.is_protected(pos, placer:get_player_name()) then
if core.is_protected(pos, placer:get_player_name()) then
return
end
local under = pointed_thing.under
local wm = minetest.dir_to_wallmounted(vector.subtract(under, pos))
local wm = core.dir_to_wallmounted(vector.subtract(under, pos))
local fd = walltoface[wm + 1]
@ -306,12 +306,12 @@ minetest.register_craftitem("painting:paintedcanvas", {
return itemstack
end
minetest.add_node(pos, {name = "painting:pic", param2 = fd})
core.add_node(pos, {name = "painting:pic", param2 = fd})
--save metadata
local data = itemstack:get_metadata()
minetest.get_meta(pos):set_string("painting:picturedata", data)
core.get_meta(pos):set_string("painting:picturedata", data)
--add entity
dir = dirs[fd]
@ -321,9 +321,9 @@ minetest.register_craftitem("painting:paintedcanvas", {
pos.x = pos.x + dir.x * off
pos.z = pos.z + dir.z * off
data = minetest.deserialize(data)
data = core.deserialize(data)
local p = minetest.add_entity(pos, "painting:picent"):get_luaentity()
local p = core.add_entity(pos, "painting:picent"):get_luaentity()
p.object:set_properties({ textures = { to_imagestring(data.grid, data.res) }})
p.object:set_yaw(math.pi * fd / -2)
@ -335,7 +335,7 @@ minetest.register_craftitem("painting:paintedcanvas", {
--canvas inventory items
for i = 4, 6 do
minetest.register_craftitem("painting:canvas_" .. 2 ^ i, {
core.register_craftitem("painting:canvas_" .. 2 ^ i, {
description = "Canvas " .. 2 ^ i,
inventory_image = "default_paper.png",
stack_max = 99,
@ -348,7 +348,7 @@ local canvasbox = {
fixed = { -0.5, -0.5, 0, 0.5, 0.5, thickness }
}
minetest.register_node("painting:canvasnode", {
core.register_node("painting:canvasnode", {
description = "Canvas",
tiles = { "white.png" },
inventory_image = "painted.png",
@ -367,7 +367,7 @@ minetest.register_node("painting:canvasnode", {
--get data and remove pixels
local data = {}
for _,e in pairs(minetest.get_objects_inside_radius(pos, 0.1)) do
for _,e in pairs(core.get_objects_inside_radius(pos, 0.1)) do
e = e:get_luaentity()
@ -383,14 +383,14 @@ minetest.register_node("painting:canvasnode", {
pos.y = pos.y - 1
minetest.get_meta(pos):set_int("has_canvas", 0)
core.get_meta(pos):set_int("has_canvas", 0)
if data.grid then
local item = {
name = "painting:paintedcanvas",
count = 1,
metadata = minetest.serialize(data)
metadata = core.serialize(data)
}
local inv = digger:get_inventory()
@ -400,7 +400,7 @@ minetest.register_node("painting:canvasnode", {
digger:get_inventory():add_item("main", item)
else
minetest.add_item(pos, ItemStack(item))
core.add_item(pos, ItemStack(item))
end
end
end
@ -423,7 +423,7 @@ local easelbox = {
local initgrid
minetest.register_node("painting:easel", {
core.register_node("painting:easel", {
description = "Easel",
tiles = { "default_wood.png" },
drawtype = "nodebox",
@ -449,23 +449,23 @@ minetest.register_node("painting:easel", {
local res = tonumber(wielded[2])
local meta = minetest.get_meta(pos)
local meta = core.get_meta(pos)
local fd = node.param2
pos.y = pos.y + 1
if minetest.get_node(pos).name ~= "air" then
if core.get_node(pos).name ~= "air" then
return
end
minetest.add_node(pos, { name = "painting:canvasnode", param2 = fd})
core.add_node(pos, { name = "painting:canvasnode", param2 = fd})
local dir = dirs[fd]
pos.x = pos.x - 0.01 * dir.x
pos.z = pos.z - 0.01 * dir.z
local p = minetest.add_entity(pos, "painting:paintent"):get_luaentity()
local p = core.add_entity(pos, "painting:paintent"):get_luaentity()
p.object:set_properties({ collisionbox = paintbox[fd % 2] })
p.object:set_armor_groups({immortal = 1})
@ -482,7 +482,7 @@ minetest.register_node("painting:easel", {
end,
can_dig = function(pos)
return minetest.get_meta(pos):get_int("has_canvas") == 0
return core.get_meta(pos):get_int("has_canvas") == 0
end
})
@ -516,7 +516,7 @@ for color, _ in pairs(textures) do
brush_new.description = color:gsub("^%l", string.upper) .. " brush"
brush_new.inventory_image = "painting_brush_" .. color .. ".png"
minetest.register_tool("painting:brush_" .. color, brush_new)
core.register_tool("painting:brush_" .. color, brush_new)
-- compatibility
local col = color
@ -526,7 +526,7 @@ for color, _ in pairs(textures) do
col = "dark_grey"
end
minetest.register_craft({
core.register_craft({
output = "painting:brush_" .. color,
recipe = {
{"dye:" .. col},
@ -540,8 +540,8 @@ for i, color in ipairs(revcolors) do
colors[color] = i
end
minetest.register_alias("easel", "painting:easel")
minetest.register_alias("canvas", "painting:canvas_16")
core.register_alias("easel", "painting:easel")
core.register_alias("canvas", "painting:canvas_16")
function initgrid(res)
@ -606,7 +606,7 @@ function clamp(num, res)
end
-- crafts
minetest.register_craft({
core.register_craft({
output = 'painting:easel',
recipe = {
{ '', 'default:wood', '' },
@ -615,7 +615,7 @@ minetest.register_craft({
}
})
minetest.register_craft({
core.register_craft({
output = 'painting:canvas_16',
recipe = {
{ '', '', '' },
@ -624,7 +624,7 @@ minetest.register_craft({
}
})
minetest.register_craft({
core.register_craft({
output = 'painting:canvas_32',
recipe = {
{ '', '', '' },
@ -634,7 +634,7 @@ minetest.register_craft({
})
--[[
minetest.register_craft({
core.register_craft({
output = 'painting:canvas_64',
recipe = {
{ 'default:paper', 'default:paper', 'default:paper' },

3
mods/misc/painting/mod.conf
View File

@ -1 +1,4 @@
name = painting
title = Painting
description = In-game painting mod for Luanti.
depends = default