diff --git a/Bucket_Game-base/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE b/Bucket_Game-base/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE new file mode 100644 index 0000000..25dd4cd --- /dev/null +++ b/Bucket_Game-base/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE @@ -0,0 +1,141 @@ +License information +---------------------------------------------------------------------- + +"codersea" is distributed under the following licenses. Note: Not all +of the elements listed here are used in this fork. + +---------------------------------------------------------------------- + +License for original elements not covered in the rest of this docu- +ment: +Creative Commons CC BY-NC 4.0 with rights assigned to "OldCoder" (Rob- +ert Kiraly). + +---------------------------------------------------------------------- + +codersea_butterfish.obj, codersea_butterfish_item.png, and associated +code: + +(c) 2019 OldCoder (Robert Kiraly) + +Distribution rights for this version are held by OldCoder (Robert Kir- +aly). + +The files are licensed under CC BY-SA 4.0 subject to the attribution +requirement that any program, package, or system which includes the +files be clearly identified as a derivative of Final Minetest and that +associated websites and documentation clearly link to the current +Final Minetest website. + +The modeler/artist for these files is HardBone Hone of Japan. + +---------------------------------------------------------------------- + +mobs_chicken_egg and mobs_chicken_egg_overlay: +MIT License +(c) 2016-2019 TenPlus1 and Poikilos + +---------------------------------------------------------------------- + +Sushi texture: + +Creative Commons Attribution Share-Alike 4.0 +https://creativecommons.org/licenses/by-sa/4.0/ +by Poikilos + +---------------------------------------------------------------------- + +Code remaining from the original "sea" mod: + +Copyright (C) 2011-2017 celeron55, Perttu Ahola + +GNU Lesser General Public License as published by the Free Software +Foundation; either version 2.1 of the License, or (at your option) any +later version. + +Mito551's sounds, dirt, sand, gravel, sand, stone, and leaves: CC +BY-SA. + +Dirt, tree, and chests textures from Cisoun's WTFPL texture pack: +WTFPL. + +RealBadAngel's animated water textures: WTFPL. + +Cobble and wood textures from G4JC's Almost MC Texture Pack: CC-BY-SA. + +VanessaE's sand, desert_sand, sandstonebrick and torch textures: +WTFPL. + +---------------------------------------------------------------------- + +Mobs Redo API and/or "ethereal" image filenames: + +The MIT License (MIT) Copyright (c) 2016 TenPlus1 + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +---------------------------------------------------------------------- + +mobs_fish media +=============== + +Model/Textures: CC-BY-SA 3.0 +Author: Sapier +URL: http://creativecommons.org/licenses/by-sa/3.0/de/legalcode + +mobs_jellyfish media +==================== + +Model/Textures: WTFPL +Author: blert2112 + +mobs_sharks media +================= + +Model/Textures: CC-BY-SA 3.0 +http://creativecommons.org/licenses/by-sa/3.0/de/legalcode +Author: Sapier +texture modification by: blert2112 + +mobs_turtles media +================== +Model/textures: unknown +Author: AspireMint + +---------------------------------------------------------------------- + +Sea urchin +========== +Code: Not applicable +Media: CC-BY-SA 3.0 attribution to El Ceejo + +---------------------------------------------------------------------- + +nssm +==== +License for the code: LGPL +License for all the models, textures and sound: CC BY-SA 4.0 + +---------------------------------------------------------------------- + +Skandarella components +----------------------------- +License for lobster, seahorse, and trout components: See "license- +skandarella.txt". Ditto for cooked-fish and fish-food images. diff --git a/Bucket_Game-base/distinguish_meats-vs-211114a/mods/codercore/codersea/oldcoder.txt b/Bucket_Game-base/distinguish_meats-vs-211114a/mods/codercore/codersea/oldcoder.txt new file mode 100644 index 0000000..275ccaa --- /dev/null +++ b/Bucket_Game-base/distinguish_meats-vs-211114a/mods/codercore/codersea/oldcoder.txt @@ -0,0 +1,8 @@ +Name: codersea +Source: Largely original mod (do not replace) +License: See "LICENSE" + +The Android-compatible version of this mod omits the turtle and asso- +ciated media. + +For full documentation, see the files "codersea.md" and "LICENSE". diff --git a/Bucket_Game-branches/distinguish_meats-vs-211114a.patch b/Bucket_Game-branches/distinguish_meats-vs-211114a.patch index 81979ce..c1ac6d7 100644 --- a/Bucket_Game-branches/distinguish_meats-vs-211114a.patch +++ b/Bucket_Game-branches/distinguish_meats-vs-211114a.patch @@ -1,3 +1,15 @@ +diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE +--- Bucket_Game-base/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE 2021-11-19 07:17:20.455845524 -0500 ++++ Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE 2021-11-19 07:17:50.435846279 -0500 +@@ -41,7 +41,7 @@ + + Creative Commons Attribution Share-Alike 4.0 + https://creativecommons.org/licenses/by-sa/4.0/ +-by Poikilos ++Copyright (c) 2019 Poikilos + + ---------------------------------------------------------------------- + diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/coderfood/unified_foods/basefoods.lua Bucket_Game-branches/distinguish_meats-vs-211114a/mods/coderfood/unified_foods/basefoods.lua --- Bucket_Game-base/distinguish_meats-vs-211114a/mods/coderfood/unified_foods/basefoods.lua 2021-11-15 13:20:34.671690986 -0500 +++ Bucket_Game-branches/distinguish_meats-vs-211114a/mods/coderfood/unified_foods/basefoods.lua 2021-11-18 16:18:49.590487864 -0500 @@ -28,7 +40,7 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/coderfood/unified_fo Only in Bucket_Game-branches/distinguish_meats-vs-211114a/mods/coderfood/unified_foods: textures diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua --- Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua 2021-11-15 13:20:43.119691199 -0500 -+++ Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua 2021-11-18 19:03:00.402735941 -0500 ++++ Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua 2021-11-19 07:08:41.543832456 -0500 @@ -103,49 +103,95 @@ -- =================================================================== -- meat @@ -92,14 +104,6 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ minetest.register_craftitem(":animal_materials:meat_beef", { - description = S("Beef (raw)"), - image = "animal_materials_meat_raw.png", -- on_use = minetest.item_eat(1), -- groups = { meat=1, eatable=1 }, -- stack_max=25 --}) -- --minetest.register_craftitem(":animal_materials:meat_chicken", { -- description = S("Chicken (raw)"), -- image = "animal_materials_meat_raw.png", + description = S("Raw Beef"), + image = "codermobs_beef_raw.png", on_use = minetest.item_eat(1), @@ -107,6 +111,14 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ stack_max=25 }) +-minetest.register_craftitem(":animal_materials:meat_chicken", { +- description = S("Chicken (raw)"), +- image = "animal_materials_meat_raw.png", +- on_use = minetest.item_eat(1), +- groups = { meat=1, eatable=1 }, +- stack_max=25 +-}) +- -minetest.register_craftitem(":animal_materials:meat_lamb", { - description = S("Lamb (raw)"), - image = "animal_materials_meat_raw.png", @@ -159,7 +171,7 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ on_use = minetest.item_eat(1), groups = { meat=1, eatable=1 }, stack_max=25 -@@ -168,20 +214,13 @@ +@@ -168,36 +214,47 @@ }) minetest.register_craftitem(":animal_materials:meat_ostrich", { @@ -180,9 +192,58 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ - stack_max=5 -}) - minetest.register_craftitem(":animal_materials:fish_bluewhite", { - description = S("Fish (bluewhite)"), -@@ -229,7 +268,7 @@ +-minetest.register_craftitem(":animal_materials:fish_bluewhite", { +- description = S("Fish (bluewhite)"), +- image = "animal_materials_meat_raw.png", +- on_use = minetest.item_eat(1), +- groups = { meat=1, eatable=1 }, +- stack_max=25 +-}) +- +-minetest.register_craftitem(":animal_materials:fish_clownfish", { +- description = S("Fish (clownfish)"), +- image = "animal_materials_meat_raw.png", +- on_use = minetest.item_eat(1), +- groups = { meat=1, eatable=1 }, +- stack_max=25 +-}) ++local dep_bluewhite_raw = nil ++if minetest.registered_items["animalmaterials:fish_bluewhite"] then ++ dep_bluewhite_raw = "animalmaterials:fish_bluewhite" ++end ++ ++if not dep_bluewhite_raw then ++ minetest.register_craftitem(":animal_materials:fish_bluewhite", { ++ description = S("Raw Fish (cichlid)"), ++ image = "animal_materials_bluewhite_raw.png", ++ on_use = minetest.item_eat(1), ++ groups = { meat=1, eatable=1 }, ++ stack_max=25 ++ }) ++else ++ minetest.register_alias("animal_materials:fish_bluewhite", dep_bluewhite_raw) ++end ++ ++local dep_clownfish_raw = nil ++if minetest.registered_items["animalmaterials:fish_clownfish"] then ++ dep_clownfish_raw = "animalmaterials:fish_clownfish" ++end ++ ++if not dep_clownfish_raw then ++ minetest.register_craftitem(":animal_materials:fish_clownfish", { ++ description = S("Raw Fish (clownfish)"), ++ image = "animal_materials_clownfish_raw.png", ++ on_use = minetest.item_eat(1), ++ groups = { meat=1, eatable=1 }, ++ stack_max=25 ++ }) ++else ++ minetest.register_craftitem("animal_materials:fish_clownfish", dep_clownfish_raw) ++end + + -- =================================================================== + -- feather +@@ -229,7 +286,7 @@ }) minetest.register_craftitem(":animal_materials:egg_big", { @@ -438,6 +499,8 @@ diff -ru Bucket_Game-base/distinguish_meats-vs-211114a/mods/codermobs/codermobs/ local msname = "codermobs_" .. lcname local obj_name = "codermobs:" .. lcname +Only in Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures: animal_materials_bluewhite_raw.png +Only in Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures: animal_materials_clownfish_raw.png Only in Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures: animal_materials_egg_big.png Only in Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures: animal_materials_meat_raw.png Only in Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures: animal_materials_meat_toxic_raw.png diff --git a/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE new file mode 100644 index 0000000..f6b6c8e --- /dev/null +++ b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codercore/codersea/LICENSE @@ -0,0 +1,141 @@ +License information +---------------------------------------------------------------------- + +"codersea" is distributed under the following licenses. Note: Not all +of the elements listed here are used in this fork. + +---------------------------------------------------------------------- + +License for original elements not covered in the rest of this docu- +ment: +Creative Commons CC BY-NC 4.0 with rights assigned to "OldCoder" (Rob- +ert Kiraly). + +---------------------------------------------------------------------- + +codersea_butterfish.obj, codersea_butterfish_item.png, and associated +code: + +(c) 2019 OldCoder (Robert Kiraly) + +Distribution rights for this version are held by OldCoder (Robert Kir- +aly). + +The files are licensed under CC BY-SA 4.0 subject to the attribution +requirement that any program, package, or system which includes the +files be clearly identified as a derivative of Final Minetest and that +associated websites and documentation clearly link to the current +Final Minetest website. + +The modeler/artist for these files is HardBone Hone of Japan. + +---------------------------------------------------------------------- + +mobs_chicken_egg and mobs_chicken_egg_overlay: +MIT License +(c) 2016-2019 TenPlus1 and Poikilos + +---------------------------------------------------------------------- + +Sushi texture: + +Creative Commons Attribution Share-Alike 4.0 +https://creativecommons.org/licenses/by-sa/4.0/ +Copyright (c) 2019 Poikilos + +---------------------------------------------------------------------- + +Code remaining from the original "sea" mod: + +Copyright (C) 2011-2017 celeron55, Perttu Ahola + +GNU Lesser General Public License as published by the Free Software +Foundation; either version 2.1 of the License, or (at your option) any +later version. + +Mito551's sounds, dirt, sand, gravel, sand, stone, and leaves: CC +BY-SA. + +Dirt, tree, and chests textures from Cisoun's WTFPL texture pack: +WTFPL. + +RealBadAngel's animated water textures: WTFPL. + +Cobble and wood textures from G4JC's Almost MC Texture Pack: CC-BY-SA. + +VanessaE's sand, desert_sand, sandstonebrick and torch textures: +WTFPL. + +---------------------------------------------------------------------- + +Mobs Redo API and/or "ethereal" image filenames: + +The MIT License (MIT) Copyright (c) 2016 TenPlus1 + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +---------------------------------------------------------------------- + +mobs_fish media +=============== + +Model/Textures: CC-BY-SA 3.0 +Author: Sapier +URL: http://creativecommons.org/licenses/by-sa/3.0/de/legalcode + +mobs_jellyfish media +==================== + +Model/Textures: WTFPL +Author: blert2112 + +mobs_sharks media +================= + +Model/Textures: CC-BY-SA 3.0 +http://creativecommons.org/licenses/by-sa/3.0/de/legalcode +Author: Sapier +texture modification by: blert2112 + +mobs_turtles media +================== +Model/textures: unknown +Author: AspireMint + +---------------------------------------------------------------------- + +Sea urchin +========== +Code: Not applicable +Media: CC-BY-SA 3.0 attribution to El Ceejo + +---------------------------------------------------------------------- + +nssm +==== +License for the code: LGPL +License for all the models, textures and sound: CC BY-SA 4.0 + +---------------------------------------------------------------------- + +Skandarella components +----------------------------- +License for lobster, seahorse, and trout components: See "license- +skandarella.txt". Ditto for cooked-fish and fish-food images. diff --git a/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codercore/codersea/oldcoder.txt b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codercore/codersea/oldcoder.txt new file mode 100644 index 0000000..275ccaa --- /dev/null +++ b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codercore/codersea/oldcoder.txt @@ -0,0 +1,8 @@ +Name: codersea +Source: Largely original mod (do not replace) +License: See "LICENSE" + +The Android-compatible version of this mod omits the turtle and asso- +ciated media. + +For full documentation, see the files "codersea.md" and "LICENSE". diff --git a/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua index 8b8022a..571e450 100644 --- a/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua +++ b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/animal_materials.lua @@ -222,21 +222,39 @@ minetest.register_craftitem(":animal_materials:meat_ostrich", { }) -minetest.register_craftitem(":animal_materials:fish_bluewhite", { - description = S("Fish (bluewhite)"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) +local dep_bluewhite_raw = nil +if minetest.registered_items["animalmaterials:fish_bluewhite"] then + dep_bluewhite_raw = "animalmaterials:fish_bluewhite" +end -minetest.register_craftitem(":animal_materials:fish_clownfish", { - description = S("Fish (clownfish)"), - image = "animal_materials_meat_raw.png", - on_use = minetest.item_eat(1), - groups = { meat=1, eatable=1 }, - stack_max=25 -}) +if not dep_bluewhite_raw then + minetest.register_craftitem(":animal_materials:fish_bluewhite", { + description = S("Raw Fish (cichlid)"), + image = "animal_materials_bluewhite_raw.png", + on_use = minetest.item_eat(1), + groups = { meat=1, eatable=1 }, + stack_max=25 + }) +else + minetest.register_alias("animal_materials:fish_bluewhite", dep_bluewhite_raw) +end + +local dep_clownfish_raw = nil +if minetest.registered_items["animalmaterials:fish_clownfish"] then + dep_clownfish_raw = "animalmaterials:fish_clownfish" +end + +if not dep_clownfish_raw then + minetest.register_craftitem(":animal_materials:fish_clownfish", { + description = S("Raw Fish (clownfish)"), + image = "animal_materials_clownfish_raw.png", + on_use = minetest.item_eat(1), + groups = { meat=1, eatable=1 }, + stack_max=25 + }) +else + minetest.register_craftitem("animal_materials:fish_clownfish", dep_clownfish_raw) +end -- =================================================================== -- feather diff --git a/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures/animal_materials_bluewhite_raw.png b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures/animal_materials_bluewhite_raw.png new file mode 100644 index 0000000..462d447 Binary files /dev/null and b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures/animal_materials_bluewhite_raw.png differ diff --git a/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures/animal_materials_clownfish_raw.png b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures/animal_materials_clownfish_raw.png new file mode 100644 index 0000000..6a76e6a Binary files /dev/null and b/Bucket_Game-branches/distinguish_meats-vs-211114a/mods/codermobs/codermobs/textures/animal_materials_clownfish_raw.png differ