From 8ccf1ae3a9541b26164761691d8cecf8cf68c3d5 Mon Sep 17 00:00:00 2001 From: 3raven Date: Sun, 29 May 2022 09:28:29 +0000 Subject: [PATCH 01/27] Attempt to get clock and map working in glowing itemframes --- mods/ENTITIES/extra_mobs/glow_squid_items.lua | 102 ++++++++++++------ mods/ENTITIES/extra_mobs/mod.conf | 2 +- 2 files changed, 71 insertions(+), 33 deletions(-) diff --git a/mods/ENTITIES/extra_mobs/glow_squid_items.lua b/mods/ENTITIES/extra_mobs/glow_squid_items.lua index c7f30662b..6895ee5ec 100644 --- a/mods/ENTITIES/extra_mobs/glow_squid_items.lua +++ b/mods/ENTITIES/extra_mobs/glow_squid_items.lua @@ -46,7 +46,7 @@ minetest.register_entity("extra_mobs:glow_item_frame_item",{ end end end - if self._texture ~= nil then + if self._texture then self.object:set_properties({ textures={self._texture}, visual_size={x=VISUAL_SIZE/self._scale, y=VISUAL_SIZE/self._scale}, @@ -55,9 +55,9 @@ minetest.register_entity("extra_mobs:glow_item_frame_item",{ end, get_staticdata = function(self) if not self then return end - if self._nodename ~= nil and self._texture ~= nil then + if self._nodename and self._texture then local ret = self._nodename .. ';' .. self._texture - if self._scale ~= nil then + if self._scale then ret = ret .. ';' .. tostring(self._scale) end return ret @@ -66,7 +66,7 @@ minetest.register_entity("extra_mobs:glow_item_frame_item",{ end, _update_texture = function(self) - if self._texture ~= nil then + if self._texture then self.object:set_properties({ textures={self._texture}, visual_size={x=VISUAL_SIZE/self._scale, y=VISUAL_SIZE/self._scale}, @@ -75,6 +75,23 @@ minetest.register_entity("extra_mobs:glow_item_frame_item",{ end, }) +minetest.register_entity("extra_mobs:glow_item_frame_map", { + initial_properties = { + visual = "upright_sprite", + visual_size = {x = 1, y = 1}, + pointable = false, + physical = false, + collide_with_objects = false, + textures = {"blank.png"}, + }, + on_activate = function(self, staticdata) + self.id = staticdata + self.object:set_properties({textures = {mcl_maps.load_map(self.id)}}) + end, + get_staticdata = function(self) + return self.id + end, +}) local facedir = {} facedir[0] = {x=0,y=0,z=1} @@ -83,19 +100,17 @@ facedir[2] = {x=0,y=0,z=-1} facedir[3] = {x=-1,y=0,z=0} local remove_item_entity = function(pos, node) - local objs = nil if node.name == "extra_mobs:glow_item_frame" then - objs = minetest.get_objects_inside_radius(pos, .5) - end - if objs then - for _, obj in ipairs(objs) do - if obj and obj:get_luaentity() and obj:get_luaentity().name == "extra_mobs:glow_item_frame_item" then + for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.5)) do + local entity = obj:get_luaentity() + if entity and (entity.name == "extra_mobs:glow_item_frame_item" or entity.name == "extra_mobs:glow_item_frame_map") then obj:remove() end end end end + local update_item_entity = function(pos, node, param2) remove_item_entity(pos, node) local meta = minetest.get_meta(pos) @@ -111,27 +126,29 @@ local update_item_entity = function(pos, node, param2) pos.y = pos.y + posad.y*6.5/16 pos.z = pos.z + posad.z*6.5/16 end - local e = minetest.add_entity(pos, "extra_mobs:glow_item_frame_item") - local lua = e:get_luaentity() - lua._nodename = node.name - local itemname = item:get_name() - if itemname == "" or itemname == nil then - lua._texture = "blank.png" - lua._scale = 1 - else - lua._texture = itemname - local def = minetest.registered_items[itemname] - if def and def.wield_scale then - lua._scale = def.wield_scale.x - else - lua._scale = 1 - end - end - lua:_update_texture() - if node.name == "extra_mobs:glow_item_frame" then - local yaw = math.pi*2 - param2 * math.pi/2 - e:set_yaw(yaw) - end + local yaw = math.pi*2 - param2 * math.pi/2 + local map_id = item:get_meta():get_string("mcl_maps:id") + if map_id == "" then + local e = minetest.add_entity(pos, "extra_mobs:glow_item_frame_item") + local lua = e:get_luaentity() + lua._nodename = node.name + local itemname = item:get_name() + if itemname == "" or itemname == nil then + lua._texture = "blank.png" + lua._scale = 1 + else + lua._texture = itemname + local def = minetest.registered_items[itemname] + lua._scale = def and def.wield_scale and def.wield_scale.x or 1 + end + lua:_update_texture() + if node.name == "extra_mobs:glow_item_frame" then + e:set_yaw(yaw) + end + else + local e = minetest.add_entity(pos, "extra_mobs:glow_item_frame_map", map_id) + e:set_yaw(yaw) + end end end @@ -174,6 +191,21 @@ minetest.register_node("extra_mobs:glow_item_frame",{ groups = { dig_immediate=3,deco_block=1,dig_by_piston=1,container=7,attached_node_facedir=1 }, sounds = mcl_sounds.node_sound_defaults(), node_placement_prediction = "", + on_timer = function(pos) + local inv = minetest.get_meta(pos):get_inventory() + local stack = inv:get_stack("main", 1) + local itemname = stack:get_name() + if minetest.get_item_group(itemname, "clock") > 0 then + local new_name = "mcl_clock:clock_" .. (mcl_worlds.clock_works(pos) and mcl_clock.old_time or mcl_clock.random_frame) + if itemname ~= new_name then + stack:set_name(new_name) + inv:set_stack("main", 1, stack) + local node = minetest.get_node(pos) + update_item_entity(pos, node, node.param2) + end + minetest.get_node_timer(pos):start(1.0) + end + end, on_place = function(itemstack, placer, pointed_thing) if pointed_thing.type ~= "node" then return itemstack @@ -214,6 +246,12 @@ minetest.register_node("extra_mobs:glow_item_frame",{ end local put_itemstack = ItemStack(itemstack) put_itemstack:set_count(1) + if minetest.get_item_group(itemname, "compass") > 0 then + put_itemstack:set_name("mcl_compass:" .. mcl_compass.get_compass_image(pos, minetest.dir_to_yaw(minetest.facedir_to_dir(node.param2)))) + end + if minetest.get_item_group(itemname, "clock") > 0 then + minetest.get_node_timer(pos):start(1.0) + end inv:set_stack("main", 1, put_itemstack) update_item_entity(pos, node) -- Add node infotext when item has been named @@ -327,4 +365,4 @@ minetest.register_lbm({ minetest.register_alias("extra_mobs:glow_frame", "extra_mobs:glow_item_frame") --------------------- \ No newline at end of file +-------------------- diff --git a/mods/ENTITIES/extra_mobs/mod.conf b/mods/ENTITIES/extra_mobs/mod.conf index 06298dd4d..5cbcb17ae 100644 --- a/mods/ENTITIES/extra_mobs/mod.conf +++ b/mods/ENTITIES/extra_mobs/mod.conf @@ -1,3 +1,3 @@ name = extra_mobs -depends = mcl_mobs, mobs_mc +depends = mcl_mobs, mobs_mc, mcl_compass, mcl_core, mcl_maps optional_depends = mc_warped_fungus_stick, mc_sweet_berry From 8d79e5f7f7804d79432dfb5ae89620d0a388184b Mon Sep 17 00:00:00 2001 From: 3raven Date: Mon, 30 May 2022 13:59:49 +0000 Subject: [PATCH 02/27] Attempt to fix map on itemframe by using EliasFleckenstein changes from mcl2 --- mods/ITEMS/mcl_maps/init.lua | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/mods/ITEMS/mcl_maps/init.lua b/mods/ITEMS/mcl_maps/init.lua index 640147bc5..b33e83d78 100644 --- a/mods/ITEMS/mcl_maps/init.lua +++ b/mods/ITEMS/mcl_maps/init.lua @@ -8,6 +8,8 @@ local map_textures_path = worldpath .. "/mcl_maps/" local math_min = math.min local math_max = math.max +local dynamic_add_media = minetest.dynamic_add_media + minetest.mkdir(map_textures_path) local function load_json_file(name) @@ -144,7 +146,7 @@ end local loading_maps = {} -function mcl_maps.load_map(id) +function mcl_maps.load_map(id, callback) if id == "" or creating_maps[id] or loading_maps[id] then return end @@ -153,14 +155,28 @@ function mcl_maps.load_map(id) if not loaded_maps[id] then loading_maps[id] = true - minetest.dynamic_add_media({filepath = map_textures_path .. texture, ephemeral = true}, function(player_name) - loaded_maps[id] = true - loading_maps[id] = nil - end) - return + if not minetest.features.dynamic_add_media_table then + -- minetest.dynamic_add_media() blocks in + -- Minetest 5.3 and 5.4 until media loads + dynamic_add_media(map_textures_path .. texture, function(player_name) end) + loaded_maps[id] = true + if callback then callback(texture) end + loading_maps[id] = nil + else + -- minetest.dynamic_add_media() never blocks + -- in Minetest 5.5, callback runs after load + dynamic_add_media(map_textures_path .. texture, function(player_name) + loaded_maps[id] = true + if callback then callback(texture) end + loading_maps[id] = nil + end) + end end - return texture + if loaded_maps[id] then + if callback then callback(texture) end + return texture + end end function mcl_maps.load_map_item(itemstack) From 50cbde6380a13d3f28da3740d6744ad699a3e88f Mon Sep 17 00:00:00 2001 From: 3raven Date: Mon, 30 May 2022 14:02:06 +0000 Subject: [PATCH 03/27] Atteempt to fix map on itemframe by using EliasFlickenstein in mcl2 --- mods/ITEMS/mcl_itemframes/init.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_itemframes/init.lua b/mods/ITEMS/mcl_itemframes/init.lua index 5dde560b7..5937a16cf 100644 --- a/mods/ITEMS/mcl_itemframes/init.lua +++ b/mods/ITEMS/mcl_itemframes/init.lua @@ -65,7 +65,10 @@ minetest.register_entity("mcl_itemframes:map", { }, on_activate = function(self, staticdata) self.id = staticdata - self.object:set_properties({textures = {mcl_maps.load_map(self.id)}}) + mcl_maps.load_map(self.id, function(texture) + -- will not crash even if self.object is invalid by now + self.object:set_properties({textures = {texture}}) + end) end, get_staticdata = function(self) return self.id From cc81b51128753de2f5ad0455c7871522a50104a8 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 12:17:52 +0000 Subject: [PATCH 05/27] fix map in itemframes Fix the map in iteframes problem in newly created worlds but might not work in older ones+ add tga dependancy --- mods/ITEMS/mcl_maps/init.lua | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/mods/ITEMS/mcl_maps/init.lua b/mods/ITEMS/mcl_maps/init.lua index b33e83d78..0c88fc1d6 100644 --- a/mods/ITEMS/mcl_maps/init.lua +++ b/mods/ITEMS/mcl_maps/init.lua @@ -57,7 +57,8 @@ function mcl_maps.create_map(pos) local map_y_start = 64 * dx local map_y_limit = 127 * dx - local pixels = "" + --local pixels = "" + local pixels = {} local last_heightmap for x = 1, 128 do local map_x = x + offset @@ -127,48 +128,51 @@ function mcl_maps.create_map(pos) height = map_y - map_z heightmap[z] = height or minp.y - - if not color then color = {0, 0, 0} end - pixels = pixels .. minetest.colorspec_to_bytes({r = color[1], g = color[2], b = color[3]}) + pixels[z] = pixels[z] or {} + pixels[z][x] = color or {0, 0, 0} + --if not color then color = {0, 0, 0} end + --pixels = pixels .. minetest.colorspec_to_bytes({r = color[1], g = color[2], b = color[3]}) end last_heightmap = heightmap end - local png = minetest.encode_png(128, 128, pixels) - local f = io.open(map_textures_path .. "mcl_maps_map_texture_" .. id .. ".png", "wb") - if not f then return end - f:write(png) - f:close() - creating_maps[id] = nil + --local png = minetest.encode_png(128, 128, pixels) + --local f = io.open(map_textures_path .. "mcl_maps_map_texture_" .. id .. ".png", "wb") + --if not f then return end + --f:write(png) + --f:close() + tga_encoder.image(pixels):save(map_textures_path .. "mcl_maps_map_texture_" .. id .. ".tga") + creating_maps[id] = nil end) return itemstack end -local loading_maps = {} +--local loading_maps = {} function mcl_maps.load_map(id, callback) - if id == "" or creating_maps[id] or loading_maps[id] then + if id == "" or creating_maps[id] then--or loading_maps[id] then return end - local texture = "mcl_maps_map_texture_" .. id .. ".png" + --local texture = "mcl_maps_map_texture_" .. id .. ".png" + local texture = "mcl_maps_map_texture_" .. id .. ".tga" if not loaded_maps[id] then - loading_maps[id] = true + --loading_maps[id] = true if not minetest.features.dynamic_add_media_table then -- minetest.dynamic_add_media() blocks in -- Minetest 5.3 and 5.4 until media loads dynamic_add_media(map_textures_path .. texture, function(player_name) end) loaded_maps[id] = true if callback then callback(texture) end - loading_maps[id] = nil + --loading_maps[id] = nil else -- minetest.dynamic_add_media() never blocks -- in Minetest 5.5, callback runs after load dynamic_add_media(map_textures_path .. texture, function(player_name) loaded_maps[id] = true if callback then callback(texture) end - loading_maps[id] = nil + --loading_maps[id] = nil end) end end From fa9a06a6d585b3e25ddc9c126600682c659a58a0 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 12:22:19 +0000 Subject: [PATCH 06/27] Add tga_encoder dependancy --- mods/ITEMS/mcl_maps/mod.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_maps/mod.conf b/mods/ITEMS/mcl_maps/mod.conf index efe1708dd..9134296b9 100644 --- a/mods/ITEMS/mcl_maps/mod.conf +++ b/mods/ITEMS/mcl_maps/mod.conf @@ -1,2 +1,2 @@ name = mcl_maps -depends = mcl_core, mcl_flowers, tt, mcl_colors, mcl_skins, mcl_util, mcl_time +depends = mcl_core, mcl_flowers, tt, mcl_colors, mcl_skins, mcl_util, mcl_time, tga_encoder From 0e1b4d8fea8d6e387c5be2c1a0b13de8c1ea120d Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 12:24:41 +0000 Subject: [PATCH 07/27] Adding tga_encoder (fleckenstein's) Adding tga_encoder for displaying maps (from here https://content.minetest.net/packages/erlehmann/tga_encoder/) --- mods/CORE/tga_encoder/LICENSE | 674 +++++++++++++++++++++++++++++ mods/CORE/tga_encoder/README.md | 87 ++++ mods/CORE/tga_encoder/examples.lua | 150 +++++++ mods/CORE/tga_encoder/init.lua | 594 +++++++++++++++++++++++++ mods/CORE/tga_encoder/mod.conf | 2 + 5 files changed, 1507 insertions(+) create mode 100644 mods/CORE/tga_encoder/LICENSE create mode 100644 mods/CORE/tga_encoder/README.md create mode 100644 mods/CORE/tga_encoder/examples.lua create mode 100644 mods/CORE/tga_encoder/init.lua create mode 100644 mods/CORE/tga_encoder/mod.conf diff --git a/mods/CORE/tga_encoder/LICENSE b/mods/CORE/tga_encoder/LICENSE new file mode 100644 index 000000000..f288702d2 --- /dev/null +++ b/mods/CORE/tga_encoder/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/mods/CORE/tga_encoder/README.md b/mods/CORE/tga_encoder/README.md new file mode 100644 index 000000000..1ad978a22 --- /dev/null +++ b/mods/CORE/tga_encoder/README.md @@ -0,0 +1,87 @@ +# tga_encoder +A TGA Encoder written in Lua without the use of external Libraries. + +Created by fleckenstein for MineClone2, then improved by erlehmann. + +May be used as a Minetest mod. + +See `examples.lua` for example code and usage hints. + +## Use Cases for `tga_encoder` + +### Encoding Textures for Editing + +TGA images of types 1/2/3 consist of header data followed by a pixel array. + +This makes it trivial to parse TGA files – and even edit pixels in-place. + +No checksums need to be updated on any kind of in-place texture editing. + +**Tip**: When storing an editable image in item meta, use zlib compression. + +### Legacy Minetest Texture Encoding + +Minetest 5.4 did not include `minetest.encode_png()` (or any equvivalent). + +Since `tga_encoder` is written in pure Lua, it does not need engine support. + +**Tip:** Look at `examples.lua` and the Minetest mod `mcl_maps` for guidance. + +### Advanced Texture Format Control + +The function `minetest.encode_png()` always encodes images as 32bpp RGBA. + +`tga_encoder` allows saving images as grayscale, 16bpp RGBA and 24bpp RGB. + +For generating maps from terrain, color-mapped formats can be more useful. + +### Encoding Very Small Textures + +Images of size 8×8 or below are often smaller than an equivalent PNG file. + +Note that on many filesystems files use at least 4096 bytes (i.e. 64×64). + +Therefore, saving bytes on files up to a few 100 bytes is often useless. + +### Encoding Reference Textures + +TGA is a simple format, which makes it easy to create reference textures. + +Using a hex editor, one can trivially see how all the pixels are stored. + +## Supported Image Types + +For all types, images are encoded in a fast single pass (i.e. append-only). + +### Color-Mapped Images (Type 1) + +These images contain a palette, followed by pixel data. + +* `A1R5G5B5` (8bpp RGB) +* `B8G8R8` (8bpp RGB) +* `B8G8R8A8` (8bpp RGBA) + +### True-Color Images (Type 2) + +These images contain uncompressed RGB(A) pixel data. + +* `A1R5G5B5` (16bpp RGBA) +* `B8G8R8` (24bpp RGB) +* `B8G8R8A8` (32bpp RGBA) + +### Grayscale Images (Type 3) + +* `Y8` (8bpp grayscale) + +### Run-Length Encoded (RLE), True-Color Images (Type 10) + +These images contain compressed RGB(A) pixel data. + +* `A1R5G5B5` (16bpp RGBA) +* `B8G8R8` (24bpp RGB) +* `B8G8R8A8` (32bpp RGBA) + +## TODO + +* Actually support `R8G8B8A8` input for `A1R5G5B5` output +* Add both zoomable and explorable maps to `mcl_maps`. diff --git a/mods/CORE/tga_encoder/examples.lua b/mods/CORE/tga_encoder/examples.lua new file mode 100644 index 000000000..7642281aa --- /dev/null +++ b/mods/CORE/tga_encoder/examples.lua @@ -0,0 +1,150 @@ +dofile("init.lua") + +-- encode a bitmap +local _ = { 0, 0, 0 } +local R = { 255, 127, 127 } +local pixels = { + { _, _, _, _, _, _, _ }, + { _, _, _, R, _, _, _ }, + { _, _, R, R, R, _, _ }, + { _, R, R, R, R, R, _ }, + { _, R, R, R, R, R, _ }, + { _, _, R, _, R, _, _ }, + { _, _, _, _, _, _, _ }, +} +tga_encoder.image(pixels):save("bitmap_small.tga") + +-- change a single pixel, then rescale the bitmap +local pixels_orig = pixels +pixels_orig[4][4] = { 255, 255, 255 } +local pixels = {} +for x = 1,56,1 do + local x_orig = math.ceil(x/8) + for z = 1,56,1 do + local z_orig = math.ceil(z/8) + local color = pixels_orig[z_orig][x_orig] + pixels[z] = pixels[z] or {} + pixels[z][x] = color + end +end +tga_encoder.image(pixels):save("bitmap_large.tga") + +-- note that the uncompressed grayscale TGA file written in this +-- example is 80 bytes – but an optimized PNG file is 81 bytes … +local pixels = {} +for x = 1,6,1 do -- left to right + for z = 1,6,1 do -- bottom to top + local color = { math.min(x * z * 4 - 1, 255) } + pixels[z] = pixels[z] or {} + pixels[z][x] = color + end +end +tga_encoder.image(pixels):save("gradient_8bpp_raw.tga", {color_format="Y8", compression="RAW"}) + +local pixels = {} +for x = 1,16,1 do -- left to right + for z = 1,16,1 do -- bottom to top + local r = math.min(x * 32 - 1, 255) + local g = math.min(z * 32 - 1, 255) + local b = 0 + -- blue rectangle in top right corner + if x > 8 and z > 8 then + r = 0 + g = 0 + b = math.min(z * 16 - 1, 255) + end + local color = { r, g, b } + pixels[z] = pixels[z] or {} + pixels[z][x] = color + end +end +local gradients = tga_encoder.image(pixels) +gradients:save("gradients_8bpp_raw.tga", {color_format="Y8", compression="RAW"}) +gradients:save("gradients_16bpp_raw.tga", {color_format="A1R5G5B5", compression="RAW"}) +gradients:save("gradients_16bpp_rle.tga", {color_format="A1R5G5B5", compression="RLE"}) +gradients:save("gradients_24bpp_raw.tga", {color_format="B8G8R8", compression="RAW"}) +gradients:save("gradients_24bpp_rle.tga", {color_format="B8G8R8", compression="RLE"}) + +for x = 1,16,1 do -- left to right + for z = 1,16,1 do -- bottom to top + local color = pixels[z][x] + color[#color+1] = ((x * x) + (z * z)) % 256 + pixels[z][x] = color + end +end +gradients:save("gradients_32bpp_raw.tga", {color_format="B8G8R8A8", compression="RAW"}) +-- the RLE-compressed file is larger than just dumping pixels because +-- the gradients in this picture can not be compressed well using RLE +gradients:save("gradients_32bpp_rle.tga", {color_format="B8G8R8A8", compression="RLE"}) + +local pixels = {} +for x = 1,512,1 do -- left to right + for z = 1,512,1 do -- bottom to top + local oz = (z - 256) / 256 + 0.75 + local ox = (x - 256) / 256 + local px, pz, i = 0, 0, 0 + while (px * px) + (pz * pz) <= 4 and i < 128 do + px = (px * px) - (pz * pz) + oz + pz = (2 * px * pz) + ox + i = i + 1 + end + local color = { + math.max(0, math.min(255, math.floor(px * 64))), + math.max(0, math.min(255, math.floor(pz * 64))), + math.max(0, math.min(255, math.floor(i))), + } + pixels[z] = pixels[z] or {} + pixels[z][x] = color + end +end +tga_encoder.image(pixels):save("fractal_8bpp.tga", {color_format="Y8"}) +tga_encoder.image(pixels):save("fractal_16bpp.tga", {color_format="A1R5G5B5"}) +tga_encoder.image(pixels):save("fractal_24bpp.tga", {color_format="B8G8R8"}) + +-- encode a colormapped bitmap +local K = { 0 } +local B = { 1 } +local R = { 2 } +local G = { 3 } +local W = { 4 } +local colormap = { + { 1, 2, 3 }, -- K + { 0, 0, 255 }, -- B + { 255, 0, 0 }, -- R + { 0, 255, 0 }, -- G + { 253, 254, 255 }, -- W +} +local pixels = { + { W, K, W, K, W, K, W }, + { R, G, B, R, G, B, K }, + { K, W, K, W, K, W, K }, + { G, B, R, G, B, R, W }, + { W, W, W, K, K, K, W }, + { B, R, G, B, R, G, K }, + { B, R, G, B, R, G, W }, +} +-- note that the uncompressed colormapped TGA file written in this +-- example is 108 bytes – but an optimized PNG file is 121 bytes … +tga_encoder.image(pixels):save("colormapped_B8G8R8.tga", {colormap=colormap}) +-- encoding as A1R5G5B5 saves 1 byte per palette entry → 103 bytes +tga_encoder.image(pixels):save("colormapped_A1R5G5B5.tga", {colormap=colormap, color_format="A1R5G5B5"}) + +-- encode a colormapped bitmap with transparency +local _ = { 0 } +local K = { 1 } +local W = { 2 } +local colormap = { + { 0, 0, 0, 0 }, + { 0, 0, 0, 255 }, + { 255, 255, 255, 255 }, +} +local pixels = { + { _, K, K, K, K, K, _ }, + { _, K, W, W, W, K, _ }, + { K, K, W, W, W, K, K }, + { K, W, W, W, W, W, K }, + { _, K, W, W, W, K, _ }, + { _, _, K, W, K, _, _ }, + { _, _, _, K, _, _, _ }, +} +tga_encoder.image(pixels):save("colormapped_B8G8R8A8.tga", {colormap=colormap}) diff --git a/mods/CORE/tga_encoder/init.lua b/mods/CORE/tga_encoder/init.lua new file mode 100644 index 000000000..ed387eec0 --- /dev/null +++ b/mods/CORE/tga_encoder/init.lua @@ -0,0 +1,594 @@ +tga_encoder = {} + +local image = setmetatable({}, { + __call = function(self, ...) + local t = setmetatable({}, {__index = self}) + t:constructor(...) + return t + end, +}) + +function image:constructor(pixels) + self.pixels = pixels + self.width = #pixels[1] + self.height = #pixels +end + +local pixel_depth_by_color_format = { + ["Y8"] = 8, + ["A1R5G5B5"] = 16, + ["B8G8R8"] = 24, + ["B8G8R8A8"] = 32, +} + +function image:encode_colormap_spec(properties) + local colormap = properties.colormap + local colormap_pixel_depth = 0 + if 0 ~= #colormap then + colormap_pixel_depth = pixel_depth_by_color_format[ + properties.color_format + ] + end + local colormap_spec = + string.char(0, 0) .. -- first entry index + string.char(#colormap % 256, math.floor(#colormap / 256)) .. -- number of entries + string.char(colormap_pixel_depth) -- bits per pixel + self.data = self.data .. colormap_spec +end + +function image:encode_image_spec(properties) + local color_format = properties.color_format + assert( + "Y8" == color_format or -- (8 bit grayscale = 1 byte = 8 bits) + "A1R5G5B5" == color_format or -- (A1R5G5B5 = 2 bytes = 16 bits) + "B8G8R8" == color_format or -- (B8G8R8 = 3 bytes = 24 bits) + "B8G8R8A8" == color_format -- (B8G8R8A8 = 4 bytes = 32 bits) + ) + local pixel_depth + if 0 ~= #properties.colormap then + pixel_depth = self.pixel_depth + else + pixel_depth = pixel_depth_by_color_format[color_format] + end + assert( nil ~= pixel_depth) + self.data = self.data + .. string.char(0, 0) -- X-origin + .. string.char(0, 0) -- Y-origin + .. string.char(self.width % 256, math.floor(self.width / 256)) -- width + .. string.char(self.height % 256, math.floor(self.height / 256)) -- height + .. string.char(pixel_depth) + .. string.char(0) -- image descriptor +end + +function image:encode_colormap(properties) + local colormap = properties.colormap + if 0 == #colormap then + return + end + local color_format = properties.color_format + assert ( + "A1R5G5B5" == color_format or + "B8G8R8" == color_format or + "B8G8R8A8" == color_format + ) + local colors = {} + if "A1R5G5B5" == color_format then + -- Sample depth rescaling is done according to the algorithm presented in: + -- + local max_sample_in = math.pow(2, 8) - 1 + local max_sample_out = math.pow(2, 5) - 1 + for i = 1,#colormap,1 do + local color = colormap[i] + local colorword = 32768 + + ((math.floor((color[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) + + ((math.floor((color[2] * max_sample_out / max_sample_in) + 0.5)) * 32) + + ((math.floor((color[3] * max_sample_out / max_sample_in) + 0.5)) * 1) + local color_bytes = string.char( + colorword % 256, + math.floor(colorword / 256) + ) + colors[#colors + 1] = color_bytes + end + elseif "B8G8R8" == color_format then + for i = 1,#colormap,1 do + local color = colormap[i] + local color_bytes = string.char( + color[3], -- B + color[2], -- G + color[1] -- R + ) + colors[#colors + 1] = color_bytes + end + elseif "B8G8R8A8" == color_format then + for i = 1,#colormap,1 do + local color = colormap[i] + local color_bytes = string.char( + color[3], -- B + color[2], -- G + color[1], -- R + color[4] -- A + ) + colors[#colors + 1] = color_bytes + end + end + assert( 0 ~= #colors ) + self.data = self.data .. table.concat(colors) +end + +function image:encode_header(properties) + local color_format = properties.color_format + local colormap = properties.colormap + local compression = properties.compression + local colormap_type + local image_type + if "Y8" == color_format and "RAW" == compression then + colormap_type = 0 + image_type = 3 -- grayscale + elseif ( + "A1R5G5B5" == color_format or + "B8G8R8" == color_format or + "B8G8R8A8" == color_format + ) then + if "RAW" == compression then + if 0 ~= #colormap then + colormap_type = 1 + image_type = 1 -- colormapped RGB(A) + else + colormap_type = 0 + image_type = 2 -- RAW RGB(A) + end + elseif "RLE" == compression then + colormap_type = 0 + image_type = 10 -- RLE RGB + end + end + assert( nil ~= colormap_type ) + assert( nil ~= image_type ) + self.data = self.data + .. string.char(0) -- image id + .. string.char(colormap_type) + .. string.char(image_type) + self:encode_colormap_spec(properties) -- color map specification + self:encode_image_spec(properties) -- image specification + self:encode_colormap(properties) +end + +function image:encode_data(properties) + local color_format = properties.color_format + local colormap = properties.colormap + local compression = properties.compression + + local data_length_before = #self.data + if "Y8" == color_format and "RAW" == compression then + if 8 == self.pixel_depth then + self:encode_data_Y8_as_Y8_raw() + elseif 24 == self.pixel_depth then + self:encode_data_R8G8B8_as_Y8_raw() + end + elseif "A1R5G5B5" == color_format then + if 0 ~= #colormap then + if "RAW" == compression then + if 8 == self.pixel_depth then + self:encode_data_Y8_as_Y8_raw() + end + end + else + if "RAW" == compression then + self:encode_data_R8G8B8_as_A1R5G5B5_raw() + elseif "RLE" == compression then + self:encode_data_R8G8B8_as_A1R5G5B5_rle() + end + end + elseif "B8G8R8" == color_format then + if 0 ~= #colormap then + if "RAW" == compression then + if 8 == self.pixel_depth then + self:encode_data_Y8_as_Y8_raw() + end + end + else + if "RAW" == compression then + self:encode_data_R8G8B8_as_B8G8R8_raw() + elseif "RLE" == compression then + self:encode_data_R8G8B8_as_B8G8R8_rle() + end + end + elseif "B8G8R8A8" == color_format then + if 0 ~= #colormap then + if "RAW" == compression then + if 8 == self.pixel_depth then + self:encode_data_Y8_as_Y8_raw() + end + end + else + if "RAW" == compression then + self:encode_data_R8G8B8A8_as_B8G8R8A8_raw() + elseif "RLE" == compression then + self:encode_data_R8G8B8A8_as_B8G8R8A8_rle() + end + end + end + local data_length_after = #self.data + assert( + data_length_after ~= data_length_before, + "No data encoded for color format: " .. color_format + ) +end + +function image:encode_data_Y8_as_Y8_raw() + assert(8 == self.pixel_depth) + local raw_pixels = {} + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + local raw_pixel = string.char(pixel[1]) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + +function image:encode_data_R8G8B8_as_Y8_raw() + assert(24 == self.pixel_depth) + local raw_pixels = {} + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + -- the HSP RGB to brightness formula is + -- sqrt( 0.299 r² + .587 g² + .114 b² ) + -- see + local gray = math.floor( + math.sqrt( + 0.299 * pixel[1]^2 + + 0.587 * pixel[2]^2 + + 0.114 * pixel[3]^2 + ) + 0.5 + ) + local raw_pixel = string.char(gray) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + +function image:encode_data_R8G8B8_as_A1R5G5B5_raw() + assert(24 == self.pixel_depth) + local raw_pixels = {} + -- Sample depth rescaling is done according to the algorithm presented in: + -- + local max_sample_in = math.pow(2, 8) - 1 + local max_sample_out = math.pow(2, 5) - 1 + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + local colorword = 32768 + + ((math.floor((pixel[1] * max_sample_out / max_sample_in) + 0.5)) * 1024) + + ((math.floor((pixel[2] * max_sample_out / max_sample_in) + 0.5)) * 32) + + ((math.floor((pixel[3] * max_sample_out / max_sample_in) + 0.5)) * 1) + local raw_pixel = string.char(colorword % 256, math.floor(colorword / 256)) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + +function image:encode_data_R8G8B8_as_A1R5G5B5_rle() + assert(24 == self.pixel_depth) + local colorword = nil + local previous_r = nil + local previous_g = nil + local previous_b = nil + local raw_pixel = '' + local raw_pixels = {} + local count = 1 + local packets = {} + local raw_packet = '' + local rle_packet = '' + -- Sample depth rescaling is done according to the algorithm presented in: + -- + local max_sample_in = math.pow(2, 8) - 1 + local max_sample_out = math.pow(2, 5) - 1 + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then + if nil ~= previous_r then + colorword = 32768 + + ((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) + + ((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) + + ((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1) + if 1 == count then + -- remember pixel verbatim for raw encoding + raw_pixel = string.char(colorword % 256, math.floor(colorword / 256)) + raw_pixels[#raw_pixels + 1] = raw_pixel + if 128 == #raw_pixels then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256)) + packets[#packets +1] = rle_packet + end + end + count = 1 + previous_r = pixel[1] + previous_g = pixel[2] + previous_b = pixel[3] + else + count = count + 1 + end + end + end + colorword = 32768 + + ((math.floor((previous_r * max_sample_out / max_sample_in) + 0.5)) * 1024) + + ((math.floor((previous_g * max_sample_out / max_sample_in) + 0.5)) * 32) + + ((math.floor((previous_b * max_sample_out / max_sample_in) + 0.5)) * 1) + if 1 == count then + raw_pixel = string.char(colorword % 256, math.floor(colorword / 256)) + raw_pixels[#raw_pixels + 1] = raw_pixel + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, colorword % 256, math.floor(colorword / 256)) + packets[#packets +1] = rle_packet + end + self.data = self.data .. table.concat(packets) +end + +function image:encode_data_R8G8B8_as_B8G8R8_raw() + assert(24 == self.pixel_depth) + local raw_pixels = {} + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + local raw_pixel = string.char(pixel[3], pixel[2], pixel[1]) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + +function image:encode_data_R8G8B8_as_B8G8R8_rle() + assert(24 == self.pixel_depth) + local previous_r = nil + local previous_g = nil + local previous_b = nil + local raw_pixel = '' + local raw_pixels = {} + local count = 1 + local packets = {} + local raw_packet = '' + local rle_packet = '' + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or count == 128 then + if nil ~= previous_r then + if 1 == count then + -- remember pixel verbatim for raw encoding + raw_pixel = string.char(previous_b, previous_g, previous_r) + raw_pixels[#raw_pixels + 1] = raw_pixel + if 128 == #raw_pixels then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r) + packets[#packets +1] = rle_packet + end + end + count = 1 + previous_r = pixel[1] + previous_g = pixel[2] + previous_b = pixel[3] + else + count = count + 1 + end + end + end + if 1 == count then + raw_pixel = string.char(previous_b, previous_g, previous_r) + raw_pixels[#raw_pixels + 1] = raw_pixel + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r) + packets[#packets +1] = rle_packet + end + self.data = self.data .. table.concat(packets) +end + +function image:encode_data_R8G8B8A8_as_B8G8R8A8_raw() + assert(32 == self.pixel_depth) + local raw_pixels = {} + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + local raw_pixel = string.char(pixel[3], pixel[2], pixel[1], pixel[4]) + raw_pixels[#raw_pixels + 1] = raw_pixel + end + end + self.data = self.data .. table.concat(raw_pixels) +end + +function image:encode_data_R8G8B8A8_as_B8G8R8A8_rle() + assert(32 == self.pixel_depth) + local previous_r = nil + local previous_g = nil + local previous_b = nil + local previous_a = nil + local raw_pixel = '' + local raw_pixels = {} + local count = 1 + local packets = {} + local raw_packet = '' + local rle_packet = '' + for _, row in ipairs(self.pixels) do + for _, pixel in ipairs(row) do + if pixel[1] ~= previous_r or pixel[2] ~= previous_g or pixel[3] ~= previous_b or pixel[4] ~= previous_a or count == 128 then + if nil ~= previous_r then + if 1 == count then + -- remember pixel verbatim for raw encoding + raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a) + raw_pixels[#raw_pixels + 1] = raw_pixel + if 128 == #raw_pixels then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a) + packets[#packets +1] = rle_packet + end + end + count = 1 + previous_r = pixel[1] + previous_g = pixel[2] + previous_b = pixel[3] + previous_a = pixel[4] + else + count = count + 1 + end + end + end + if 1 == count then + raw_pixel = string.char(previous_b, previous_g, previous_r, previous_a) + raw_pixels[#raw_pixels + 1] = raw_pixel + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + else + -- encode raw pixels, if any + if #raw_pixels > 0 then + raw_packet = string.char(#raw_pixels - 1) + packets[#packets + 1] = raw_packet + for i=1, #raw_pixels do + packets[#packets +1] = raw_pixels[i] + end + raw_pixels = {} + end + -- RLE encoding + rle_packet = string.char(128 + count - 1, previous_b, previous_g, previous_r, previous_a) + packets[#packets +1] = rle_packet + end + self.data = self.data .. table.concat(packets) +end + +function image:encode_footer() + self.data = self.data + .. string.char(0, 0, 0, 0) -- extension area offset + .. string.char(0, 0, 0, 0) -- developer area offset + .. "TRUEVISION-XFILE" + .. "." + .. string.char(0) +end + +function image:encode(properties) + self.data = "" + self:encode_header(properties) -- header + -- no color map and image id data + self:encode_data(properties) -- encode data + -- no extension or developer area + self:encode_footer() -- footer +end + +function image:save(filename, properties) + local properties = properties or {} + properties.colormap = properties.colormap or {} + properties.compression = properties.compression or "RAW" + + self.pixel_depth = #self.pixels[1][1] * 8 + + local color_format_defaults_by_pixel_depth = { + [8] = "Y8", + [24] = "B8G8R8", + [32] = "B8G8R8A8", + } + if nil == properties.color_format then + if 0 ~= #properties.colormap then + properties.color_format = + color_format_defaults_by_pixel_depth[ + #properties.colormap[1] * 8 + ] + else + properties.color_format = + color_format_defaults_by_pixel_depth[ + self.pixel_depth + ] + end + end + assert( nil ~= properties.color_format ) + + self:encode(properties) + + local f = assert(io.open(filename, "wb")) + f:write(self.data) + f:close() +end + +tga_encoder.image = image diff --git a/mods/CORE/tga_encoder/mod.conf b/mods/CORE/tga_encoder/mod.conf new file mode 100644 index 000000000..d65aca884 --- /dev/null +++ b/mods/CORE/tga_encoder/mod.conf @@ -0,0 +1,2 @@ +name = tga_encoder +description = A TGA Encoder written in Lua without the use of external Libraries. From 6df9027971b9bdc71041b497d6027f50034da68f Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 12:54:31 +0000 Subject: [PATCH 08/27] Fleckenstein's fix for mcl2 --- mods/ENTITIES/extra_mobs/glow_squid_items.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mods/ENTITIES/extra_mobs/glow_squid_items.lua b/mods/ENTITIES/extra_mobs/glow_squid_items.lua index 6895ee5ec..78370d9a8 100644 --- a/mods/ENTITIES/extra_mobs/glow_squid_items.lua +++ b/mods/ENTITIES/extra_mobs/glow_squid_items.lua @@ -86,7 +86,10 @@ minetest.register_entity("extra_mobs:glow_item_frame_map", { }, on_activate = function(self, staticdata) self.id = staticdata - self.object:set_properties({textures = {mcl_maps.load_map(self.id)}}) + mcl_maps.load_map(self.id, function(texture) + -- will not crash even if self.object is invalid by now + self.object:set_properties({textures = {texture}}) + end) end, get_staticdata = function(self) return self.id From 80a7ab971af8ce6cdb7d5381940f09d268e71f6b Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 21:59:41 +0000 Subject: [PATCH 09/27] Move glowing itemframe to itemframe and glowing ink sac to glow_squid --- mods/ENTITIES/extra_mobs/glow_squid_items.lua | 371 ------------------ 1 file changed, 371 deletions(-) delete mode 100644 mods/ENTITIES/extra_mobs/glow_squid_items.lua diff --git a/mods/ENTITIES/extra_mobs/glow_squid_items.lua b/mods/ENTITIES/extra_mobs/glow_squid_items.lua deleted file mode 100644 index 78370d9a8..000000000 --- a/mods/ENTITIES/extra_mobs/glow_squid_items.lua +++ /dev/null @@ -1,371 +0,0 @@ -local S = minetest.get_translator("extra_mobs") - -minetest.register_craftitem("extra_mobs:glow_ink_sac", { - description = S("Glow Ink Sac"), - _doc_items_longdesc = S("Use it to craft the Glow Item Frame."), - _doc_items_usagehelp = S("Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame."), - inventory_image = "extra_mobs_glow_ink_sac.png", - groups = { craftitem = 1 }, -}) - - --------------------- - ---[[This mod is originally by Zeg9, but heavily modified for MineClone 2. - -Model created by 22i, licensed under the -GNU GPLv3 . - -Source: -]] - - -local VISUAL_SIZE = 0.3 - -minetest.register_entity("extra_mobs:glow_item_frame_item",{ - hp_max = 1, - visual = "wielditem", - visual_size = {x=VISUAL_SIZE, y=VISUAL_SIZE}, - physical = false, - pointable = false, - textures = { "blank.png" }, - _texture = "blank.png", - _scale = 1, - glow = minetest.LIGHT_MAX, - - on_activate = function(self, staticdata) - if staticdata ~= nil and staticdata ~= "" then - local data = staticdata:split(';') - if data and data[1] and data[2] then - self._nodename = data[1] - self._texture = data[2] - if data[3] then - self._scale = data[3] - else - self._scale = 1 - end - end - end - if self._texture then - self.object:set_properties({ - textures={self._texture}, - visual_size={x=VISUAL_SIZE/self._scale, y=VISUAL_SIZE/self._scale}, - }) - end - end, - get_staticdata = function(self) - if not self then return end - if self._nodename and self._texture then - local ret = self._nodename .. ';' .. self._texture - if self._scale then - ret = ret .. ';' .. tostring(self._scale) - end - return ret - end - return "" - end, - - _update_texture = function(self) - if self._texture then - self.object:set_properties({ - textures={self._texture}, - visual_size={x=VISUAL_SIZE/self._scale, y=VISUAL_SIZE/self._scale}, - }) - end - end, -}) - -minetest.register_entity("extra_mobs:glow_item_frame_map", { - initial_properties = { - visual = "upright_sprite", - visual_size = {x = 1, y = 1}, - pointable = false, - physical = false, - collide_with_objects = false, - textures = {"blank.png"}, - }, - on_activate = function(self, staticdata) - self.id = staticdata - mcl_maps.load_map(self.id, function(texture) - -- will not crash even if self.object is invalid by now - self.object:set_properties({textures = {texture}}) - end) - end, - get_staticdata = function(self) - return self.id - end, -}) - -local facedir = {} -facedir[0] = {x=0,y=0,z=1} -facedir[1] = {x=1,y=0,z=0} -facedir[2] = {x=0,y=0,z=-1} -facedir[3] = {x=-1,y=0,z=0} - -local remove_item_entity = function(pos, node) - if node.name == "extra_mobs:glow_item_frame" then - for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.5)) do - local entity = obj:get_luaentity() - if entity and (entity.name == "extra_mobs:glow_item_frame_item" or entity.name == "extra_mobs:glow_item_frame_map") then - obj:remove() - end - end - end -end - - -local update_item_entity = function(pos, node, param2) - remove_item_entity(pos, node) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - local item = inv:get_stack("main", 1) - if not item:is_empty() then - if not param2 then - param2 = node.param2 - end - if node.name == "extra_mobs:glow_item_frame" then - local posad = facedir[param2] - pos.x = pos.x + posad.x*6.5/16 - pos.y = pos.y + posad.y*6.5/16 - pos.z = pos.z + posad.z*6.5/16 - end - local yaw = math.pi*2 - param2 * math.pi/2 - local map_id = item:get_meta():get_string("mcl_maps:id") - if map_id == "" then - local e = minetest.add_entity(pos, "extra_mobs:glow_item_frame_item") - local lua = e:get_luaentity() - lua._nodename = node.name - local itemname = item:get_name() - if itemname == "" or itemname == nil then - lua._texture = "blank.png" - lua._scale = 1 - else - lua._texture = itemname - local def = minetest.registered_items[itemname] - lua._scale = def and def.wield_scale and def.wield_scale.x or 1 - end - lua:_update_texture() - if node.name == "extra_mobs:glow_item_frame" then - e:set_yaw(yaw) - end - else - local e = minetest.add_entity(pos, "extra_mobs:glow_item_frame_map", map_id) - e:set_yaw(yaw) - end - end -end - -local drop_item = function(pos, node, meta, clicker) - local cname = "" - if clicker and clicker:is_player() then - cname = clicker:get_player_name() - end - if node.name == "extra_mobs:glow_item_frame" and not minetest.is_creative_enabled(cname) then - local inv = meta:get_inventory() - local item = inv:get_stack("main", 1) - if not item:is_empty() then - minetest.add_item(pos, item) - end - end - meta:set_string("infotext", "") - remove_item_entity(pos, node) -end - -minetest.register_node("extra_mobs:glow_item_frame",{ - description = S("Glow Item Frame"), - _tt_help = S("Can hold an item and glows"), - _doc_items_longdesc = S("Glow Item frames are decorative blocks in which items can be placed."), - _doc_items_usagehelp = S("Just place any item on the item frame. Use the item frame again to retrieve the item."), - drawtype = "mesh", - is_ground_content = false, - mesh = "extra_mobs_glow_item_frame.obj", - selection_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} }, - collision_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} }, - tiles = {"extra_mobs_glow_item_frame_border.png", "extra_mobs_glow_item_frame_border.png", "extra_mobs_glow_item_frame_border.png", "extra_mobs_glow_item_frame_border.png", "extra_mobs_glow_item_frame_border.png", "extra_mobs_glow_item_frame_border.png"}, - inventory_image = "extra_mobs_glow_item_frame_item.png", - wield_image = "extra_mobs_glow_item_frame.png", - paramtype = "light", - paramtype2 = "facedir", - - --FIXME: should only be glowing, no light source. How is that possible with a node? - light_source = 1, - - sunlight_propagates = true, - groups = { dig_immediate=3,deco_block=1,dig_by_piston=1,container=7,attached_node_facedir=1 }, - sounds = mcl_sounds.node_sound_defaults(), - node_placement_prediction = "", - on_timer = function(pos) - local inv = minetest.get_meta(pos):get_inventory() - local stack = inv:get_stack("main", 1) - local itemname = stack:get_name() - if minetest.get_item_group(itemname, "clock") > 0 then - local new_name = "mcl_clock:clock_" .. (mcl_worlds.clock_works(pos) and mcl_clock.old_time or mcl_clock.random_frame) - if itemname ~= new_name then - stack:set_name(new_name) - inv:set_stack("main", 1, stack) - local node = minetest.get_node(pos) - update_item_entity(pos, node, node.param2) - end - minetest.get_node_timer(pos):start(1.0) - end - end, - on_place = function(itemstack, placer, pointed_thing) - if pointed_thing.type ~= "node" then - return itemstack - end - - -- Use pointed node's on_rightclick function first, if present - local node = minetest.get_node(pointed_thing.under) - if placer and not placer:get_player_control().sneak then - if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then - return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack - end - end - - return minetest.item_place(itemstack, placer, pointed_thing, minetest.dir_to_facedir(vector.direction(pointed_thing.above, pointed_thing.under))) - end, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - inv:set_size("main", 1) - end, - on_rightclick = function(pos, node, clicker, itemstack) - if not itemstack then - return - end - local pname = clicker:get_player_name() - if minetest.is_protected(pos, pname) then - minetest.record_protection_violation(pos, pname) - return - end - local meta = minetest.get_meta(pos) - drop_item(pos, node, meta, clicker) - local inv = meta:get_inventory() - if itemstack:is_empty() then - remove_item_entity(pos, node) - meta:set_string("infotext", "") - inv:set_stack("main", 1, "") - return itemstack - end - local put_itemstack = ItemStack(itemstack) - put_itemstack:set_count(1) - if minetest.get_item_group(itemname, "compass") > 0 then - put_itemstack:set_name("mcl_compass:" .. mcl_compass.get_compass_image(pos, minetest.dir_to_yaw(minetest.facedir_to_dir(node.param2)))) - end - if minetest.get_item_group(itemname, "clock") > 0 then - minetest.get_node_timer(pos):start(1.0) - end - inv:set_stack("main", 1, put_itemstack) - update_item_entity(pos, node) - -- Add node infotext when item has been named - local imeta = itemstack:get_meta() - local iname = imeta:get_string("name") - if iname then - meta:set_string("infotext", iname) - end - - if not minetest.is_creative_enabled(clicker:get_player_name()) then - itemstack:take_item() - end - return itemstack - end, - allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local name = player:get_player_name() - if minetest.is_protected(pos, name) then - minetest.record_protection_violation(pos, name) - return 0 - else - return count - end - end, - allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local name = player:get_player_name() - if minetest.is_protected(pos, name) then - minetest.record_protection_violation(pos, name) - return 0 - else - return stack:get_count() - end - end, - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local name = player:get_player_name() - if minetest.is_protected(pos, name) then - minetest.record_protection_violation(pos, name) - return 0 - else - return stack:get_count() - end - end, - on_destruct = function(pos) - local meta = minetest.get_meta(pos) - local node = minetest.get_node(pos) - drop_item(pos, node, meta) - end, - on_rotate = function(pos, node, user, mode, param2) - if mode == screwdriver.ROTATE_FACE then - -- Rotate face - local meta = minetest.get_meta(pos) - local node = minetest.get_node(pos) - - local objs = nil - if node.name == "extra_mobs:glow_item_frame" then - objs = minetest.get_objects_inside_radius(pos, .5) - end - if objs then - for _, obj in ipairs(objs) do - if obj and obj:get_luaentity() and obj:get_luaentity().name == "extra_mobs:glow_item_frame_item" then - update_item_entity(pos, node, (node.param2+1) % 4) - break - end - end - end - return - elseif mode == screwdriver.ROTATE_AXIS then - return false - end - end, - -}) - -minetest.register_craft({ - type = "shapeless", - output = 'extra_mobs:glow_item_frame', - recipe = {'mcl_itemframes:item_frame', 'extra_mobs:glow_ink_sac'}, -}) - -minetest.register_lbm({ - label = "Update legacy item frames", - name = "extra_mobs:update_legacy_glow_item_frames", - nodenames = {"extra_mobs:glow_frame"}, - action = function(pos, node) - -- Swap legacy node, then respawn entity - node.name = "extra_mobs:glow_item_frame" - local meta = minetest.get_meta(pos) - local item = meta:get_string("item") - minetest.swap_node(pos, node) - if item ~= "" then - local itemstack = ItemStack(minetest.deserialize(meta:get_string("itemdata"))) - local inv = meta:get_inventory() - inv:set_size("main", 1) - if not itemstack:is_empty() then - inv:set_stack("main", 1, itemstack) - end - end - update_item_entity(pos, node) - end, -}) - --- FIXME: Item entities can get destroyed by /clearobjects -minetest.register_lbm({ - label = "Respawn item frame item entities", - name = "extra_mobs:respawn_entities", - nodenames = {"extra_mobs:glow_item_frame"}, - run_at_every_load = true, - action = function(pos, node) - update_item_entity(pos, node) - end, -}) - -minetest.register_alias("extra_mobs:glow_frame", "extra_mobs:glow_item_frame") - --------------------- From 7f1c09de594d63c7979ea4d28b6eb4b4aec2e731 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:00:52 +0000 Subject: [PATCH 10/27] Move glowing itemframes --- mods/ENTITIES/extra_mobs/init.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/mods/ENTITIES/extra_mobs/init.lua b/mods/ENTITIES/extra_mobs/init.lua index 28fab0eeb..af35e1c3f 100644 --- a/mods/ENTITIES/extra_mobs/init.lua +++ b/mods/ENTITIES/extra_mobs/init.lua @@ -21,8 +21,3 @@ dofile(path .. "/cod.lua") dofile(path .. "/salmon.lua") dofile(path .. "/dolphin.lua") dofile(path .. "/glow_squid.lua") - ---Items -dofile(path .. "/glow_squid_items.lua") - - From 7b5cc25c6c97a77b01ff54121bd661a73095a84e Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:02:13 +0000 Subject: [PATCH 11/27] Move glowing ink --- mods/ENTITIES/extra_mobs/glow_squid.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mods/ENTITIES/extra_mobs/glow_squid.lua b/mods/ENTITIES/extra_mobs/glow_squid.lua index 2169e1ddb..41c530e63 100644 --- a/mods/ENTITIES/extra_mobs/glow_squid.lua +++ b/mods/ENTITIES/extra_mobs/glow_squid.lua @@ -231,3 +231,13 @@ water) -- spawn egg mobs:register_egg("extra_mobs:glow_squid", S("Glow Squid"), "extra_mobs_spawn_icon_glow_squid.png", 0) + +-- dropped item (used to craft glowing itemframe) + +minetest.register_craftitem("extra_mobs:glow_ink_sac", { + description = S("Glow Ink Sac"), + _doc_items_longdesc = S("Use it to craft the Glow Item Frame."), + _doc_items_usagehelp = S("Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame."), + inventory_image = "extra_mobs_glow_ink_sac.png", + groups = { craftitem = 1 }, +}) From a97d6ec20d33e3e2f45a9dfdeb709245961667dd Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:04:15 +0000 Subject: [PATCH 12/27] Move glowing itemframes --- mods/ITEMS/mcl_itemframes/mod.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_itemframes/mod.conf b/mods/ITEMS/mcl_itemframes/mod.conf index ff09c3bcc..c8f25009c 100644 --- a/mods/ITEMS/mcl_itemframes/mod.conf +++ b/mods/ITEMS/mcl_itemframes/mod.conf @@ -1,3 +1,3 @@ name = mcl_itemframes -depends = mcl_core, mcl_sounds, mcl_compass, mcl_maps +depends = mcl_core, mcl_sounds, mcl_compass, mcl_maps, extra_mobs optional_depends = screwdriver From 3ce000918135c13507207f7727c4b703dd797d63 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:05:49 +0000 Subject: [PATCH 13/27] Move glowing itemframes --- mods/ENTITIES/extra_mobs/mod.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ENTITIES/extra_mobs/mod.conf b/mods/ENTITIES/extra_mobs/mod.conf index 5cbcb17ae..06298dd4d 100644 --- a/mods/ENTITIES/extra_mobs/mod.conf +++ b/mods/ENTITIES/extra_mobs/mod.conf @@ -1,3 +1,3 @@ name = extra_mobs -depends = mcl_mobs, mobs_mc, mcl_compass, mcl_core, mcl_maps +depends = mcl_mobs, mobs_mc optional_depends = mc_warped_fungus_stick, mc_sweet_berry From 493fb95e52f63457f429162d78427d59bf72a41d Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:07:30 +0000 Subject: [PATCH 14/27] Move glowing itemframe --- .../models/extra_mobs_glow_item_frame.obj | 156 ------------------ 1 file changed, 156 deletions(-) delete mode 100644 mods/ENTITIES/extra_mobs/models/extra_mobs_glow_item_frame.obj diff --git a/mods/ENTITIES/extra_mobs/models/extra_mobs_glow_item_frame.obj b/mods/ENTITIES/extra_mobs/models/extra_mobs_glow_item_frame.obj deleted file mode 100644 index d0a5b0c5f..000000000 --- a/mods/ENTITIES/extra_mobs/models/extra_mobs_glow_item_frame.obj +++ /dev/null @@ -1,156 +0,0 @@ -# Blender v2.76 (sub 0) OBJ File: 'itemframe1facedir.blend' -# www.blender.org -mtllib itemframe1facedir.mtl -o right.frame_Cube.005 -v -0.313413 -0.313413 0.435326 -v -0.313413 0.313413 0.435326 -v -0.313413 -0.313413 0.498008 -v -0.313413 0.313413 0.498008 -v -0.376095 -0.313413 0.435326 -v -0.376095 0.313413 0.435326 -v -0.376095 -0.313413 0.498008 -v -0.376095 0.313413 0.498008 -vt 0.875000 0.812500 -vt 0.812500 0.812500 -vt 0.812500 0.187500 -vt 0.875000 0.187500 -vt 1.000000 0.812500 -vt 0.937500 0.812500 -vt 0.937500 0.187500 -vt 1.000000 0.187500 -vt -0.000000 0.937500 -vt 0.062500 0.937500 -vt 0.062500 1.000000 -vt -0.000000 1.000000 -vn 1.000000 0.000000 -0.000000 -vn 0.000000 0.000000 1.000000 -vn -1.000000 0.000000 0.000000 -vn -0.000000 0.000000 -1.000000 -vn 0.000000 -1.000000 -0.000000 -vn 0.000000 1.000000 0.000000 -usemtl None -s off -f 2/1/1 4/2/1 3/3/1 1/4/1 -f 4/1/2 8/2/2 7/3/2 3/4/2 -f 8/5/3 6/6/3 5/7/3 7/8/3 -f 6/1/4 2/2/4 1/3/4 5/4/4 -f 1/9/5 3/10/5 7/11/5 5/12/5 -f 6/9/6 8/10/6 4/11/6 2/12/6 -o left.frame_Cube.004 -v 0.376095 -0.313413 0.435326 -v 0.376095 0.313413 0.435326 -v 0.376095 -0.313413 0.498008 -v 0.376095 0.313413 0.498008 -v 0.313413 -0.313413 0.435326 -v 0.313413 0.313413 0.435326 -v 0.313413 -0.313413 0.498008 -v 0.313413 0.313413 0.498008 -vt 0.875000 0.812500 -vt 0.812500 0.812500 -vt 0.812500 0.187500 -vt 0.875000 0.187500 -vt 1.000000 0.812500 -vt 0.937500 0.812500 -vt 0.937500 0.187500 -vt 1.000000 0.187500 -vt -0.000000 0.937500 -vt 0.062500 0.937500 -vt 0.062500 1.000000 -vt -0.000000 1.000000 -vn 1.000000 0.000000 -0.000000 -vn 0.000000 0.000000 1.000000 -vn -1.000000 0.000000 0.000000 -vn 0.000000 0.000000 -1.000000 -vn 0.000000 -1.000000 -0.000000 -vn 0.000000 1.000000 0.000000 -usemtl None -s off -f 10/13/7 12/14/7 11/15/7 9/16/7 -f 12/13/8 16/14/8 15/15/8 11/16/8 -f 16/17/9 14/18/9 13/19/9 15/20/9 -f 14/13/10 10/14/10 9/15/10 13/16/10 -f 9/21/11 11/22/11 15/23/11 13/24/11 -f 14/21/12 16/22/12 12/23/12 10/24/12 -o lower.frame_Cube.003 -v 0.376095 -0.376095 0.435326 -v 0.376095 -0.313413 0.435326 -v 0.376095 -0.376095 0.498008 -v 0.376095 -0.313413 0.498008 -v -0.376095 -0.376095 0.435326 -v -0.376095 -0.313413 0.435326 -v -0.376095 -0.376095 0.498008 -v -0.376095 -0.313413 0.498008 -vt 0.187500 0.187500 -vt 0.125000 0.187500 -vt 0.125000 0.125000 -vt 0.187500 0.125000 -vt 0.875000 0.187500 -vt 0.875000 0.125000 -vt 0.812500 0.187500 -vt 0.812500 0.125000 -vt 0.875000 0.937500 -vt 0.875000 1.000000 -vt 0.125000 1.000000 -vt 0.125000 0.937500 -vn 1.000000 0.000000 0.000000 -vn 0.000000 0.000000 1.000000 -vn -1.000000 0.000000 0.000000 -vn -0.000000 0.000000 -1.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 1.000000 0.000000 -usemtl None -s off -f 18/25/13 20/26/13 19/27/13 17/28/13 -f 20/29/14 24/26/14 23/27/14 19/30/14 -f 24/29/15 22/31/15 21/32/15 23/30/15 -f 22/29/16 18/26/16 17/27/16 21/30/16 -f 17/33/17 19/34/17 23/35/17 21/36/17 -f 22/30/18 24/29/18 20/26/18 18/27/18 -o upper.frame_Cube.002 -v 0.376095 0.313413 0.435326 -v 0.376095 0.376095 0.435326 -v 0.376095 0.313413 0.498008 -v 0.376095 0.376095 0.498008 -v -0.376095 0.313413 0.435326 -v -0.376095 0.376095 0.435326 -v -0.376095 0.313413 0.498008 -v -0.376095 0.376095 0.498008 -vt 0.187500 0.875000 -vt 0.125000 0.875000 -vt 0.125000 0.812500 -vt 0.187500 0.812500 -vt 0.875000 0.875000 -vt 0.875000 0.812500 -vt 0.812500 0.875000 -vt 0.812500 0.812500 -vt 0.875000 0.937500 -vt 0.875000 1.000000 -vt 0.125000 1.000000 -vt 0.125000 0.937500 -vn 1.000000 0.000000 0.000000 -vn 0.000000 0.000000 1.000000 -vn -1.000000 0.000000 0.000000 -vn -0.000000 0.000000 -1.000000 -vn 0.000000 -1.000000 0.000000 -vn 0.000000 1.000000 0.000000 -usemtl None -s off -f 26/37/19 28/38/19 27/39/19 25/40/19 -f 28/41/20 32/38/20 31/39/20 27/42/20 -f 32/41/21 30/43/21 29/44/21 31/42/21 -f 30/41/22 26/38/22 25/39/22 29/42/22 -f 25/45/23 27/46/23 31/47/23 29/48/23 -f 30/48/24 32/38/24 28/41/24 26/45/24 -o background_Plane -v 0.313413 -0.313413 0.466667 -v -0.313413 -0.313413 0.466667 -v 0.313413 0.313413 0.466667 -v -0.313413 0.313413 0.466667 -vt 0.187500 0.187500 -vt 0.812500 0.187500 -vt 0.812500 0.812500 -vt 0.187500 0.812500 -vn -0.000000 0.000000 -1.000000 -usemtl None -s off -f 33/49/25 34/50/25 36/51/25 35/52/25 From 36de9f53b74df306413b5aa18f426e8541895f10 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:08:12 +0000 Subject: [PATCH 15/27] Move glowing itemframe --- .../textures/extra_mobs_glow_item_frame.png | Bin 6285 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mods/ENTITIES/extra_mobs/textures/extra_mobs_glow_item_frame.png diff --git a/mods/ENTITIES/extra_mobs/textures/extra_mobs_glow_item_frame.png b/mods/ENTITIES/extra_mobs/textures/extra_mobs_glow_item_frame.png deleted file mode 100644 index e83b4e0608b452b5b3033bbb4c1bd0a7c594b753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6285 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 Ay#N3J From ddcb7f141f520e3db9f481ce02aa1b12405e2def Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:08:41 +0000 Subject: [PATCH 16/27] Move glowing itemframe --- .../extra_mobs_glow_item_frame_border.png | Bin 6285 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mods/ENTITIES/extra_mobs/textures/extra_mobs_glow_item_frame_border.png diff --git a/mods/ENTITIES/extra_mobs/textures/extra_mobs_glow_item_frame_border.png b/mods/ENTITIES/extra_mobs/textures/extra_mobs_glow_item_frame_border.png deleted file mode 100644 index e83b4e0608b452b5b3033bbb4c1bd0a7c594b753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6285 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 Ay#N3J From b084071954881c8a58eacb12b8c4b3a2ffd734b3 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:09:13 +0000 Subject: [PATCH 17/27] Move glowing itemframe --- .../textures/extra_mobs_glow_item_frame_item.png | Bin 6285 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 mods/ENTITIES/extra_mobs/textures/extra_mobs_glow_item_frame_item.png diff --git a/mods/ENTITIES/extra_mobs/textures/extra_mobs_glow_item_frame_item.png b/mods/ENTITIES/extra_mobs/textures/extra_mobs_glow_item_frame_item.png deleted file mode 100644 index e83b4e0608b452b5b3033bbb4c1bd0a7c594b753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6285 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 Ay#N3J From 3b2483ff4f2d65f584bd4552070b0feafe20e716 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:13:27 +0000 Subject: [PATCH 18/27] Move glowing itemframe --- .../textures/extra_mobs_glow_item_frame.png | Bin 0 -> 6285 bytes .../extra_mobs_glow_item_frame_border.png | Bin 0 -> 6285 bytes .../textures/extra_mobs_glow_item_frame_item.png | Bin 0 -> 6285 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 mods/ITEMS/mcl_itemframes/textures/extra_mobs_glow_item_frame.png create mode 100644 mods/ITEMS/mcl_itemframes/textures/extra_mobs_glow_item_frame_border.png create mode 100644 mods/ITEMS/mcl_itemframes/textures/extra_mobs_glow_item_frame_item.png diff --git a/mods/ITEMS/mcl_itemframes/textures/extra_mobs_glow_item_frame.png b/mods/ITEMS/mcl_itemframes/textures/extra_mobs_glow_item_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..e83b4e0608b452b5b3033bbb4c1bd0a7c594b753 GIT binary patch literal 6285 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 Ay#N3J literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_itemframes/textures/extra_mobs_glow_item_frame_border.png b/mods/ITEMS/mcl_itemframes/textures/extra_mobs_glow_item_frame_border.png new file mode 100644 index 0000000000000000000000000000000000000000..e83b4e0608b452b5b3033bbb4c1bd0a7c594b753 GIT binary patch literal 6285 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 Ay#N3J literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mcl_itemframes/textures/extra_mobs_glow_item_frame_item.png b/mods/ITEMS/mcl_itemframes/textures/extra_mobs_glow_item_frame_item.png new file mode 100644 index 0000000000000000000000000000000000000000..e83b4e0608b452b5b3033bbb4c1bd0a7c594b753 GIT binary patch literal 6285 zcmeHLdpwls9v>v-Qp%;mY8rIejJcQ@Gn2{6h{3qaU1r{Shl#m(XEX>!6j~CkO|dDJ zlvI>NHk+ag(uKkzRvWtMuqma^J42nik z&UPBAda4KnLW5yXcZYv9WuI9y;qS#G?^y_h^3fPiABj6liWEUYE-xHJN}@#|5{%+; z5s0Xc6W+X>(WUBdZ?1r5TwWSs&^88bHL$wE-q~4m=+VQlo%}|Wsuu%$Y+^*}y}37} zr0sfij;2k^tMdZ~8Ou|GE)w=1>WY0fH%{AdsI@)VRr$tZFU zw`K^plX%3pOwR>qQVecjUSFy`%f)k#TUzJ z<$&)y3mZq$D(TiW%DcS-CG}p*vlP(z23`(#i<_he6jPcBby4~r-`zc`bz|vX_E|+2 zLBL&&t*19Aztw38a|?4eB|J(OSFK4*U3s8r$-=@V%0$D>eKBE2$CgB+&_yS=+)$sV zSRX8~yrq`pY9;9}+Pd@cJN*lO*ny&b%4$wjj8^-dwzigC`E-BDXw=D5$kI+kK+<_y zZKkpkHS-T``*NJq3@g=F46JcIHQQPtTKKK2UI-sSVb}kZ<>81>mkeQq$ z?Mlc#yk+jHgl$>px}%?O4Z*A)*A5r`vR#w>egBX5%Yd5+xyeS$PWN4Q)YNsGZ(^&3 z&MMrw1lqk2aM(lm1-dklG-m~v&EMGmD3jutLD9KdRN3daJb?a#k2|q-U4N?Hx8B94 zkF3>j-%$EmSI>fX`tY3M$j-nqn&jDSz-3w3A>9)$_r^+Y{jxXLDLo^$Y}wi*5(2t5>b9mr~EaVLeN*c=+r4 zz9xglV(YH`!Oj{(-Pp0lPPMk7`~0+u4S2#O5!uT>X))Er=vCcMqZ9rU8*A-sDo*c< zJWuxTZE64Mn6_zqG}QgmR;OaZG1tBME!gU#j{D!d>DqHc(~(623jzCH= zpZ&V__^5wvXLQQd!ee(I9vjk(&me^=4%A;47A(9!@sg+UeaTpN-QIKCPbXHxpInxNk1^qXd7H%otp?XrqWr{3683F$!7v$@y4d4PX$z-@4?MLFlr!CT)9a^jGi zM;*h9H;Gub{uf_`Mly~+zOA&dgJkJ!7_V{7o?U(jd9$kIh`aNZoD0WVUV64>*>-eh zd!??#drHBAo`l=|O5-~pv}(lplhU4%jrpb+&7K~U<3%QC@)vCwbQb=)zINUE-gk-> zz z9@pL@eXwB0K;-ToYvW6c_Qld}r(JalpF5kM``vAakj8PH?o%VXH#ijA1-V^0cQz?a zOm&_CJ<(?O*8H(c<>uJa!zC5iiXX3Z=si5=UO;T)tIadBvRIHO%!x_6(8GJm)qcO& zpsugDK~-(vL#|_#l3&f5xOQ!$r*7jj$4mXZnud7kn~p!Jsw$|f8B{s07kp!m;n7D{ zo;4GmYVq-o<{g>akYHXs+;yT|8`er6n$+8{j{j9a!27ceW%q`bKFTU?&>W^c_K z#DO60-d3DKXcd1c;I<+=@Q13Pd0SHAzh7c(ej}ww_s;N%lbeQ)RP7ixegCu7aqlKy z^;!0p#f?~gpGIFUv-80P7t^wXCG+=d?c67^?z1ahX?QWhtkQJY>6X*7N2#{#;+A>` z{qlpw^IWvHdohb*m;846di0L+b){v$(_X9DP~uFkMEcdGux3XXBdx7J#E zB^&44#l5vDwX!x#4luz&rUi-`Wsg zfbYofZI%s#N|{G|(LD&2?X{r^W%uH`ySi4N+q`M-$Qy;w8mMq*{zVXhn48Cg4^bbc z6BQ8h%~%{E8#IgJi{L{Rfv~iS60v|VP=aKGAv^&M^}PBb3d!TpP~Jo)mMO9ULwWWw z5aSgr zgU6#`1X>&|kg%fA0dVv>UniUEixlJJBAq>Pir7Dh^FC=@)7oFa!u0oy3JbIO6N zEvFYtI2Z=pAi(p10T?_MOGabyXgmco-5wrgGCx`i#8WE5dSaqjA`H$9i{bM>vk*&c zH-7T>mlk4A_+AF%4vK}55CGb41O*bK=}txAk>cq-BgLSsOCEPPhl_!Ol6#(RW5-~+ zezcLv7{cR=8hFkVpXAoNZ1*li6%Gnm{(kqsitRJeo)`Cv))t znPPzjrct;+Jh&2A;nSm%QE^}@0-4O=u*v3de&Ef~1R@cOW|IK|+MG*b;W-=%g=9V% zjcgsL)~*a13U7v$lgoQt!&wrp5aPq-#S?IZQt_uDPaYrikg#O3;Yc_fjzq$eC- zJ*k1a;cC=`8Ggh0h98JSsOu)dTMtosr9@ z@^8iGcxfmoOD-%PhsNU2c&sOmLd9B82^7@iYQxJd+hIS<)>5_yF`3lqdRWT#C@Mpi zh#rw5Q8*8TKG*3(-uxTfH2bL>{ZHo8VUyN2LQyna#i0@xso-zj{{?W8!HEZe0{&=z3g33Qva*LU+^HgAFl|*HDrnDF!SOaNhyOoUKr`spp5z-RvT4qB-)Saa^r?qR zN`9;_%d;0LbmVQR7O7;^>QpM3pf$Wx+)dI=v`j7DB?Ox&YrizBcKr4MBWEKwq`UdT zi`vCFg{aEv*H5hGAd>DN5a7zncW)2(y?htZxAM`Q5xqrfh`kl%S)l0|m-02@3VpiRA|SX=taJ% zAv@H!0H^Q7`x*{3q!AOYg)U8#C~R@>_jwXO>&ba^<+a~^yK;x)S8XQh+{{b#<$CK< zeezoa$r|Ar0ip97Rx9r)D1I3efXeqx4SanBxN4y2(HiUZIO2SN5uruLm|;&_KVp8r0cwko Ay#N3J literal 0 HcmV?d00001 From 1b9c5e6e233e0c39e6a3e36ab2398381a3d02b39 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:14:17 +0000 Subject: [PATCH 19/27] Move glowing itemframes --- .../models/extra_mobs_glow_item_frame.obj | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 mods/ITEMS/mcl_itemframes/models/extra_mobs_glow_item_frame.obj diff --git a/mods/ITEMS/mcl_itemframes/models/extra_mobs_glow_item_frame.obj b/mods/ITEMS/mcl_itemframes/models/extra_mobs_glow_item_frame.obj new file mode 100644 index 000000000..d0a5b0c5f --- /dev/null +++ b/mods/ITEMS/mcl_itemframes/models/extra_mobs_glow_item_frame.obj @@ -0,0 +1,156 @@ +# Blender v2.76 (sub 0) OBJ File: 'itemframe1facedir.blend' +# www.blender.org +mtllib itemframe1facedir.mtl +o right.frame_Cube.005 +v -0.313413 -0.313413 0.435326 +v -0.313413 0.313413 0.435326 +v -0.313413 -0.313413 0.498008 +v -0.313413 0.313413 0.498008 +v -0.376095 -0.313413 0.435326 +v -0.376095 0.313413 0.435326 +v -0.376095 -0.313413 0.498008 +v -0.376095 0.313413 0.498008 +vt 0.875000 0.812500 +vt 0.812500 0.812500 +vt 0.812500 0.187500 +vt 0.875000 0.187500 +vt 1.000000 0.812500 +vt 0.937500 0.812500 +vt 0.937500 0.187500 +vt 1.000000 0.187500 +vt -0.000000 0.937500 +vt 0.062500 0.937500 +vt 0.062500 1.000000 +vt -0.000000 1.000000 +vn 1.000000 0.000000 -0.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +usemtl None +s off +f 2/1/1 4/2/1 3/3/1 1/4/1 +f 4/1/2 8/2/2 7/3/2 3/4/2 +f 8/5/3 6/6/3 5/7/3 7/8/3 +f 6/1/4 2/2/4 1/3/4 5/4/4 +f 1/9/5 3/10/5 7/11/5 5/12/5 +f 6/9/6 8/10/6 4/11/6 2/12/6 +o left.frame_Cube.004 +v 0.376095 -0.313413 0.435326 +v 0.376095 0.313413 0.435326 +v 0.376095 -0.313413 0.498008 +v 0.376095 0.313413 0.498008 +v 0.313413 -0.313413 0.435326 +v 0.313413 0.313413 0.435326 +v 0.313413 -0.313413 0.498008 +v 0.313413 0.313413 0.498008 +vt 0.875000 0.812500 +vt 0.812500 0.812500 +vt 0.812500 0.187500 +vt 0.875000 0.187500 +vt 1.000000 0.812500 +vt 0.937500 0.812500 +vt 0.937500 0.187500 +vt 1.000000 0.187500 +vt -0.000000 0.937500 +vt 0.062500 0.937500 +vt 0.062500 1.000000 +vt -0.000000 1.000000 +vn 1.000000 0.000000 -0.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn 0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 -0.000000 +vn 0.000000 1.000000 0.000000 +usemtl None +s off +f 10/13/7 12/14/7 11/15/7 9/16/7 +f 12/13/8 16/14/8 15/15/8 11/16/8 +f 16/17/9 14/18/9 13/19/9 15/20/9 +f 14/13/10 10/14/10 9/15/10 13/16/10 +f 9/21/11 11/22/11 15/23/11 13/24/11 +f 14/21/12 16/22/12 12/23/12 10/24/12 +o lower.frame_Cube.003 +v 0.376095 -0.376095 0.435326 +v 0.376095 -0.313413 0.435326 +v 0.376095 -0.376095 0.498008 +v 0.376095 -0.313413 0.498008 +v -0.376095 -0.376095 0.435326 +v -0.376095 -0.313413 0.435326 +v -0.376095 -0.376095 0.498008 +v -0.376095 -0.313413 0.498008 +vt 0.187500 0.187500 +vt 0.125000 0.187500 +vt 0.125000 0.125000 +vt 0.187500 0.125000 +vt 0.875000 0.187500 +vt 0.875000 0.125000 +vt 0.812500 0.187500 +vt 0.812500 0.125000 +vt 0.875000 0.937500 +vt 0.875000 1.000000 +vt 0.125000 1.000000 +vt 0.125000 0.937500 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +usemtl None +s off +f 18/25/13 20/26/13 19/27/13 17/28/13 +f 20/29/14 24/26/14 23/27/14 19/30/14 +f 24/29/15 22/31/15 21/32/15 23/30/15 +f 22/29/16 18/26/16 17/27/16 21/30/16 +f 17/33/17 19/34/17 23/35/17 21/36/17 +f 22/30/18 24/29/18 20/26/18 18/27/18 +o upper.frame_Cube.002 +v 0.376095 0.313413 0.435326 +v 0.376095 0.376095 0.435326 +v 0.376095 0.313413 0.498008 +v 0.376095 0.376095 0.498008 +v -0.376095 0.313413 0.435326 +v -0.376095 0.376095 0.435326 +v -0.376095 0.313413 0.498008 +v -0.376095 0.376095 0.498008 +vt 0.187500 0.875000 +vt 0.125000 0.875000 +vt 0.125000 0.812500 +vt 0.187500 0.812500 +vt 0.875000 0.875000 +vt 0.875000 0.812500 +vt 0.812500 0.875000 +vt 0.812500 0.812500 +vt 0.875000 0.937500 +vt 0.875000 1.000000 +vt 0.125000 1.000000 +vt 0.125000 0.937500 +vn 1.000000 0.000000 0.000000 +vn 0.000000 0.000000 1.000000 +vn -1.000000 0.000000 0.000000 +vn -0.000000 0.000000 -1.000000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 0.000000 +usemtl None +s off +f 26/37/19 28/38/19 27/39/19 25/40/19 +f 28/41/20 32/38/20 31/39/20 27/42/20 +f 32/41/21 30/43/21 29/44/21 31/42/21 +f 30/41/22 26/38/22 25/39/22 29/42/22 +f 25/45/23 27/46/23 31/47/23 29/48/23 +f 30/48/24 32/38/24 28/41/24 26/45/24 +o background_Plane +v 0.313413 -0.313413 0.466667 +v -0.313413 -0.313413 0.466667 +v 0.313413 0.313413 0.466667 +v -0.313413 0.313413 0.466667 +vt 0.187500 0.187500 +vt 0.812500 0.187500 +vt 0.812500 0.812500 +vt 0.187500 0.812500 +vn -0.000000 0.000000 -1.000000 +usemtl None +s off +f 33/49/25 34/50/25 36/51/25 35/52/25 From 5a3c1bb3d838f628c2fce1e56c558469b8a414c7 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:15:36 +0000 Subject: [PATCH 20/27] Move glowing itemframes --- mods/ITEMS/mcl_itemframes/init.lua | 667 +++++++++++++++-------------- 1 file changed, 344 insertions(+), 323 deletions(-) diff --git a/mods/ITEMS/mcl_itemframes/init.lua b/mods/ITEMS/mcl_itemframes/init.lua index 5937a16cf..e6a5f0772 100644 --- a/mods/ITEMS/mcl_itemframes/init.lua +++ b/mods/ITEMS/mcl_itemframes/init.lua @@ -2,306 +2,351 @@ local S = minetest.get_translator(minetest.get_current_modname()) local VISUAL_SIZE = 0.3 -minetest.register_entity("mcl_itemframes:item",{ - hp_max = 1, - visual = "wielditem", - visual_size = {x=VISUAL_SIZE, y=VISUAL_SIZE}, - physical = false, - pointable = false, - textures = { "blank.png" }, - _texture = "blank.png", - _scale = 1, +local vari = {{ "mcl_itemframes:item", "mcl_itemframes:map", "mcl_itemframes:item_frame", S("Item Frame"), S("Can hold an item"), S("Item frames are decorative blocks in which items can be placed."), "mcl_itemframes_itemframe1facedir.obj", "mcl_itemframes_itemframe_background.png", "default_wood.png", "mcl_itemframes_item_frame.png", "mcl_itemframes_item_frame.png", {"itemframes:frame"}}, +{ "mcl_itemframes:glow_item", "mcl_itemframes:glow_map", "mcl_itemframes:glow_item_frame", S("Glow Item Frame"), S("Can hold an item and glows"), S("Glow Item frames are decorative blocks in which items can be placed."), "extra_mobs_glow_item_frame.obj", "extra_mobs_glow_item_frame_border.png", "extra_mobs_glow_item_frame_border.png", "extra_mobs_glow_item_frame_item.png", "extra_mobs_glow_item_frame.png", {"extra_mobs:glow_frame", "extra_mobs:glow_item_frame"}}, +} - on_activate = function(self, staticdata) - if staticdata and staticdata ~= "" then - local data = staticdata:split(";") - if data and data[1] and data[2] then - self._nodename = data[1] - self._texture = data[2] - if data[3] then - self._scale = data[3] - else - self._scale = 1 - end - end - end - if self._texture then - self.object:set_properties({ - textures={self._texture}, - visual_size={x=VISUAL_SIZE/self._scale, y=VISUAL_SIZE/self._scale}, - }) - end - end, - get_staticdata = function(self) - if not self then return end - if self._nodename and self._texture then - local ret = self._nodename .. ";" .. self._texture - if self._scale then - ret = ret .. ";" .. self._scale - end - return ret - end - return "" - end, +for v=1, #vari do + local var = vari[v] + minetest.register_entity(var[1],{ + hp_max = 1, + visual = "wielditem", + visual_size = {x=VISUAL_SIZE, y=VISUAL_SIZE}, + physical = false, + pointable = false, + textures = { "blank.png" }, + _texture = "blank.png", + _scale = 1, + glow = (v-1)*minetest.LIGHT_MAX, - _update_texture = function(self) - if self._texture then - self.object:set_properties({ - textures={self._texture}, - visual_size={x=VISUAL_SIZE/self._scale, y=VISUAL_SIZE/self._scale}, - }) - end - end, -}) + on_activate = function(self, staticdata) + if staticdata and staticdata ~= "" then + local data = staticdata:split(";") + if data and data[1] and data[2] then + self._nodename = data[1] + self._texture = data[2] + if data[3] then + self._scale = data[3] + else + self._scale = 1 + end + end + end + if self._texture then + self.object:set_properties({ + textures={self._texture}, + visual_size={x=VISUAL_SIZE/self._scale, y=VISUAL_SIZE/self._scale}, + }) + end + end, + get_staticdata = function(self) + if not self then return end + if self._nodename and self._texture then + local ret = self._nodename .. ";" .. self._texture + if self._scale then + ret = ret .. ";" .. self._scale + end + return ret + end + return "" + end, + + _update_texture = function(self) + if self._texture then + self.object:set_properties({ + textures={self._texture}, + visual_size={x=VISUAL_SIZE/self._scale, y=VISUAL_SIZE/self._scale}, + }) + end + end, + }) -minetest.register_entity("mcl_itemframes:map", { - initial_properties = { - visual = "upright_sprite", - visual_size = {x = 1, y = 1}, - pointable = false, - physical = false, - collide_with_objects = false, - textures = {"blank.png"}, - }, - on_activate = function(self, staticdata) - self.id = staticdata - mcl_maps.load_map(self.id, function(texture) - -- will not crash even if self.object is invalid by now - self.object:set_properties({textures = {texture}}) - end) - end, - get_staticdata = function(self) - return self.id - end, -}) + minetest.register_entity(var[2], { + initial_properties = { + visual = "upright_sprite", + visual_size = {x = 1, y = 1}, + pointable = false, + physical = false, + collide_with_objects = false, + textures = {"blank.png"}, + }, + on_activate = function(self, staticdata) + self.id = staticdata + mcl_maps.load_map(self.id, function(texture) + -- will not crash even if self.object is invalid by now + self.object:set_properties({textures = {texture}}) + end) + end, + get_staticdata = function(self) + return self.id + end, + }) -local facedir = {} -facedir[0] = {x=0,y=0,z=1} -facedir[1] = {x=1,y=0,z=0} -facedir[2] = {x=0,y=0,z=-1} -facedir[3] = {x=-1,y=0,z=0} + local facedir = {} + facedir[0] = {x=0,y=0,z=1} + facedir[1] = {x=1,y=0,z=0} + facedir[2] = {x=0,y=0,z=-1} + facedir[3] = {x=-1,y=0,z=0} -local remove_item_entity = function(pos, node) - if node.name == "mcl_itemframes:item_frame" then - for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.5)) do - local entity = obj:get_luaentity() - if entity and (entity.name == "mcl_itemframes:item" or entity.name == "mcl_itemframes:map") then - obj:remove() - end - end - end + local remove_item_entity = function(pos, node) + if node.name == var[3] then + for _, obj in pairs(minetest.get_objects_inside_radius(pos, 0.5)) do + local entity = obj:get_luaentity() + if entity and (entity.name == var[1] or entity.name == var[2]) then + obj:remove() + end + end + end + end + + local update_item_entity = function(pos, node, param2) + remove_item_entity(pos, node) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local item = inv:get_stack("main", 1) + if not item:is_empty() then + if not param2 then + param2 = node.param2 + end + if node.name == var[3] then + local posad = facedir[param2] + pos.x = pos.x + posad.x*6.5/16 + pos.y = pos.y + posad.y*6.5/16 + pos.z = pos.z + posad.z*6.5/16 + end + local yaw = math.pi*2 - param2 * math.pi/2 + local map_id = item:get_meta():get_string("mcl_maps:id") + if map_id == "" then + local e = minetest.add_entity(pos, var[1]) + local lua = e:get_luaentity() + lua._nodename = node.name + local itemname = item:get_name() + if itemname == "" or itemname == nil then + lua._texture = "blank.png" + lua._scale = 1 + else + lua._texture = itemname + local def = minetest.registered_items[itemname] + lua._scale = def and def.wield_scale and def.wield_scale.x or 1 + end + lua:_update_texture() + if node.name == var[3] then + e:set_yaw(yaw) + end + else + local e = minetest.add_entity(pos, var[2], map_id) + e:set_yaw(yaw) + end + end + end + + local drop_item = function(pos, node, meta, clicker) + local cname = "" + if clicker and clicker:is_player() then + cname = clicker:get_player_name() + end + if node.name == var[3] and not minetest.is_creative_enabled(cname) then + local inv = meta:get_inventory() + local item = inv:get_stack("main", 1) + if not item:is_empty() then + minetest.add_item(pos, item) + end + end + meta:set_string("infotext", "") + remove_item_entity(pos, node) + end + + minetest.register_node(var[3],{ + description = var[4], + _tt_help = var[5], + _doc_items_longdesc = var[6], + _doc_items_usagehelp = S("Just place any item on the item frame. Use the item frame again to retrieve the item."), + drawtype = "mesh", + is_ground_content = false, + mesh = var[7], + selection_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} }, + collision_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} }, + tiles = {var[8], var[8], var[8], var[8], var[9], var[8]}, + inventory_image = var[10], + wield_image = var[11], + paramtype = "light", + paramtype2 = "facedir", + + --FIXME: should only be glowing, no light source. How is that possible with a node? + light_source = 1, + + sunlight_propagates = true, + groups = { dig_immediate=3,deco_block=1,dig_by_piston=1,container=7,attached_node_facedir=1 }, + sounds = mcl_sounds.node_sound_defaults(), + node_placement_prediction = "", + on_timer = function(pos) + local inv = minetest.get_meta(pos):get_inventory() + local stack = inv:get_stack("main", 1) + local itemname = stack:get_name() + if minetest.get_item_group(itemname, "clock") > 0 then + local new_name = "mcl_clock:clock_" .. (mcl_worlds.clock_works(pos) and mcl_clock.old_time or mcl_clock.random_frame) + if itemname ~= new_name then + stack:set_name(new_name) + inv:set_stack("main", 1, stack) + local node = minetest.get_node(pos) + update_item_entity(pos, node, node.param2) + end + minetest.get_node_timer(pos):start(1.0) + end + end, + on_place = function(itemstack, placer, pointed_thing) + if pointed_thing.type ~= "node" then + return itemstack + end + + -- Use pointed node's on_rightclick function first, if present + local node = minetest.get_node(pointed_thing.under) + if placer and not placer:get_player_control().sneak then + if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then + return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack + end + end + + return minetest.item_place(itemstack, placer, pointed_thing, minetest.dir_to_facedir(vector.direction(pointed_thing.above, pointed_thing.under))) + end, + on_construct = function(pos) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + inv:set_size("main", 1) + end, + on_rightclick = function(pos, node, clicker, itemstack) + if not itemstack then + return + end + local pname = clicker:get_player_name() + if minetest.is_protected(pos, pname) then + minetest.record_protection_violation(pos, pname) + return + end + local meta = minetest.get_meta(pos) + drop_item(pos, node, meta, clicker) + local inv = meta:get_inventory() + if itemstack:is_empty() then + remove_item_entity(pos, node) + meta:set_string("infotext", "") + inv:set_stack("main", 1, "") + return itemstack + end + local put_itemstack = ItemStack(itemstack) + put_itemstack:set_count(1) + local itemname = put_itemstack:get_name() + if minetest.get_item_group(itemname, "compass") > 0 then + put_itemstack:set_name("mcl_compass:" .. mcl_compass.get_compass_image(pos, minetest.dir_to_yaw(minetest.facedir_to_dir(node.param2)))) + end + if minetest.get_item_group(itemname, "clock") > 0 then + minetest.get_node_timer(pos):start(1.0) + end + inv:set_stack("main", 1, put_itemstack) + update_item_entity(pos, node) + -- Add node infotext when item has been named + local imeta = itemstack:get_meta() + local iname = imeta:get_string("name") + if iname then + meta:set_string("infotext", iname) + end + + if not minetest.is_creative_enabled(clicker:get_player_name()) then + itemstack:take_item() + end + return itemstack + end, + allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) + local name = player:get_player_name() + if minetest.is_protected(pos, name) then + minetest.record_protection_violation(pos, name) + return 0 + else + return count + end + end, + allow_metadata_inventory_take = function(pos, listname, index, stack, player) + local name = player:get_player_name() + if minetest.is_protected(pos, name) then + minetest.record_protection_violation(pos, name) + return 0 + else + return stack:get_count() + end + end, + allow_metadata_inventory_put = function(pos, listname, index, stack, player) + local name = player:get_player_name() + if minetest.is_protected(pos, name) then + minetest.record_protection_violation(pos, name) + return 0 + else + return stack:get_count() + end + end, + on_destruct = function(pos) + local meta = minetest.get_meta(pos) + local node = minetest.get_node(pos) + drop_item(pos, node, meta) + end, + on_rotate = function(pos, node, user, mode, param2) + if mode == screwdriver.ROTATE_FACE then + -- Rotate face + --local meta = minetest.get_meta(pos) + local node = minetest.get_node(pos) + + local objs = nil + if node.name == var[3] then + objs = minetest.get_objects_inside_radius(pos, 0.5) + end + if objs then + for _, obj in ipairs(objs) do + if obj and obj:get_luaentity() and obj:get_luaentity().name == var[1] then + update_item_entity(pos, node, (node.param2+1) % 4) + break + end + end + end + return + elseif mode == screwdriver.ROTATE_AXIS then + return false + end + end, + }) + + minetest.register_lbm({ + label = "Update legacy item frames", + name = "mcl_itemframes:update_legacy_item_frames", + nodenames = var[12], + action = function(pos, node) + -- Swap legacy node, then respawn entity + node.name = var[3] + local meta = minetest.get_meta(pos) + local item = meta:get_string("item") + minetest.swap_node(pos, node) + if item ~= "" then + local itemstack = ItemStack(minetest.deserialize(meta:get_string("itemdata"))) + local inv = meta:get_inventory() + inv:set_size("main", 1) + if not itemstack:is_empty() then + inv:set_stack("main", 1, itemstack) + end + end + update_item_entity(pos, node) + end, + }) + + -- FIXME: Item entities can get destroyed by /clearobjects + minetest.register_lbm({ + label = "Respawn item frame item entities", + name = "mcl_itemframes:respawn_entities", + nodenames = {var[3]}, + run_at_every_load = true, + action = function(pos, node) + update_item_entity(pos, node) + end, + }) end -local update_item_entity = function(pos, node, param2) - remove_item_entity(pos, node) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - local item = inv:get_stack("main", 1) - if not item:is_empty() then - if not param2 then - param2 = node.param2 - end - if node.name == "mcl_itemframes:item_frame" then - local posad = facedir[param2] - pos.x = pos.x + posad.x*6.5/16 - pos.y = pos.y + posad.y*6.5/16 - pos.z = pos.z + posad.z*6.5/16 - end - local yaw = math.pi*2 - param2 * math.pi/2 - local map_id = item:get_meta():get_string("mcl_maps:id") - if map_id == "" then - local e = minetest.add_entity(pos, "mcl_itemframes:item") - local lua = e:get_luaentity() - lua._nodename = node.name - local itemname = item:get_name() - if itemname == "" or itemname == nil then - lua._texture = "blank.png" - lua._scale = 1 - else - lua._texture = itemname - local def = minetest.registered_items[itemname] - lua._scale = def and def.wield_scale and def.wield_scale.x or 1 - end - lua:_update_texture() - if node.name == "mcl_itemframes:item_frame" then - e:set_yaw(yaw) - end - else - local e = minetest.add_entity(pos, "mcl_itemframes:map", map_id) - e:set_yaw(yaw) - end - end -end - -local drop_item = function(pos, node, meta, clicker) - local cname = "" - if clicker and clicker:is_player() then - cname = clicker:get_player_name() - end - if node.name == "mcl_itemframes:item_frame" and not minetest.is_creative_enabled(cname) then - local inv = meta:get_inventory() - local item = inv:get_stack("main", 1) - if not item:is_empty() then - minetest.add_item(pos, item) - end - end - meta:set_string("infotext", "") - remove_item_entity(pos, node) -end - -minetest.register_node("mcl_itemframes:item_frame",{ - description = S("Item Frame"), - _tt_help = S("Can hold an item"), - _doc_items_longdesc = S("Item frames are decorative blocks in which items can be placed."), - _doc_items_usagehelp = S("Just place any item on the item frame. Use the item frame again to retrieve the item."), - drawtype = "mesh", - is_ground_content = false, - mesh = "mcl_itemframes_itemframe1facedir.obj", - selection_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} }, - collision_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} }, - tiles = {"mcl_itemframes_itemframe_background.png", "mcl_itemframes_itemframe_background.png", "mcl_itemframes_itemframe_background.png", "mcl_itemframes_itemframe_background.png", "default_wood.png", "mcl_itemframes_itemframe_background.png"}, - inventory_image = "mcl_itemframes_item_frame.png", - wield_image = "mcl_itemframes_item_frame.png", - paramtype = "light", - paramtype2 = "facedir", - sunlight_propagates = true, - groups = { dig_immediate=3,deco_block=1,dig_by_piston=1,container=7,attached_node_facedir=1 }, - sounds = mcl_sounds.node_sound_defaults(), - node_placement_prediction = "", - on_timer = function(pos) - local inv = minetest.get_meta(pos):get_inventory() - local stack = inv:get_stack("main", 1) - local itemname = stack:get_name() - if minetest.get_item_group(itemname, "clock") > 0 then - local new_name = "mcl_clock:clock_" .. (mcl_worlds.clock_works(pos) and mcl_clock.old_time or mcl_clock.random_frame) - if itemname ~= new_name then - stack:set_name(new_name) - inv:set_stack("main", 1, stack) - local node = minetest.get_node(pos) - update_item_entity(pos, node, node.param2) - end - minetest.get_node_timer(pos):start(1.0) - end - end, - on_place = function(itemstack, placer, pointed_thing) - if pointed_thing.type ~= "node" then - return itemstack - end - - -- Use pointed node's on_rightclick function first, if present - local node = minetest.get_node(pointed_thing.under) - if placer and not placer:get_player_control().sneak then - if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then - return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack - end - end - - return minetest.item_place(itemstack, placer, pointed_thing, minetest.dir_to_facedir(vector.direction(pointed_thing.above, pointed_thing.under))) - end, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - inv:set_size("main", 1) - end, - on_rightclick = function(pos, node, clicker, itemstack) - if not itemstack then - return - end - local pname = clicker:get_player_name() - if minetest.is_protected(pos, pname) then - minetest.record_protection_violation(pos, pname) - return - end - local meta = minetest.get_meta(pos) - drop_item(pos, node, meta, clicker) - local inv = meta:get_inventory() - if itemstack:is_empty() then - remove_item_entity(pos, node) - meta:set_string("infotext", "") - inv:set_stack("main", 1, "") - return itemstack - end - local put_itemstack = ItemStack(itemstack) - put_itemstack:set_count(1) - local itemname = put_itemstack:get_name() - if minetest.get_item_group(itemname, "compass") > 0 then - put_itemstack:set_name("mcl_compass:" .. mcl_compass.get_compass_image(pos, minetest.dir_to_yaw(minetest.facedir_to_dir(node.param2)))) - end - if minetest.get_item_group(itemname, "clock") > 0 then - minetest.get_node_timer(pos):start(1.0) - end - inv:set_stack("main", 1, put_itemstack) - update_item_entity(pos, node) - -- Add node infotext when item has been named - local imeta = itemstack:get_meta() - local iname = imeta:get_string("name") - if iname then - meta:set_string("infotext", iname) - end - - if not minetest.is_creative_enabled(clicker:get_player_name()) then - itemstack:take_item() - end - return itemstack - end, - allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local name = player:get_player_name() - if minetest.is_protected(pos, name) then - minetest.record_protection_violation(pos, name) - return 0 - else - return count - end - end, - allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local name = player:get_player_name() - if minetest.is_protected(pos, name) then - minetest.record_protection_violation(pos, name) - return 0 - else - return stack:get_count() - end - end, - allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local name = player:get_player_name() - if minetest.is_protected(pos, name) then - minetest.record_protection_violation(pos, name) - return 0 - else - return stack:get_count() - end - end, - on_destruct = function(pos) - local meta = minetest.get_meta(pos) - local node = minetest.get_node(pos) - drop_item(pos, node, meta) - end, - on_rotate = function(pos, node, user, mode, param2) - if mode == screwdriver.ROTATE_FACE then - -- Rotate face - --local meta = minetest.get_meta(pos) - local node = minetest.get_node(pos) - - local objs = nil - if node.name == "mcl_itemframes:item_frame" then - objs = minetest.get_objects_inside_radius(pos, 0.5) - end - if objs then - for _, obj in ipairs(objs) do - if obj and obj:get_luaentity() and obj:get_luaentity().name == "mcl_itemframes:item" then - update_item_entity(pos, node, (node.param2+1) % 4) - break - end - end - end - return - elseif mode == screwdriver.ROTATE_AXIS then - return false - end - end, -}) - minetest.register_craft({ output = "mcl_itemframes:item_frame", recipe = { @@ -311,37 +356,13 @@ minetest.register_craft({ } }) -minetest.register_lbm({ - label = "Update legacy item frames", - name = "mcl_itemframes:update_legacy_item_frames", - nodenames = {"itemframes:frame"}, - action = function(pos, node) - -- Swap legacy node, then respawn entity - node.name = "mcl_itemframes:item_frame" - local meta = minetest.get_meta(pos) - local item = meta:get_string("item") - minetest.swap_node(pos, node) - if item ~= "" then - local itemstack = ItemStack(minetest.deserialize(meta:get_string("itemdata"))) - local inv = meta:get_inventory() - inv:set_size("main", 1) - if not itemstack:is_empty() then - inv:set_stack("main", 1, itemstack) - end - end - update_item_entity(pos, node) - end, -}) - --- FIXME: Item entities can get destroyed by /clearobjects -minetest.register_lbm({ - label = "Respawn item frame item entities", - name = "mcl_itemframes:respawn_entities", - nodenames = {"mcl_itemframes:item_frame"}, - run_at_every_load = true, - action = function(pos, node) - update_item_entity(pos, node) - end, +minetest.register_craft({ + type = "shapeless", + output = 'mcl_itemframes:glow_item_frame', + recipe = {'mcl_itemframes:item_frame', 'extra_mobs:glow_ink_sac'}, }) minetest.register_alias("itemframes:frame", "mcl_itemframes:item_frame") +minetest.register_alias("extra_mobs:glow_item_frame","mcl_itemframes:glow_item_frame") +minetest.register_alias("extra_mobs:glow_frame","mcl_itemframes:glow_item_frame") +minetest.register_alias("extra_mobs:glow_item_frame_item","mcl_itemframes:glow_item") From 36e671f4394a9765ffce6d6344af7b0b951d6474 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 31 May 2022 22:43:21 +0000 Subject: [PATCH 21/27] Adjust light --- mods/ITEMS/mcl_itemframes/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_itemframes/init.lua b/mods/ITEMS/mcl_itemframes/init.lua index e6a5f0772..eb20719b4 100644 --- a/mods/ITEMS/mcl_itemframes/init.lua +++ b/mods/ITEMS/mcl_itemframes/init.lua @@ -174,7 +174,7 @@ for v=1, #vari do paramtype2 = "facedir", --FIXME: should only be glowing, no light source. How is that possible with a node? - light_source = 1, + light_source = v-1, sunlight_propagates = true, groups = { dig_immediate=3,deco_block=1,dig_by_piston=1,container=7,attached_node_facedir=1 }, From c5655a40cdd9c44ef847a8047cd3e793c90bd1ce Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 7 Jun 2022 16:34:31 +0000 Subject: [PATCH 22/27] Update translation template-TODO update translations --- mods/ITEMS/mcl_itemframes/locale/template.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mods/ITEMS/mcl_itemframes/locale/template.txt b/mods/ITEMS/mcl_itemframes/locale/template.txt index bacbfaa69..179738682 100644 --- a/mods/ITEMS/mcl_itemframes/locale/template.txt +++ b/mods/ITEMS/mcl_itemframes/locale/template.txt @@ -3,3 +3,9 @@ Item Frame= Item frames are decorative blocks in which items can be placed.= Just place any item on the item frame. Use the item frame again to retrieve the item.= Can hold an item= +Use it to craft the Glow Item Frame.= +Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame.= +Glow Item Frame= +Can hold an item and glows= +Glow Item frames are decorative blocks in which items can be placed.= +Just place any item on the item frame. Use the item frame again to retrieve the item.= \ No newline at end of file From 6e9448c0b58d710e55f269cbb37aa77f373841d0 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 7 Jun 2022 16:35:22 +0000 Subject: [PATCH 23/27] Update translation template --- mods/ENTITIES/extra_mobs/locale/template.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mods/ENTITIES/extra_mobs/locale/template.txt b/mods/ENTITIES/extra_mobs/locale/template.txt index 1eaf2a4ed..25b625c52 100644 --- a/mods/ENTITIES/extra_mobs/locale/template.txt +++ b/mods/ENTITIES/extra_mobs/locale/template.txt @@ -8,10 +8,4 @@ Cod= Salmon= dolphin= Glow Squid= -Glow Ink Sac= -Use it to craft the Glow Item Frame.= -Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame.= -Glow Item Frame= -Can hold an item and glows= -Glow Item frames are decorative blocks in which items can be placed.= -Just place any item on the item frame. Use the item frame again to retrieve the item.= \ No newline at end of file +Glow Ink Sac= \ No newline at end of file From b79017d86e1ec05a75648ffdcc0a05a53c02e763 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 7 Jun 2022 16:38:02 +0000 Subject: [PATCH 24/27] Update translation --- mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.fr.tr | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.fr.tr b/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.fr.tr index 180c5555f..e519db90b 100644 --- a/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.fr.tr +++ b/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.fr.tr @@ -3,3 +3,9 @@ Item Frame=Cadre Item frames are decorative blocks in which items can be placed.=Les cadres sont des blocs décoratifs dans lesquels les objets peuvent être placés. Just place any item on the item frame. Use the item frame again to retrieve the item.=Placez simplement n'importe quel objet sur le cadre. Utilisez à nouveau le cadre décoré pour récupérer l'élément. Can hold an item=Peut contenir un objet +Use it to craft the Glow Item Frame.=Utilisez le pour fabriquer le Cadre à Objet Lumineux +Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame.=Utiliser le Sac d'Encre Lumineuse et le Cadre à Objet normal pour fabriquer le Cadre à Objet Lumineux. +Glow Item Frame=Cadre à Objet Lumineux +Can hold an item and glows=Peut exposer un objet et éclairer +Glow Item frames are decorative blocks in which items can be placed.=les Cadres à Objet Lumineux sont des blocs décoratifs pouvant contenir des objets. +Just place any item on the item frame. Use the item frame again to retrieve the item.=Placer n'importe quel objet sur le cadre. Récupérer l'objet en faisant un clic droit sur le cadre. \ No newline at end of file From 7cab3b67e1f8429c199b650cb513bb70b805934d Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 7 Jun 2022 16:38:36 +0000 Subject: [PATCH 25/27] Update translation --- mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr b/mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr index 87caf9592..6c4f60309 100644 --- a/mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr +++ b/mods/ENTITIES/extra_mobs/locale/extra_mobs.fr.tr @@ -8,10 +8,4 @@ Cod=Poisson Salmon=Saumon dolphin=Dauphin Glow Squid=Pieuvre Lumineuse -Glow Ink Sac=Sac d'Encre Lumineuse -Use it to craft the Glow Item Frame.=Utilisez le pour fabriquer le Cadre à Objet Lumineux -Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame.=Utiliser le Sac d'Encre Lumineuse et le Cadre à Objet normal pour fabriquer le Cadre à Objet Lumineux. -Glow Item Frame=Cadre à Objet Lumineux -Can hold an item and glows=Peut exposer un objet et éclairer -Glow Item frames are decorative blocks in which items can be placed.=les Cadres à Objet Lumineux sont des blocs décoratifs pouvant contenir des objets. -Just place any item on the item frame. Use the item frame again to retrieve the item.=Placer n'importe quel objet sur le cadre. Récupérer l'objet en faisant un clic droit sur le cadre. \ No newline at end of file +Glow Ink Sac=Sac d'Encre Lumineuse \ No newline at end of file From f968d76caa0103a6cdab1ac740e27a2a92bf2d98 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 7 Jun 2022 16:40:43 +0000 Subject: [PATCH 26/27] Update translation --- mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.ru.tr | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.ru.tr b/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.ru.tr index 81902e716..e82bf24aa 100644 --- a/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.ru.tr +++ b/mods/ITEMS/mcl_itemframes/locale/mcl_itemframes.ru.tr @@ -3,3 +3,9 @@ Item Frame=Рамка Item frames are decorative blocks in which items can be placed.=Рамки это декоративные блоки, в которые можно помещать предметы. Just place any item on the item frame. Use the item frame again to retrieve the item.=Просто поместите в рамку любой предмет. Используйте рамку вновь, чтобы забрать из неё предмет обратно. Can hold an item=Может хранить предмет +Use it to craft the Glow Item Frame.=Используется для крафта светящейся рамки. +Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame.=Используйте светящийся чернильный мешок и обычную рамку для крафта светящейся рамки. +Glow Item Frame=Светящаяся рамка +Can hold an item and glows=Светится и может хранить предмет +Glow Item frames are decorative blocks in which items can be placed.=Светящаяся рамка это декоративный блок в который можно положить предметы. +Just place any item on the item frame. Use the item frame again to retrieve the item.=Просто используйте любой предмет на рамке. Используйте рамку снова, чтобы забрать предмет. \ No newline at end of file From 7808c576a5584723a8f1e2aa9e18567bcb0847d9 Mon Sep 17 00:00:00 2001 From: 3raven Date: Tue, 7 Jun 2022 16:41:44 +0000 Subject: [PATCH 27/27] Update --- mods/ENTITIES/extra_mobs/locale/extra_mobs.ru.tr | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/mods/ENTITIES/extra_mobs/locale/extra_mobs.ru.tr b/mods/ENTITIES/extra_mobs/locale/extra_mobs.ru.tr index 6ebba543e..c4c81f1bb 100644 --- a/mods/ENTITIES/extra_mobs/locale/extra_mobs.ru.tr +++ b/mods/ENTITIES/extra_mobs/locale/extra_mobs.ru.tr @@ -8,10 +8,4 @@ Cod=Треска Salmon=Лосось dolphin=Дельфин Glow Squid=Светящийся спрут -Glow Ink Sac=Светящийся чернильный мешок -Use it to craft the Glow Item Frame.=Используется для крафта светящейся рамки. -Use the Glow Ink Sac and the normal Item Frame to craft the Glow Item Frame.=Используйте светящийся чернильный мешок и обычную рамку для крафта светящейся рамки. -Glow Item Frame=Светящаяся рамка -Can hold an item and glows=Светится и может хранить предмет -Glow Item frames are decorative blocks in which items can be placed.=Светящаяся рамка это декоративный блок в который можно положить предметы. -Just place any item on the item frame. Use the item frame again to retrieve the item.=Просто используйте любой предмет на рамке. Используйте рамку снова, чтобы забрать предмет. \ No newline at end of file +Glow Ink Sac=Светящийся чернильный мешок \ No newline at end of file