From df62a3aac188e48e998ceea72e487f6998386ffd Mon Sep 17 00:00:00 2001 From: Michieal Date: Sun, 13 Nov 2022 00:07:28 +0000 Subject: [PATCH 01/23] Initial code comit --- mods/ITEMS/hamburger.png | Bin 0 -> 1804 bytes mods/ITEMS/hamburger_alt.png | Bin 0 -> 4885 bytes mods/ITEMS/init.lua | 85 +++++++++++++++++++++++++++++++++++ mods/ITEMS/mod.conf | 4 ++ mods/ITEMS/readme.txt | 36 +++++++++++++++ 5 files changed, 125 insertions(+) create mode 100644 mods/ITEMS/hamburger.png create mode 100644 mods/ITEMS/hamburger_alt.png create mode 100644 mods/ITEMS/init.lua create mode 100644 mods/ITEMS/mod.conf create mode 100644 mods/ITEMS/readme.txt diff --git a/mods/ITEMS/hamburger.png b/mods/ITEMS/hamburger.png new file mode 100644 index 0000000000000000000000000000000000000000..e69df027c6ab703726d8122c58ee2614d1681bb1 GIT binary patch literal 1804 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 Hu0mjf7wvz! literal 0 HcmV?d00001 diff --git a/mods/ITEMS/init.lua b/mods/ITEMS/init.lua new file mode 100644 index 000000000..50d9e2fcc --- /dev/null +++ b/mods/ITEMS/init.lua @@ -0,0 +1,85 @@ +--- +--- Generated by EmmyLua(https://github.com/EmmyLua) +--- Created by michieal. +--- DateTime: 10/23/22 4:50 AM +--- +-- LOCALIZATION +local S = minetest.get_translator("hamburger_mod") + +local modname = minetest.get_current_modname() +local modpath = minetest.get_modpath(modname) + +local table = table +local DEBUG = false +hamburger_mod = {} + +-- quick api for hamburgers. call to register your hamburger. +function hamburger_mod.register_burger_craft( hamburger_item, cooked_meat, use_alt) + + if use_alt == nil or use_alt == "" then + use_alt = false + end + + minetest.register_craft({ + type = "fuel", + recipe = "hamburger_mod:hamburger" .. hamburger_item, + burntime = 2, + }) + + -- register crafts (actual recipe) + if minetest.get_modpath(modname) then + + local itemstring = "hamburger_mod:hamburger" + + minetest.register_craft({ + output = itemstring .. hamburger_item, + recipe = { + { "mcl_farming:bread"}, + { cooked_meat }, -- "mcl_mobitems:cooked_beef" for a reg hamburger. grind up clowns for a McDonald's hambeurger + { "mcl_farming:bread" }, + }, + }) + end + + if use_alt == false then + minetest.register_craftitem("hamburger_mod:hamburger" .. hamburger_item, { + description = S("Hamburger"), + _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a LEASH. Can be eaten."), + _doc_items_usagehelp = S("wield this item to pull villagers to you."), + _tt_help = S("A tasty hamburger that is sure to lure villagers"), + inventory_image = "hamburger.png", + wield_image = "hamburger.png", + on_place = minetest.item_eat(8), + on_secondary_use = minetest.item_eat(8), + groups = { food = 2, eatable = 8 }, + _mcl_saturation = 12.8, + stack_max = 64, + }) + else + minetest.register_craftitem("hamburger_mod:hamburger" .. hamburger_item, { + description = S("Hamburger"), + _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a LEASH. Can be eaten."), + _doc_items_usagehelp = S("wield this item to pull villagers to you."), + _tt_help = S("A tasty hamburger that is sure to lure villagers"), + inventory_image = "hamburger_alt.png", + wield_image = "hamburger_alt.png", + on_place = minetest.item_eat(8), + on_secondary_use = minetest.item_eat(8), + groups = { food = 2, eatable = 8 }, + _mcl_saturation = 12.8, + stack_max = 64, + }) + end + + +end + +-- make the villagers follow the hamburger item +minetest.registered_entities["mobs_mc:villager"].nofollow = nil + +hamburger_mod.register_burger_craft( "", "mcl_mobitems:cooked_beef") +table.insert(minetest.registered_entities["mobs_mc:villager"].follow,"hamburger_mod:hamburger") + +if DEBUG then + minetest.log (dump(minetest.registered_entities["mobs_mc:villager"].follow)) +end \ No newline at end of file diff --git a/mods/ITEMS/mod.conf b/mods/ITEMS/mod.conf new file mode 100644 index 000000000..8eb71d200 --- /dev/null +++ b/mods/ITEMS/mod.conf @@ -0,0 +1,4 @@ +name = hamburger_mod +description = A cute (and easy to use) replacement for not having leashes in MC2 +depends = mcl_core, mcl_sounds, mobs_mc, mcl_mobitems +optional_depends = doc diff --git a/mods/ITEMS/readme.txt b/mods/ITEMS/readme.txt new file mode 100644 index 000000000..6ab18ef56 --- /dev/null +++ b/mods/ITEMS/readme.txt @@ -0,0 +1,36 @@ +Tags: Hamburger +Icon set: Fugue 16px Additional Icons +Author: Yusuke Kamiyamane +License: CC Attribution 3.0 Unported +Readme file +Commercial usage: Allowed +Posted: November 22, 2011 +Icon Readme file: + +Fugue Icons + +(C) 2011 Yusuke Kamiyamane. All rights reserved. +These icons are licensed under a Creative Commons +Attribution 3.0 License. + + +If you can't or don't want to provide attribution, please +purchase a royalty-free license. + + +I'm unavailable for custom icon design work. But your +suggestions are always welcome! + + +------------------------------------------------------------ + + +Note: there's an alt image that is licensed as "Only for personal use" as it is the original BurgerTime arcade game's +burger image. And it is copyright Data East, 1982 and Bally Midway. + +From https://thepinballgameroom.com/product/burgertime-arcade-machine/ on the original game: +BurgerTime Arcade Machine, originally released as Hamburger in Japan, is a 1982 arcade game developed by Data East +initially for its DECO Cassette System. In the United States, Data East USA licensed BurgerTime Arcade Machine for +distribution by Bally Midway as a standard dedicated arcade game. Data East also released its own version of BurgerTime +in the United States through its DECO Cassette System. The Data East and Midway versions are distinguished by the +manufacturer’s name on the title screen and by the marquee and cabinet artworks, as the game itself is identical. From 972e9ea0f80a98cbb260b31f3e72c32638bc012c Mon Sep 17 00:00:00 2001 From: Michieal Date: Sat, 12 Nov 2022 19:26:43 -0500 Subject: [PATCH 02/23] Fix initial commit. --- mods/ITEMS/mcl_hamburger/.idea/.gitignore | 8 ++++++++ mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml | 9 +++++++++ .../.idea/inspectionProfiles/Project_Default.xml | 6 ++++++ mods/ITEMS/mcl_hamburger/.idea/misc.xml | 6 ++++++ mods/ITEMS/mcl_hamburger/.idea/modules.xml | 8 ++++++++ mods/ITEMS/{ => mcl_hamburger}/init.lua | 0 mods/ITEMS/mcl_hamburger/locale/mcl_signs.de.tr | 9 +++++++++ mods/ITEMS/mcl_hamburger/locale/mcl_signs.es.tr | 8 ++++++++ mods/ITEMS/mcl_hamburger/locale/mcl_signs.fr.tr | 9 +++++++++ mods/ITEMS/mcl_hamburger/locale/mcl_signs.pl.tr | 9 +++++++++ mods/ITEMS/mcl_hamburger/locale/mcl_signs.ru.tr | 9 +++++++++ mods/ITEMS/mcl_hamburger/locale/mcl_signs.zh_TW.tr | 9 +++++++++ mods/ITEMS/mcl_hamburger/locale/template.txt | 9 +++++++++ mods/ITEMS/{ => mcl_hamburger}/mod.conf | 0 mods/ITEMS/{ => mcl_hamburger}/readme.txt | 0 .../{ => mcl_hamburger/textures}/hamburger.png | Bin .../{ => mcl_hamburger/textures}/hamburger_alt.png | Bin 17 files changed, 99 insertions(+) create mode 100644 mods/ITEMS/mcl_hamburger/.idea/.gitignore create mode 100644 mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml create mode 100644 mods/ITEMS/mcl_hamburger/.idea/inspectionProfiles/Project_Default.xml create mode 100644 mods/ITEMS/mcl_hamburger/.idea/misc.xml create mode 100644 mods/ITEMS/mcl_hamburger/.idea/modules.xml rename mods/ITEMS/{ => mcl_hamburger}/init.lua (100%) create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.de.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.es.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.fr.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.pl.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.ru.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.zh_TW.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/template.txt rename mods/ITEMS/{ => mcl_hamburger}/mod.conf (100%) rename mods/ITEMS/{ => mcl_hamburger}/readme.txt (100%) rename mods/ITEMS/{ => mcl_hamburger/textures}/hamburger.png (100%) rename mods/ITEMS/{ => mcl_hamburger/textures}/hamburger_alt.png (100%) diff --git a/mods/ITEMS/mcl_hamburger/.idea/.gitignore b/mods/ITEMS/mcl_hamburger/.idea/.gitignore new file mode 100644 index 000000000..13566b81b --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml b/mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml new file mode 100644 index 000000000..d6ebd4805 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/mods/ITEMS/mcl_hamburger/.idea/inspectionProfiles/Project_Default.xml b/mods/ITEMS/mcl_hamburger/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 000000000..7636fe9a5 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/mods/ITEMS/mcl_hamburger/.idea/misc.xml b/mods/ITEMS/mcl_hamburger/.idea/misc.xml new file mode 100644 index 000000000..639900d13 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/mods/ITEMS/mcl_hamburger/.idea/modules.xml b/mods/ITEMS/mcl_hamburger/.idea/modules.xml new file mode 100644 index 000000000..80e6c8a75 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/mods/ITEMS/init.lua b/mods/ITEMS/mcl_hamburger/init.lua similarity index 100% rename from mods/ITEMS/init.lua rename to mods/ITEMS/mcl_hamburger/init.lua diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.de.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.de.tr new file mode 100644 index 000000000..a7513659b --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.de.tr @@ -0,0 +1,9 @@ +# textdomain: mcl_signs +Sign=Schild +Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Schilder können beschrieben werden und kommen in zwei Varianten: Wandschild und stehendes Schild. Sie können auf und an den Seiten von anderen Blöclen platziert werden, aber nicht unter ihnen. +After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Nachdem das Schild platziert wurde, kann man etwas darauf schreiben. 4 Zeilen mit je 15 Zeichen pro Zeile sind verfügbar, alles darüber geht verloren. Es werden nicht alle Zeichen unterstützt. Der Text kann nicht geändert werden, sobald er geschrieben wurde; man muss das Schild erneut platzieren. +Enter sign text:=Schildtext eingeben: +Maximum line length: 15=Maximale Zeilenlänge: 15 +Maximum lines: 4=Maximale Zeilen: 4 +Done=Fertig +Can be written=Kann beschriftet werden diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.es.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.es.tr new file mode 100644 index 000000000..d67e2da0d --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.es.tr @@ -0,0 +1,8 @@ +# textdomain: mcl_signs +Sign=Firmar +Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Los letreros se pueden escribir y vienen en dos variantes: letrero de muro y letrero en un poste de letrero. Los letreros se pueden colocar en la parte superior y en los costados de otros bloques, pero no debajo de ellos. +After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Después de colocar el letrero, puede escribir algo en él. Tiene 4 líneas de texto con hasta 15 caracteres para cada línea; todo lo que esté más allá de estos límites se pierde. No todos los personajes son compatibles. El texto no se puede cambiar una vez que se ha escrito; tienes que romper y colocar el letrero nuevamente. +Enter sign text:=Inserte el texto del letrero: +Maximum line length: 15=Longitud máxima de línea: 15 +Maximum lines: 4=Líneas máximas: 4 +Done=Escribir cartel diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.fr.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.fr.tr new file mode 100644 index 000000000..158640dae --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.fr.tr @@ -0,0 +1,9 @@ +# textdomain: mcl_signs +Sign=Panneau +Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Les panneaux peuvent être écrits et se déclinent en deux variantes: panneau mural et panneau sur poteau. Des panneaux peuvent être placés en haut et sur les côtés des autres blocs, mais pas en dessous. +After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Après avoir placé le panneau, vous pouvez écrire quelque chose dessus. Vous avez 4 lignes de texte avec jusqu'à 15 caractères pour chaque ligne; tout ce qui dépasse ces limites est perdu. Tous les caractères ne sont pas pris en charge. Le texte ne peut pas être modifié une fois qu'il a été écrit; vous devez casser et placer à nouveau le panneau. +Enter sign text:=Saisir le texte du panneau: +Maximum line length: 15=Longueur maximum des lignes: 15 +Maximum lines: 4=Nombre maximum de lignes: 4 +Done=Terminé +Can be written=Peut être écrit diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.pl.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.pl.tr new file mode 100644 index 000000000..bf3bbf3c8 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.pl.tr @@ -0,0 +1,9 @@ +# textdomain: mcl_signs +Sign=Znak +Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Na znakach można pisać i postawić je w dwóch wariantach: znak ścienny i znak na patyku. Znaki mogą być stawiane na górze i na bokach bloków, ale nie pod nimi. +After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Po postawieniu znaku możesz coś na nim napisać. Masz miejsce na cztery linie tekstu po 15 znaków każda; cokolwiek poza limitami będzie utracone. Nie wszystkie znaki są wspierane. Tekstu nie można zmienić po napisaniu; musisz zniszczyć znak i postawić go ponownie. +Enter sign text:=Wpisz tekst znaku: +Maximum line length: 15=Maksymalna długość linii: 15 +Maximum lines: 4=Maksymalna liczba linii: 4 +Done=Skończone +Can be written=Można na nim coś napisać diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.ru.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.ru.tr new file mode 100644 index 000000000..354e556a8 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.ru.tr @@ -0,0 +1,9 @@ +# textdomain: mcl_signs +Sign=Табличка +Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=На табличках можно писать. Таблички бывают двух видов: настенные и отдельно стоящие. Таблички можно размещать на верхушках и сторонах блоков, но не под блоками. +After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=После установки таблички вы можете написать на ней что-то. Вам доступны 4 строки текста, до 15 символов в каждой; всё, что вы напишете сверх лимита, потеряется. Поддерживаются не все символы. Текст нельзя изменить. Чтобы изменить его, вам придётся сломать табличку и подписать её снова. +Enter sign text:=Текст на табличке: +Maximum line length: 15=Максимальная длина строки: 15 +Maximum lines: 4=Максимум строк: 4 +Done=Готово +Can be written=Может быть подписана diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.zh_TW.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.zh_TW.tr new file mode 100644 index 000000000..62994bc3d --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.zh_TW.tr @@ -0,0 +1,9 @@ +# textdomain: mcl_signs +Sign=告示牌 +Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=告示牌可以寫字，有兩種變體：牆上的告示牌和柱上的告示牌。告示牌可以放在其他方塊的頂部和側面，但不能放在下面。 +After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=放置告示牌後，你可以在上面寫東西。你最多可以寫4行文字，每行最多可以寫15個字符；超過這些限制的文字就會丟失。不是所有的字符都被支持。文字一旦寫完就不能更改；你必須打破並重新放置標誌。 +Enter sign text:=輸入告示牌文字： +Maximum line length: 15=每行最多可以寫15個字符 +Maximum lines: 4=最多可以寫4行文字 +Done=確認 +Can be written=可以寫字 diff --git a/mods/ITEMS/mcl_hamburger/locale/template.txt b/mods/ITEMS/mcl_hamburger/locale/template.txt new file mode 100644 index 000000000..7336db4f4 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/template.txt @@ -0,0 +1,9 @@ +# textdomain: mcl_signs +Sign= +Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.= +After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow.= +Enter sign text:= +Maximum line length: 15= +Maximum lines: 4= +Done= +Can be written= diff --git a/mods/ITEMS/mod.conf b/mods/ITEMS/mcl_hamburger/mod.conf similarity index 100% rename from mods/ITEMS/mod.conf rename to mods/ITEMS/mcl_hamburger/mod.conf diff --git a/mods/ITEMS/readme.txt b/mods/ITEMS/mcl_hamburger/readme.txt similarity index 100% rename from mods/ITEMS/readme.txt rename to mods/ITEMS/mcl_hamburger/readme.txt diff --git a/mods/ITEMS/hamburger.png b/mods/ITEMS/mcl_hamburger/textures/hamburger.png similarity index 100% rename from mods/ITEMS/hamburger.png rename to mods/ITEMS/mcl_hamburger/textures/hamburger.png diff --git a/mods/ITEMS/hamburger_alt.png b/mods/ITEMS/mcl_hamburger/textures/hamburger_alt.png similarity index 100% rename from mods/ITEMS/hamburger_alt.png rename to mods/ITEMS/mcl_hamburger/textures/hamburger_alt.png From 2b3ec8d944d660bbcedd7d4a70dcab2aedf013bd Mon Sep 17 00:00:00 2001 From: Michieal Date: Sat, 12 Nov 2022 19:35:55 -0500 Subject: [PATCH 03/23] remove .idea files --- mods/ITEMS/mcl_hamburger/.idea/.gitignore | 8 -------- mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml | 9 --------- .../.idea/inspectionProfiles/Project_Default.xml | 6 ------ mods/ITEMS/mcl_hamburger/.idea/misc.xml | 6 ------ mods/ITEMS/mcl_hamburger/.idea/modules.xml | 8 -------- 5 files changed, 37 deletions(-) delete mode 100644 mods/ITEMS/mcl_hamburger/.idea/.gitignore delete mode 100644 mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml delete mode 100644 mods/ITEMS/mcl_hamburger/.idea/inspectionProfiles/Project_Default.xml delete mode 100644 mods/ITEMS/mcl_hamburger/.idea/misc.xml delete mode 100644 mods/ITEMS/mcl_hamburger/.idea/modules.xml diff --git a/mods/ITEMS/mcl_hamburger/.idea/.gitignore b/mods/ITEMS/mcl_hamburger/.idea/.gitignore deleted file mode 100644 index 13566b81b..000000000 --- a/mods/ITEMS/mcl_hamburger/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml b/mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml deleted file mode 100644 index d6ebd4805..000000000 --- a/mods/ITEMS/mcl_hamburger/.idea/hamburger_mod.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/mods/ITEMS/mcl_hamburger/.idea/inspectionProfiles/Project_Default.xml b/mods/ITEMS/mcl_hamburger/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 7636fe9a5..000000000 --- a/mods/ITEMS/mcl_hamburger/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/mods/ITEMS/mcl_hamburger/.idea/misc.xml b/mods/ITEMS/mcl_hamburger/.idea/misc.xml deleted file mode 100644 index 639900d13..000000000 --- a/mods/ITEMS/mcl_hamburger/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/mods/ITEMS/mcl_hamburger/.idea/modules.xml b/mods/ITEMS/mcl_hamburger/.idea/modules.xml deleted file mode 100644 index 80e6c8a75..000000000 --- a/mods/ITEMS/mcl_hamburger/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From ce95f034b425ee673f62b7183c5b8f64d6d77b8f Mon Sep 17 00:00:00 2001 From: cora Date: Tue, 15 Nov 2022 17:27:46 +0100 Subject: [PATCH 04/23] Add setting to turn hamburgers on and off --- mods/ITEMS/mcl_hamburger/init.lua | 3 +++ settingtypes.txt | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index 50d9e2fcc..5d2800a90 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -4,6 +4,9 @@ --- DateTime: 10/23/22 4:50 AM --- -- LOCALIZATION + +if not minetest.settings:get_bool("mcl_enable_hamburger",true) then return end + local S = minetest.get_translator("hamburger_mod") local modname = minetest.get_current_modname() diff --git a/settingtypes.txt b/settingtypes.txt index 0d517499a..25ac943ea 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -225,6 +225,9 @@ mcl_enable_fapples (Enable swiftness on enchanted golden apples) bool true # All tameable mobs listen to the "sit" righclick like dogs mcl_extended_pet_control (Extended pet control) bool true +# Enable hamburgers for villagers to follow +mcl_enable_hamburger (Enable Hamburger) bool true + [Debugging] # If enabled, this will show the itemstring of an item in the description. mcl_item_id_debug (Item ID Debug) bool false From 83b40f8cff7fb27bd68b0a08835290847544517e Mon Sep 17 00:00:00 2001 From: Michieal Date: Wed, 16 Nov 2022 00:34:38 +0000 Subject: [PATCH 05/23] add flavor text, code clean up Changed to have the flavor text to give it character. Fixed misspellings. Cleaned up the code from the initial commit. Changed from API to single item. Fixed the mod name, so that it matches "mcl_" format. Added comments. --- mods/ITEMS/mcl_hamburger/init.lua | 79 +++++++++++++++---------------- 1 file changed, 37 insertions(+), 42 deletions(-) diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index 5d2800a90..7b43e27ed 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -7,17 +7,18 @@ if not minetest.settings:get_bool("mcl_enable_hamburger",true) then return end -local S = minetest.get_translator("hamburger_mod") +local S = minetest.get_translator("mcl_hamburger") local modname = minetest.get_current_modname() local modpath = minetest.get_modpath(modname) local table = table local DEBUG = false -hamburger_mod = {} --- quick api for hamburgers. call to register your hamburger. -function hamburger_mod.register_burger_craft( hamburger_item, cooked_meat, use_alt) +mcl_hamburger = {} + +-- call to register your hamburger. +function mcl_hamburger.register_burger_craft(cooked_meat, use_alt) if use_alt == nil or use_alt == "" then use_alt = false @@ -25,63 +26,57 @@ function hamburger_mod.register_burger_craft( hamburger_item, cooked_meat, use_a minetest.register_craft({ type = "fuel", - recipe = "hamburger_mod:hamburger" .. hamburger_item, + recipe = "mcl_hamburger:hamburger", burntime = 2, }) -- register crafts (actual recipe) if minetest.get_modpath(modname) then - local itemstring = "hamburger_mod:hamburger" + local itemstring = "mcl_hamburger:hamburger" minetest.register_craft({ - output = itemstring .. hamburger_item, + output = itemstring, recipe = { { "mcl_farming:bread"}, - { cooked_meat }, -- "mcl_mobitems:cooked_beef" for a reg hamburger. grind up clowns for a McDonald's hambeurger + { cooked_meat }, -- "mcl_mobitems:cooked_beef" for a reg hamburger. Grind up clowns for a Big Mac. { "mcl_farming:bread" }, }, }) end - if use_alt == false then - minetest.register_craftitem("hamburger_mod:hamburger" .. hamburger_item, { - description = S("Hamburger"), - _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a LEASH. Can be eaten."), - _doc_items_usagehelp = S("wield this item to pull villagers to you."), - _tt_help = S("A tasty hamburger that is sure to lure villagers"), - inventory_image = "hamburger.png", - wield_image = "hamburger.png", - on_place = minetest.item_eat(8), - on_secondary_use = minetest.item_eat(8), - groups = { food = 2, eatable = 8 }, - _mcl_saturation = 12.8, - stack_max = 64, - }) - else - minetest.register_craftitem("hamburger_mod:hamburger" .. hamburger_item, { - description = S("Hamburger"), - _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a LEASH. Can be eaten."), - _doc_items_usagehelp = S("wield this item to pull villagers to you."), - _tt_help = S("A tasty hamburger that is sure to lure villagers"), - inventory_image = "hamburger_alt.png", - wield_image = "hamburger_alt.png", - on_place = minetest.item_eat(8), - on_secondary_use = minetest.item_eat(8), - groups = { food = 2, eatable = 8 }, - _mcl_saturation = 12.8, - stack_max = 64, - }) - end + local hamburger_def = { + description = S("A Hamburger"), + _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten."), + _doc_items_usagehelp = S("wield this item to pull villagers to you."), + _tt_help = S("A tasty hamburger that is sure to lure villagers.\n'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy."), + inventory_image = "hamburger.png", + wield_image = "hamburger.png", + on_place = minetest.item_eat(8), + on_secondary_use = minetest.item_eat(8), + groups = { food = 2, eatable = 8 }, + _mcl_saturation = 12.8, + stack_max = 64, + } + + if use_alt == false then + minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_def) + else + local hamburger_alt = table.copy(hamburger_def) + hamburger_alt.inventory_image = "mcl_hamburger_hamburger_alt.png" + hamburger_alt.wield_image = "mcl_hamburger_hamburger_alt.png" + minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_alt) + end -end +-- make the villagers follow the item +minetest.registered_entities["mobs_mc:villager"].nofollow = false --- make the villagers follow the hamburger item -minetest.registered_entities["mobs_mc:villager"].nofollow = nil +-- register the item and crafting recipe. +mcl_hamburger.register_burger_craft( "", "mcl_mobitems:cooked_beef") -hamburger_mod.register_burger_craft( "", "mcl_mobitems:cooked_beef") -table.insert(minetest.registered_entities["mobs_mc:villager"].follow,"hamburger_mod:hamburger") +-- add it to the follow items. +table.insert(minetest.registered_entities["mobs_mc:villager"].follow,"mcl_hamburger:hamburger") if DEBUG then minetest.log (dump(minetest.registered_entities["mobs_mc:villager"].follow)) From dadb8f92878d00fe07f6690f78f2e4ee142701d5 Mon Sep 17 00:00:00 2001 From: Michieal Date: Wed, 16 Nov 2022 00:35:40 +0000 Subject: [PATCH 06/23] fix indentation. --- mods/ITEMS/mcl_hamburger/init.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index 7b43e27ed..44e1ca652 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -46,10 +46,10 @@ function mcl_hamburger.register_burger_craft(cooked_meat, use_alt) end local hamburger_def = { - description = S("A Hamburger"), - _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten."), - _doc_items_usagehelp = S("wield this item to pull villagers to you."), - _tt_help = S("A tasty hamburger that is sure to lure villagers.\n'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy."), + description = S("A Hamburger"), + _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten."), + _doc_items_usagehelp = S("wield this item to pull villagers to you."), + _tt_help = S("A tasty hamburger that is sure to lure villagers.\n'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy."), inventory_image = "hamburger.png", wield_image = "hamburger.png", on_place = minetest.item_eat(8), From 4b777b1d9ccf28999ff6d6a4110032063678eaee Mon Sep 17 00:00:00 2001 From: Michieal Date: Wed, 16 Nov 2022 00:36:44 +0000 Subject: [PATCH 07/23] Fixed Indentation. --- mods/ITEMS/mcl_hamburger/init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index 44e1ca652..173a66ded 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -45,7 +45,7 @@ function mcl_hamburger.register_burger_craft(cooked_meat, use_alt) }) end - local hamburger_def = { + local hamburger_def = { description = S("A Hamburger"), _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten."), _doc_items_usagehelp = S("wield this item to pull villagers to you."), @@ -57,7 +57,7 @@ function mcl_hamburger.register_burger_craft(cooked_meat, use_alt) groups = { food = 2, eatable = 8 }, _mcl_saturation = 12.8, stack_max = 64, - } + } if use_alt == false then minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_def) From de7696ce69689db9dad0acfce117fa9dee4c67c3 Mon Sep 17 00:00:00 2001 From: Michieal Date: Wed, 16 Nov 2022 00:37:30 +0000 Subject: [PATCH 08/23] Changed calling function. --- mods/ITEMS/mcl_hamburger/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index 173a66ded..04cc216b0 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -73,7 +73,7 @@ function mcl_hamburger.register_burger_craft(cooked_meat, use_alt) minetest.registered_entities["mobs_mc:villager"].nofollow = false -- register the item and crafting recipe. -mcl_hamburger.register_burger_craft( "", "mcl_mobitems:cooked_beef") +mcl_hamburger.register_burger_craft("mcl_mobitems:cooked_beef") -- add it to the follow items. table.insert(minetest.registered_entities["mobs_mc:villager"].follow,"mcl_hamburger:hamburger") From 2149ca1147c211dbffab332f71af26790eabc2ea Mon Sep 17 00:00:00 2001 From: Michieal Date: Sat, 19 Nov 2022 03:00:48 +0000 Subject: [PATCH 09/23] Fixed the name in mod.conf. updated the mod.conf so that it reflects the coding to come. --- mods/ITEMS/mcl_hamburger/mod.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mods/ITEMS/mcl_hamburger/mod.conf b/mods/ITEMS/mcl_hamburger/mod.conf index 8eb71d200..205b3c558 100644 --- a/mods/ITEMS/mcl_hamburger/mod.conf +++ b/mods/ITEMS/mcl_hamburger/mod.conf @@ -1,4 +1,4 @@ -name = hamburger_mod -description = A cute (and easy to use) replacement for not having leashes in MC2 +name = mcl_hamburger +description = A cute (and easy to use) replacement for not having leashes in MC2. Also adds in a new food item. depends = mcl_core, mcl_sounds, mobs_mc, mcl_mobitems -optional_depends = doc +optional_depends = doc, awards From 8e74a5a56a0b28a479c6aefc397ae7dcbcfdaf79 Mon Sep 17 00:00:00 2001 From: cora Date: Sat, 19 Nov 2022 05:49:38 +0100 Subject: [PATCH 10/23] some basic burger cleanup --- mods/ITEMS/mcl_hamburger/init.lua | 97 +++++++++--------- .../{hamburger.png => mcl_hamburger.png} | Bin ...amburger_alt.png => mcl_hamburger_alt.png} | Bin 3 files changed, 46 insertions(+), 51 deletions(-) rename mods/ITEMS/mcl_hamburger/textures/{hamburger.png => mcl_hamburger.png} (100%) rename mods/ITEMS/mcl_hamburger/textures/{hamburger_alt.png => mcl_hamburger_alt.png} (100%) diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index 04cc216b0..fd292c894 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -15,69 +15,64 @@ local modpath = minetest.get_modpath(modname) local table = table local DEBUG = false +local enable_burger = minetest.settings:get_bool("mcl_enable_hamburger",true) +local use_alt = minetest.settings:get_bool("mcl_hamburger_alt_texture",false) + mcl_hamburger = {} -- call to register your hamburger. function mcl_hamburger.register_burger_craft(cooked_meat, use_alt) - - if use_alt == nil or use_alt == "" then - use_alt = false - end - - minetest.register_craft({ - type = "fuel", - recipe = "mcl_hamburger:hamburger", - burntime = 2, - }) - - -- register crafts (actual recipe) - if minetest.get_modpath(modname) then - - local itemstring = "mcl_hamburger:hamburger" - - minetest.register_craft({ - output = itemstring, - recipe = { - { "mcl_farming:bread"}, - { cooked_meat }, -- "mcl_mobitems:cooked_beef" for a reg hamburger. Grind up clowns for a Big Mac. - { "mcl_farming:bread" }, - }, - }) - end - - local hamburger_def = { - description = S("A Hamburger"), - _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten."), - _doc_items_usagehelp = S("wield this item to pull villagers to you."), - _tt_help = S("A tasty hamburger that is sure to lure villagers.\n'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy."), - inventory_image = "hamburger.png", - wield_image = "hamburger.png", - on_place = minetest.item_eat(8), - on_secondary_use = minetest.item_eat(8), - groups = { food = 2, eatable = 8 }, - _mcl_saturation = 12.8, - stack_max = 64, - } - - if use_alt == false then - minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_def) - else - local hamburger_alt = table.copy(hamburger_def) - hamburger_alt.inventory_image = "mcl_hamburger_hamburger_alt.png" - hamburger_alt.wield_image = "mcl_hamburger_hamburger_alt.png" - minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_alt) + if use_alt == nil or use_alt == "" then + use_alt = false end + minetest.register_craft({ + type = "fuel", + recipe = "mcl_hamburger:hamburger", + burntime = 2, + }) + + local itemstring = "mcl_hamburger:hamburger" + minetest.register_craft({ + output = itemstring, + recipe = { + { "mcl_farming:bread"}, + { cooked_meat }, -- "mcl_mobitems:cooked_beef" for a reg hamburger. Grind up clowns for a Big Mac. + { "mcl_farming:bread" }, + }, + }) +end + +local hamburger_def = { + description = S("A Hamburger"), + _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten."), + _doc_items_usagehelp = S("wield this item to pull villagers to you."), + _tt_help = S("A tasty hamburger that is sure to lure villagers.\n'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy."), + inventory_image = "mcl_hamburger.png", + wield_image = "mcl_hamburger.png", + on_place = minetest.item_eat(8), + on_secondary_use = minetest.item_eat(8), + groups = { food = 2, eatable = 8 }, + _mcl_saturation = 12.8, +} + +if use_alt == false then + minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_def) +else + local hamburger_alt = table.copy(hamburger_def) + hamburger_alt.inventory_image = "mcl_hamburger_alt.png" + hamburger_alt.wield_image = "mcl_hamburger_alt.png" + minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_alt) +end -- make the villagers follow the item minetest.registered_entities["mobs_mc:villager"].nofollow = false +-- add it to the follow items. +table.insert(minetest.registered_entities["mobs_mc:villager"].follow,"mcl_hamburger:hamburger") -- register the item and crafting recipe. mcl_hamburger.register_burger_craft("mcl_mobitems:cooked_beef") --- add it to the follow items. -table.insert(minetest.registered_entities["mobs_mc:villager"].follow,"mcl_hamburger:hamburger") - if DEBUG then minetest.log (dump(minetest.registered_entities["mobs_mc:villager"].follow)) -end \ No newline at end of file +end diff --git a/mods/ITEMS/mcl_hamburger/textures/hamburger.png b/mods/ITEMS/mcl_hamburger/textures/mcl_hamburger.png similarity index 100% rename from mods/ITEMS/mcl_hamburger/textures/hamburger.png rename to mods/ITEMS/mcl_hamburger/textures/mcl_hamburger.png diff --git a/mods/ITEMS/mcl_hamburger/textures/hamburger_alt.png b/mods/ITEMS/mcl_hamburger/textures/mcl_hamburger_alt.png similarity index 100% rename from mods/ITEMS/mcl_hamburger/textures/hamburger_alt.png rename to mods/ITEMS/mcl_hamburger/textures/mcl_hamburger_alt.png From 31395a88308ab2aa966939b4c18575cca0958e22 Mon Sep 17 00:00:00 2001 From: cora Date: Sat, 19 Nov 2022 06:00:53 +0100 Subject: [PATCH 11/23] make setting just hide the hamburger, not disable it --- mods/ITEMS/mcl_hamburger/init.lua | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index fd292c894..82f9ccd9e 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -5,8 +5,6 @@ --- -- LOCALIZATION -if not minetest.settings:get_bool("mcl_enable_hamburger",true) then return end - local S = minetest.get_translator("mcl_hamburger") local modname = minetest.get_current_modname() @@ -56,6 +54,10 @@ local hamburger_def = { _mcl_saturation = 12.8, } +if not enable_burger then + hamburger_def.groups.not_in_creative_inventory = 1 +end + if use_alt == false then minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_def) else @@ -65,14 +67,11 @@ else minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_alt) end --- make the villagers follow the item -minetest.registered_entities["mobs_mc:villager"].nofollow = false --- add it to the follow items. -table.insert(minetest.registered_entities["mobs_mc:villager"].follow,"mcl_hamburger:hamburger") - --- register the item and crafting recipe. -mcl_hamburger.register_burger_craft("mcl_mobitems:cooked_beef") - -if DEBUG then - minetest.log (dump(minetest.registered_entities["mobs_mc:villager"].follow)) +if enable_burger then + -- make the villagers follow the item + minetest.registered_entities["mobs_mc:villager"].nofollow = false + -- add it to the follow items. + table.insert(minetest.registered_entities["mobs_mc:villager"].follow,"mcl_hamburger:hamburger") + -- register the item and crafting recipe. + mcl_hamburger.register_burger_craft("mcl_mobitems:cooked_beef") end From 0cdf84ab476d7c594b1ac42aeec0abc9c6a2030c Mon Sep 17 00:00:00 2001 From: cora Date: Sat, 19 Nov 2022 06:06:46 +0100 Subject: [PATCH 12/23] Fix translation warning --- mods/ITEMS/mcl_hamburger/init.lua | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index 82f9ccd9e..4904fab87 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -19,20 +19,15 @@ local use_alt = minetest.settings:get_bool("mcl_hamburger_alt_texture",false) mcl_hamburger = {} -- call to register your hamburger. -function mcl_hamburger.register_burger_craft(cooked_meat, use_alt) - if use_alt == nil or use_alt == "" then - use_alt = false - end - +function mcl_hamburger.register_burger_craft(cooked_meat) minetest.register_craft({ type = "fuel", recipe = "mcl_hamburger:hamburger", burntime = 2, }) - local itemstring = "mcl_hamburger:hamburger" minetest.register_craft({ - output = itemstring, + output = "mcl_hamburger:hamburger", recipe = { { "mcl_farming:bread"}, { cooked_meat }, -- "mcl_mobitems:cooked_beef" for a reg hamburger. Grind up clowns for a Big Mac. @@ -45,7 +40,7 @@ local hamburger_def = { description = S("A Hamburger"), _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten."), _doc_items_usagehelp = S("wield this item to pull villagers to you."), - _tt_help = S("A tasty hamburger that is sure to lure villagers.\n'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy."), + _tt_help = S("A tasty hamburger that is sure to lure villagers. 'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy."), inventory_image = "mcl_hamburger.png", wield_image = "mcl_hamburger.png", on_place = minetest.item_eat(8), From aec16ee62e6f2db7c6a925211eef2c08f6898a02 Mon Sep 17 00:00:00 2001 From: Michieal Date: Sat, 19 Nov 2022 12:18:47 +0000 Subject: [PATCH 13/23] Textures redo. --- .../mcl_hamburger/textures/mcl_hamburger.png | Bin 1804 -> 767 bytes .../textures/mcl_hamburger_alt.png | Bin 4885 -> 1411 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/mods/ITEMS/mcl_hamburger/textures/mcl_hamburger.png b/mods/ITEMS/mcl_hamburger/textures/mcl_hamburger.png index e69df027c6ab703726d8122c58ee2614d1681bb1..432d05bba2aab5af92c11d5478f84df1d5f3ab06 100644 GIT binary patch delta 744 zcmVop*xxHz>ply=X0H{HPZ#QWX+{r6xj6)>XT^c1_IgCbKhh z&di)%j1D4FeBc~jIOl!d_dM@;G(N(ek*wl>u=hemyLF~Z-+y=UwF{uXKe%zaQ>|P* zKzrYI60Iqs`Z56DcLh$fZlhGPS+8`NU0a%s) zmg?i52-tj7WEo2fbNo9qi7P}ZGI~6tR_DJa5d*tX#g&rurh`Z+ky28gxP}lST&p(i zBN~g-mK(rvynlMcvOUt-^$5F3dh;Qql$0i}g#_(`--WRdg5rZwgkzIPbzs>Z5!3XD z$J&C#@vA}7mxsfO#fMkIIJfP4q?EX>OIxdfX?p05MG0<_7Cl4Fe2wS16d#O+8u%aR zF?;_q8XD==PL}KKG!`YgY5DyA>(A^zbc9Y(!Zt=f+# za%yH{FGIN=FH?zrlzJi*}EHnOJid=j>GZxE$r=H$Iaog(nhvM)%yM(b`9?$+ttf##OKtL8yw4S z1>octdyq{NfacNyra8}>dWnbkA5r}K1zIM7+F`#2db=~^w++zU(?uq;lBgaHHE?Xl z2O@9hYn1<~^7QdD3Z(_cUcK`Ipz;~ml7>_aBHE{&=qsoTc(MS0y$uZY;nf&m@OhX6 a1i*hTd}hsO`Z;d^0000dwB8p5l|vE4JIduq711hq6a)no4_XzvK~VqbxHG%o_1^oP-|Xt3KtJc@LnW=5bddrjEE}*z zu7uQRf-njgjKsu5dLl%}O;HSx&*$4TSS%WepqY~}0`R~2*F@f>Z76w^G9*aJdi9hZ43)yWPo%g!_<$l#W%=OD89@v7(SxSgcAMa z{Qv5kRY^vap+wDif=NqOG1B8RQ(rb@0}jL>P#~sQl&qo*i8G`92MUD%#s7m5+=ll*isObGWjA9;_+Y(TMA2AEU9Ra8-SS!1k<8}T>U35>x*20 z#DpRQZc^cR++Z^VMdJi+j>e6EBp3oh^q3A$G~4P#dS&wyHR+e4I++PK0R1Tw=s&Zb zkU*LiNkAD(%7Y-5mk5@DphzU)uwiu!g5Otr0+)tG7VaSWm;dqH42@Hdv zn8_1~#bSv}269;-n?q%gZZK^9@maqNZjnuBn||zma`Ey0pct8M6L~w*wmEMgFC9Ms z7O5;vYjbYnqy5HQtPC$GDAX1_Z9MD@dQRI=?>RR9?1h*;2gR%E_t(s|oA2*9-v{Wm z>rJnCamK^th|>Mr19m5r_V!<|Ub)6G+jo!MG_L%3;FG-_lR8d!EsYF5A6wUUJ+!8_ z%llMRWG-~hz=Pa|v?9%~ic+_r8I*0FO@5os2C7!wSl!uF+?|Ou=IQylVbRNft+>;2 z6mZ}ViO5D%`~=Av(DGvS`E&7hw;OhzXpcFx0Grd*JKegmXKn5~f2S;ZRNlx58P=k^ zXHFdb<+>mB+W!2jeZD!Kjm6n;A2+%pcVyw((Q}?mlE2m73V*cu!g2I*h})%6q2VPv z^*8p!^@aSC=91pD|BRQ@v!5c)0c9_L9DefXsW~sVr(bFv-vpgbx)QWyzG?(4c`grG z7_z9@CA%!&-#5?Op&|idTi*7JZ_CSCGIRT0Cp0v)*!TR~@=*mN=ll~zv0tBT|$u1~9m9jSfql;KoC%U&9>&?BtI zpvfuS&{;RDd|5}M_1dxCv+cZ#L`@;gh!DQmnF zuME}DT~De7joC-!BZJqcihF8P?8i7e9l%CCemK6`-*N2hVNWmH9WHS#?Zdk7x4ycO zu#R*8k2@;&=jhCR${>f6QyhnEwC+wh!{KrZi;FYFJJU+mtO*)3^v{^FnR6A=sa>~X z{-Vq?uu@brywWFh{|#jA8o{8^kknN72US>gb#=aarlujFcVlB0uyl z#@zlbnsIa1#x~tBYG~N9V6#B-UOl7ApCd~^HB(s@`#YGGLD=tGrtam^XK zHCtWnS83qqy}abvkDf~#GTpA0a<9F)XK1jlo8K zZ*1LF8OJ}*`Te=S+xE7%y}hl2-VWBSG94}|!x3V(NJheo!H@=sjsTWuh=@Q&(iwa) ze6uVh&cwksNJv~F5!;FAvWyo*jS)qrg9r|`0Xl(fvvFg&?d`qycfY>)wfFX}U2Tjn ze6c6_<#+O&bH2~_Ip_Iv;F4UD|4szx^1{{XS#p&CwPy^7CgOqKm6{nAu@!8E)9WzwGZJ#1Rq!)ziKC1d}=O8`#nHTrTO!DFv(<(;>W z@%&w*^@ZsnQ5sF4f)G|eAeMB&i;pF`8qhK%a`_dEpE+iWA)r0qguAW_c>YiecU}`w zoD}CvHS(Vt$8+%bpGUZV*>>_B;QKJVQ|x&lfeQmL2XO^Po)usIBCJ_%Yr}t6Opav@SoB06X~WiZ|GJ%k3Q9akSx% zz;h7S5|uaj2>#ViFg4~#-IgfVtT0|Xp6qb537q`b*(73W4c)mNJ-ji}J?nfD&Q-x> z2X5f-*T_+E&)r)=uo=#Hou1p=P4FcsxIE$}E)Jtt-wfD*Ib+7jbR= z1W@M2R8#&2e)8|QIi=R?leug9gQWP}m{RU*EegCu*WYCV6a~qi_M4(Qjx*G?IV~J= z&dse49Yc{m@!fWXS9o%5ru>6#!cPDTyR#}hnN?v=R)8!rdF{!Zr4pcMRYJ<|b1M8W zJ3aOUsIxU$)BUa1`u_gC(^#{;-@2iV*G`uC@!eUR1J8u>#LGux4*aFW)4!htU?Asl z_|Y7JXM8YG=D?AdyRQ#%xpUmNx5C&f(3^$pK4}c}LLr~H`kOc5w{MAJ2{x~XJ%<`G zpznPZ9^K@a{HOzGB6Zoh#sL{%!aLOklvr0Q2DfU1Ik^z|6^WjXO6>YJK%*rqXEg#UJd~j8soPr^HwSKi*3*`CY5A7mz5Z~QJcsgab!QiDv#WYN^>rix zly7qy-`=B}R)(4yGsQ0?hVS`&Bf{4$3w1@O)4n@8w0r+4A~QwuZx(z1}3-z^h*MmZMU8Mt=? zZ2O841yHUu)<#2Gup6p0YE1mS6O|iP+IcalCFk*4%BW_Ge8LFtGut8PB7Xf5Qk%{* zHI^b8DmU4kw-=-fXPKB)^J}rkZ8?@hr2rLp)EM-f}F#d&EPm zBo~NJh+~`%NPH`F#p5@@MUTG(^IUcj@Qa>Ov5l2BW+iSAPZ38Ay~3L35jP2|=E^eF zQCefLkwpqgNKjD0CUiK6Q#C2G&b~y$w}diz7=0~N!O2lXiM%mVE7Vn`s*$eJ)KL|= z|IgFbW~ROF;Uv)e>bjp3KyV+Z*If7a)OG7;K;Q+qHe3EOT_rS z7yQea00009a7bBm000XT000XT0n*)m`~UzEOG!jQRCwC$S_ynr)tUdFd+*y{-pk9L zK*GKX%4Uca1*~G#vbgKuQg^K@Ds`$;r%JUQ#oCH%>7Y)lD5zN6My+k}*HIP$aRiAN z)(C_oWY1gg{ra7AU-Gg-fXuY>o1EY8^fWFq(`dVM>YkjS+^|k+} zP5eDS-mh>h#S?Kv!nIm`?S2ZR7m|EmU%N-GD>r{6x!f-7-myvipA|q}!Eh0aTUOn{ z-7wAAG1D^)H-Z@h;BpFWZ~0dGhZ8_S;c>+cb+v06>i6-JrQSIWpfC%Vc_MJqD1q^V zfsh|a^8h-pK-0Jz_Hfglf*YP9{PF7nIC!8O8y>f?x)k_?`F(di@NG4aFzs<3Ulu~4 z9DQ&37VGaOfZTo~>0sp^#A8kBc|bOB=Nw?}RDqC>nc{bKO@uUe*Pko7n^0Wf#mcY3 z*!5e0Sg&_1ChQRBVC|YuQTjv;f?i%MPbX$mX!gq2us|+)1lU(&vyzoN0#y}T#s7)` z3I~oe4(#6%k4Ea$^Q2+GtMdg0=GfX%*yKOqIPlQMALHi_FTnZdUxGKTd<}^Xx>~Rd zcz7A%x-)@A*9kROF3jPuZ`e&>;yl9EiZo0g)qr>I7p+Ks@CIF|~L9s|&-9K|9!}V-lv?=iMMgt>#X>eM4D|Jf{&iPHH($dvu06)G^D9FnX zn^yaUbZ5{GCYN@3IzIaFT}(f11`fX1sAzQd55URy5Z06?{m-CW?B7u#dQAZNgY&d~ z+xIK$d+ui7x)}nI1_R69_bNgcPjcgoMKyTy+H^I(A!4CCT!ZlwE$GPwFaAJaU-mtC zW$ALPx~~k`!PMe!e}>Q)1(w_)5KnXvI-?=Nzj@eiMEPnky?=h5uU{)YQpue z)Z?tDYVgkWHuE2q#$aBt4&Qk=j)E(w6|Ni0EG&8UDV#a{8{~#kFgDm{Jo%r53+{Rg zPrTJ03pz7TNoOgUm#uU!3+4Fx@#yobFy$UwKoU{k8~gez9mh|3w!f)OK2Id1# zT$i$O=^#tazJ;CPT0Amm9j1(G19@Gd%#J3B7Q`^!NP^&T2*usp$AH&9p>BEYsQ_s4 zEdrNMvmeZ62O@jZyCl|8)ZT&B5Ju++_1`<$AG}Do@f_g$le%BV++Py@T$&BtaN^_p z_kztj1>fB7LCY*bV(UVdc%%BdYgRo&#tp>l5PheR{YMn~972D;7v+u3;)n%M7)qy% zU@g`zw7s*O(fD-^Yca*@e{GN97aumEqQSz|C0^V(#nbwmr>F*+v%Nt}TMb+p!kSN3 zVdm_Mu>G;Eh?(6>(~u@$wnvyUjp28~7`ss2N8fPqpg4>Zeg%E#ZLMP>%LGoj4_N<= zA}5a62b9;=U9#jhk68QYT#Wy9c4e; zftc0VM571NY{Q2g2F=5yImWmrY|}gNVS6Ek#^JJQNxSQ6-eIv%^vZ;x0?}B@bBEu# z?|&$py*FXrG{3UHwk>|p17`*&NNt2BrB+j#iFB`q+T8)B8H6JkhLILgKgKHkuwptA zwH`L1DhQ`(3q#VN6eGe@n7a2CcFlkl#f))^kE0VnPYgwB)Xh$(Bl9hDo6543q%^0E zbIDv=ni5fodbjHB=MtLP*{Y0MV$~9G<<-LoM3SpdOYvFpfjuQu+@AlsuQ)=8q~oO{ z6F_cWo?fwkfBQ9QIJzd2qPTuUu2)4DFFP?`jQv_1n#*kGWzF3$^B@Dll?U^iMYc_Q z`lXmJdrB1>UzJn0A3fw!bY0g>ZnQFG0=5&(?#`rorMa>iVWfwTo`BS} z6`yv^>ml_iG|lWJCMN94X*}#2G;#EWM!d;&Y-L(YVj`8u9Ijk*Y^gBadm&KF#m<-k zcCjPPKoucP4vQmbcbo9#z6AP*1a3XmkDE{Na#57Ru8VE*v+^kZ zQWiy!W86g(T<{p8eGb77{^6C1ru<$!W-C=bfA~4!>Gx!X3H&?fC(`u{&9gJbUvm~& z)4=N;0h~EOU;~H0lKFH@g&*-$N}J)Lq|@)z9fsZIz3)3t3eIwI_mJ;o7a4h)dY|pr zXi|}bhGyH(t`PaI>t3<|m)|K5&-1-5S!| ztP5L)lyRAdg6Hz@n*FS4>YJE2aiZ2E1n@u+4u`R2%N9jIu*QgEb-%}g(7l@arp1mp zvMCPVNe=9~w$>)b35$QK3*KTUj10|AOSdJsdTRznZT&j>={%QUR$C}|H~>AJ$FWu^ zMyOuWjPS-d+#?KlOPpw46GP5Czk;)zf8fyu1ZH~>`6>><&MkeG3zQHjpH~MXPrx^s zk#vFs6$=|s@L(FWfR6H8Yt=WSybed6hPGHn)X!E7#!EF{Wp7bQ1cq^(ym z^!=y1;U1-(oS{5jF@P8JBlYS2w+H-hRK7RuvnP;n-jSA{e#%D2dZ>_hX{dUR35CEqdoX+cT9~u zvCx5er}=CLo6Oa9HZP4Gpl~Pf(dPn7*M$-A2)wwK5o0C8fn|rKAz3n8m94QS@cpOhuAuXg_*$5q z;zSB|PbIM9fZQe{lY7w zR1|sjQxgv^1-5amKZL!y%;B$?&I}g_?5hISl>wh@26j~ub~2NDS*y{wEnmsxi5#gW zj}VwX78p0kjtWvJa>KQTi^O|>NBF~M*$ekoR?a_^0I2LafdRRx`awd`GP~ch>Xd}A zH`E7R!ByGq5P`9&pBlCy{^t@d+G>=|O8DNngz)>n0HYYb4_peIdy-)7+okgIzXFx@ zUFR5SY(jOB!>_0xXVMp*Ebzm#_#3wvx@pF(ZgK}ZJn353p^k+?MOmObX0mc$5tLXV zDDqmH{<@RQZ{MJ!Vn{A%bB=7G9bs6kOw`U0OI#Uk4F9LG52BHr)Y>bMypD?_SpE zqPKzL8Jch1Cy<|EbGhUL!flIfC=beD@7-)6KTX5ldW&sdAk2;|ZW40+8Y&tsWO(GJ zsz6nfg`3!Cyt*lZdUmD~ttSn1VD-)fJj_R3n3Q9bh1%%RqqSs6KXe;0VgwBzKAg3! zeJT;rf{GT61l)pdpXQ})_h(bn!d$9*B!_lAkWH72chjlI+1fPUl!$PXxdQa*BZ5MH zJIQ(OCh$8!(IjH#Om45Gi%&=;S}U$hSJxLV4ybFuC8#J}=c`6{Pqon?6GyowuT#*b zc^OnXKSQB+!3>{Dx;miwm|C|P;MvEysQkffI{1qms{OYd+In9mWq5Tub3!sBW9BzM zDHQZ2)6L5TO&Z!Ytq==$4%4gtX%<~N&PDU5dFauz{q){7L1JW3K11Bc%x3v)=1w2x zRM*)&XKbEr7LT6er%bP)n@YSL>Gz%h#^mZWzQCaVL7mP>E<#Ft^Szl=&4Q5qtWi$- z$wjQ~*KNinDrSsJ(fGkccP9Z%9qd##JuqZ5_`8dPG$LE4X+xZ?V}5p~kDfj^P2GQY zsDozmcV1+aJd=Ev?h$Hj?P!bMsaq8>nXAjIpCP&G#&o*xG+(=q4bIZ3kxk=7&gb9y z7hCf`zoKi6&pXA-4o#=3f6Y=bUU7MlCiORzvwfAFn$&jxpsjT|reDw&%*&SsXwhsx zg_v0>u*v)_We&nN6_vmxud)vrGUS*Mfd0eAwi3K{vWG@93Z#9>{@yj|^s8BZT764M zX+S}rVY>D)K^{)k$F6ateK5+BjhU%&Ssb0Y z9L6bQSYwtM9>vXv>~{Z!@pT^xQK#z@(XlGPliMd6+}LiJ1!&{6`)$ z0#>hHO)V#}@;^Uh2`f)=;&q6hF<&^nf^sZnjYS5e)FtAi(`%*NJG5d-J_2$R#?bVLfb3>^Cy!_Iww(#~zBy$&oXQt*@5N7p-B35;~f9W*k8_A(ES?91gT3 zkvL~Lre;4|qRr8teGVwkAROt3HYFo@()RdD!rjjUxw*NhsHo`u{}GaP^{{-?+WfSw zMR{Z`%T2S%iOBw7ujXFzD9l}0+m5EpL3G{Tcl~+~;SXzo6{~@D+vLC4I5_;qk2vHU zRg6lO$?CAt&vlKA+j8fnc$kJ<&4c4}UFestf%ACon%awNo2*z?ilNp;Bv%sU1gkE+ z8at~@e7*zN%J#gG6RqtPcCuw!qLk~K5pwMK@#C}&8#WOB5n6F^v1k!a+s>M4cQ3nb z^n&CjOv}5D;~B;+`w@Muul2RQ*4O%4U+Zgqt*`a9-fw>cMV_?5=5cvN00000NkvXX Hu0mjf7wvz! From 5378aae09e2dda5241052e48b66638a9b8ff3f70 Mon Sep 17 00:00:00 2001 From: Michieal Date: Sat, 19 Nov 2022 12:19:32 +0000 Subject: [PATCH 14/23] Add in achievement. --- mods/ITEMS/mcl_hamburger/init.lua | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index 4904fab87..cb0d0d425 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -1,3 +1,9 @@ +--- +--- Generated by EmmyLua(https://github.com/EmmyLua) +--- Created by michieal. +--- DateTime: 11/19/22 7:13 AM +--- + --- --- Generated by EmmyLua(https://github.com/EmmyLua) --- Created by michieal. @@ -46,7 +52,7 @@ local hamburger_def = { on_place = minetest.item_eat(8), on_secondary_use = minetest.item_eat(8), groups = { food = 2, eatable = 8 }, - _mcl_saturation = 12.8, + _mcl_saturation = 13.8, } if not enable_burger then @@ -62,6 +68,23 @@ else minetest.register_craftitem("mcl_hamburger:hamburger", hamburger_alt) end +local function register_achievements() + + awards.register_achievement("mcl_hamburger:hamburger", { + title = S("Burger Time!"), + description = S("Craft a Hamburger."), + icon = "mcl_hamburger.png", + trigger = { + type = "craft", + item = "mcl_hamburger:hamburger", + target = 1 + }, + type = "Advancement", + group = "Overworld", + }) + +end + if enable_burger then -- make the villagers follow the item minetest.registered_entities["mobs_mc:villager"].nofollow = false @@ -69,4 +92,7 @@ if enable_burger then table.insert(minetest.registered_entities["mobs_mc:villager"].follow,"mcl_hamburger:hamburger") -- register the item and crafting recipe. mcl_hamburger.register_burger_craft("mcl_mobitems:cooked_beef") + -- add in the super cool achievement(s)! + register_achievements() end + From 81fa7cf74ca2a37766a87608826bd1bee67a0cb2 Mon Sep 17 00:00:00 2001 From: Michieal Date: Sun, 20 Nov 2022 01:39:54 -0500 Subject: [PATCH 15/23] Removed outdated translate files. made new translation template. Changed _alt image. Updated the readme.txt to reflect the changes. Added a secondary crafting recipe for the Hamburger. --- .idea/.gitignore | 3 ++ .idea/MineClone2-mcl_hamburger.iml | 9 ++++++ .idea/misc.xml | 6 ++++ .idea/modules.xml | 8 ++++++ .idea/vcs.xml | 6 ++++ mods/ITEMS/mcl_hamburger/init.lua | 26 ++++++++++++++++-- .../mcl_hamburger/locale/mcl_signs.de.tr | 9 ------ .../mcl_hamburger/locale/mcl_signs.es.tr | 8 ------ .../mcl_hamburger/locale/mcl_signs.fr.tr | 9 ------ .../mcl_hamburger/locale/mcl_signs.pl.tr | 9 ------ .../mcl_hamburger/locale/mcl_signs.ru.tr | 9 ------ .../mcl_hamburger/locale/mcl_signs.zh_TW.tr | 9 ------ mods/ITEMS/mcl_hamburger/locale/template.txt | 19 +++++++------ mods/ITEMS/mcl_hamburger/mod.conf | 6 ++-- .../textures/mcl_hamburger_alt.png | Bin 1411 -> 640 bytes 15 files changed, 69 insertions(+), 67 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/MineClone2-mcl_hamburger.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml delete mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.de.tr delete mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.es.tr delete mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.fr.tr delete mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.pl.tr delete mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.ru.tr delete mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_signs.zh_TW.tr diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..26d33521a --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/MineClone2-mcl_hamburger.iml b/.idea/MineClone2-mcl_hamburger.iml new file mode 100644 index 000000000..d6ebd4805 --- /dev/null +++ b/.idea/MineClone2-mcl_hamburger.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..639900d13 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..4dfb6100b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index cb0d0d425..bc95f0248 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -17,13 +17,17 @@ local modname = minetest.get_current_modname() local modpath = minetest.get_modpath(modname) local table = table -local DEBUG = false +local DEBUG = true local enable_burger = minetest.settings:get_bool("mcl_enable_hamburger",true) local use_alt = minetest.settings:get_bool("mcl_hamburger_alt_texture",false) mcl_hamburger = {} +if DEBUG then + minetest.log("MCL_Hamburger::START.") +end + -- call to register your hamburger. function mcl_hamburger.register_burger_craft(cooked_meat) minetest.register_craft({ @@ -40,6 +44,14 @@ function mcl_hamburger.register_burger_craft(cooked_meat) { "mcl_farming:bread" }, }, }) + minetest.register_craft({ + output = "mcl_hamburger:hamburger", + recipe = { + -- "mcl_mobitems:cooked_beef" for a reg hamburger. Grind up clowns for a Big Mac. + { "mcl_farming:bread", cooked_meat, "mcl_farming:bread"}, + }, + }) + end local hamburger_def = { @@ -73,7 +85,7 @@ local function register_achievements() awards.register_achievement("mcl_hamburger:hamburger", { title = S("Burger Time!"), description = S("Craft a Hamburger."), - icon = "mcl_hamburger.png", + icon = "mcl_hamburger_alt.png", trigger = { type = "craft", item = "mcl_hamburger:hamburger", @@ -85,6 +97,15 @@ local function register_achievements() end +local function register_doc_entry() + + -- register Doc entry + if minetest.get_modpath("doc") then + doc.add_entry_alias("craftitems", "mcl_hamburger:hamburger", "craftitems", "mcl_hamburger:hamburger") + end + +end + if enable_burger then -- make the villagers follow the item minetest.registered_entities["mobs_mc:villager"].nofollow = false @@ -94,5 +115,6 @@ if enable_burger then mcl_hamburger.register_burger_craft("mcl_mobitems:cooked_beef") -- add in the super cool achievement(s)! register_achievements() + register_doc_entry() end diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.de.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.de.tr deleted file mode 100644 index a7513659b..000000000 --- a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.de.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: mcl_signs -Sign=Schild -Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Schilder können beschrieben werden und kommen in zwei Varianten: Wandschild und stehendes Schild. Sie können auf und an den Seiten von anderen Blöclen platziert werden, aber nicht unter ihnen. -After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Nachdem das Schild platziert wurde, kann man etwas darauf schreiben. 4 Zeilen mit je 15 Zeichen pro Zeile sind verfügbar, alles darüber geht verloren. Es werden nicht alle Zeichen unterstützt. Der Text kann nicht geändert werden, sobald er geschrieben wurde; man muss das Schild erneut platzieren. -Enter sign text:=Schildtext eingeben: -Maximum line length: 15=Maximale Zeilenlänge: 15 -Maximum lines: 4=Maximale Zeilen: 4 -Done=Fertig -Can be written=Kann beschriftet werden diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.es.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.es.tr deleted file mode 100644 index d67e2da0d..000000000 --- a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.es.tr +++ /dev/null @@ -1,8 +0,0 @@ -# textdomain: mcl_signs -Sign=Firmar -Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Los letreros se pueden escribir y vienen en dos variantes: letrero de muro y letrero en un poste de letrero. Los letreros se pueden colocar en la parte superior y en los costados de otros bloques, pero no debajo de ellos. -After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Después de colocar el letrero, puede escribir algo en él. Tiene 4 líneas de texto con hasta 15 caracteres para cada línea; todo lo que esté más allá de estos límites se pierde. No todos los personajes son compatibles. El texto no se puede cambiar una vez que se ha escrito; tienes que romper y colocar el letrero nuevamente. -Enter sign text:=Inserte el texto del letrero: -Maximum line length: 15=Longitud máxima de línea: 15 -Maximum lines: 4=Líneas máximas: 4 -Done=Escribir cartel diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.fr.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.fr.tr deleted file mode 100644 index 158640dae..000000000 --- a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.fr.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: mcl_signs -Sign=Panneau -Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Les panneaux peuvent être écrits et se déclinent en deux variantes: panneau mural et panneau sur poteau. Des panneaux peuvent être placés en haut et sur les côtés des autres blocs, mais pas en dessous. -After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Après avoir placé le panneau, vous pouvez écrire quelque chose dessus. Vous avez 4 lignes de texte avec jusqu'à 15 caractères pour chaque ligne; tout ce qui dépasse ces limites est perdu. Tous les caractères ne sont pas pris en charge. Le texte ne peut pas être modifié une fois qu'il a été écrit; vous devez casser et placer à nouveau le panneau. -Enter sign text:=Saisir le texte du panneau: -Maximum line length: 15=Longueur maximum des lignes: 15 -Maximum lines: 4=Nombre maximum de lignes: 4 -Done=Terminé -Can be written=Peut être écrit diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.pl.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.pl.tr deleted file mode 100644 index bf3bbf3c8..000000000 --- a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.pl.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: mcl_signs -Sign=Znak -Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=Na znakach można pisać i postawić je w dwóch wariantach: znak ścienny i znak na patyku. Znaki mogą być stawiane na górze i na bokach bloków, ale nie pod nimi. -After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=Po postawieniu znaku możesz coś na nim napisać. Masz miejsce na cztery linie tekstu po 15 znaków każda; cokolwiek poza limitami będzie utracone. Nie wszystkie znaki są wspierane. Tekstu nie można zmienić po napisaniu; musisz zniszczyć znak i postawić go ponownie. -Enter sign text:=Wpisz tekst znaku: -Maximum line length: 15=Maksymalna długość linii: 15 -Maximum lines: 4=Maksymalna liczba linii: 4 -Done=Skończone -Can be written=Można na nim coś napisać diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.ru.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.ru.tr deleted file mode 100644 index 354e556a8..000000000 --- a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.ru.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: mcl_signs -Sign=Табличка -Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=На табличках можно писать. Таблички бывают двух видов: настенные и отдельно стоящие. Таблички можно размещать на верхушках и сторонах блоков, но не под блоками. -After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=После установки таблички вы можете написать на ней что-то. Вам доступны 4 строки текста, до 15 символов в каждой; всё, что вы напишете сверх лимита, потеряется. Поддерживаются не все символы. Текст нельзя изменить. Чтобы изменить его, вам придётся сломать табличку и подписать её снова. -Enter sign text:=Текст на табличке: -Maximum line length: 15=Максимальная длина строки: 15 -Maximum lines: 4=Максимум строк: 4 -Done=Готово -Can be written=Может быть подписана diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.zh_TW.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_signs.zh_TW.tr deleted file mode 100644 index 62994bc3d..000000000 --- a/mods/ITEMS/mcl_hamburger/locale/mcl_signs.zh_TW.tr +++ /dev/null @@ -1,9 +0,0 @@ -# textdomain: mcl_signs -Sign=告示牌 -Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.=告示牌可以寫字，有兩種變體：牆上的告示牌和柱上的告示牌。告示牌可以放在其他方塊的頂部和側面，但不能放在下面。 -After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again.=放置告示牌後，你可以在上面寫東西。你最多可以寫4行文字，每行最多可以寫15個字符；超過這些限制的文字就會丟失。不是所有的字符都被支持。文字一旦寫完就不能更改；你必須打破並重新放置標誌。 -Enter sign text:=輸入告示牌文字： -Maximum line length: 15=每行最多可以寫15個字符 -Maximum lines: 4=最多可以寫4行文字 -Done=確認 -Can be written=可以寫字 diff --git a/mods/ITEMS/mcl_hamburger/locale/template.txt b/mods/ITEMS/mcl_hamburger/locale/template.txt index 7336db4f4..850ff62b0 100644 --- a/mods/ITEMS/mcl_hamburger/locale/template.txt +++ b/mods/ITEMS/mcl_hamburger/locale/template.txt @@ -1,9 +1,10 @@ -# textdomain: mcl_signs -Sign= -Signs can be written and come in two variants: Wall sign and sign on a sign post. Signs can be placed on the top and the sides of other blocks, but not below them.= -After placing the sign, you can write something on it. You have 4 lines of text with up to 15 characters for each line; anything beyond these limits is lost. Not all characters are supported. The text can not be changed once it has been written; you have to break and place the sign again. Can be colored and made to glow.= -Enter sign text:= -Maximum line length: 15= -Maximum lines: 4= -Done= -Can be written= +# textdomain: mcl_hamburger +A Hamburger= + +A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten.= + +A tasty hamburger that is sure to lure villagers. 'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy.= + +Burger Time!= +Craft a Hamburger.= +Wield this item to pull villagers to you.= diff --git a/mods/ITEMS/mcl_hamburger/mod.conf b/mods/ITEMS/mcl_hamburger/mod.conf index 205b3c558..32a5ad542 100644 --- a/mods/ITEMS/mcl_hamburger/mod.conf +++ b/mods/ITEMS/mcl_hamburger/mod.conf @@ -1,4 +1,4 @@ name = mcl_hamburger -description = A cute (and easy to use) replacement for not having leashes in MC2. Also adds in a new food item. -depends = mcl_core, mcl_sounds, mobs_mc, mcl_mobitems -optional_depends = doc, awards +description = A cute (and easy to use) replacement for not having leashes in MC2 +depends = mcl_core, mcl_sounds, mobs_mc, mcl_mobitems, awards +optional_depends = doc diff --git a/mods/ITEMS/mcl_hamburger/textures/mcl_hamburger_alt.png b/mods/ITEMS/mcl_hamburger/textures/mcl_hamburger_alt.png index 022fc1c02111fa5184f20961f4ea30c527629c1a..70fd29448db5271f310b6224c6e9301f8f19f466 100644 GIT binary patch literal 640 zcmV-`0)PF9P)FN1P1zs&BNz@Xq!txKiwu>h2tgu>AleGy&PA&hg0zxA+Ez<* zA(hp}O(K#Q35D4pl{49><7oHI%)9Ts+v4Roh^;$t;oNh-``z=Ma}WG))3ydid*bR} z;EVlf?d82aM%%-m&PL2A2aI&rsY9o4P#KD%8#@3z&#@_5xdKX6jrKfKTOTet!`%ne z(Ni5%7!Jzw@H`KIU5U&5njQkcMdx>RiN(1o9NUg|4rbN@0FS$(s=4(J0nZ|DSy*LD z+BQN6gb=K+F5@c2?xu6B=Ik6m06++rik%Uplt?M5J#iJ=wy|xS`SGVEUrLGNI7C7< z2;pwlU~OH3Q$^4)S+;&K|L#dif>$O71=XQC!bYusXM;fGJ;vTVr~T4(qGB&ana6eg zLVK!GM_cjUoCZu+&dQu7fGgrC>h}Xn1biYB$E>Kuq0$_4%h{?Iv zOnnt}9FK&USoR6--`=O18-g?)j`3*VE}8}#SxZ-8OMhb(JT9D!5((+dW^4gyr8YM9 zHmXD-K`a)dHxOXZGyzDb(2UU72rFDq=gbH< z<1GL@IM#{`3IH;Tb7Y(a#=oVQZ_!o%d)LpvtVFf%ha>eSZP(6YnlW@k_dk#8QY;ib zATaY`mQT}PNG@b~@f}tQWfB0DFyTxc1hnmEAzOr*EPPzqevSZiAiU+U5{Lm+K+RuF a$^HP;J`mN@*$0*Y0000 zZ*1LF8OJ}*`Te=S+xE7%y}hl2-VWBSG94}|!x3V(NJheo!H@=sjsTWuh=@Q&(iwa) ze6uVh&cwksNJv~F5!;FAvWyo*jS)qrg9r|`0Xl(fvvFg&?d`qycfY>)wfFX}U2Tjn ze6c6_<#+O&bH2~_Ip_Iv;F4UD|4szx^1{{XS#p&CwPy^7CgOqKm6{nAu@!8E)9WzwGZJ#1Rq!)ziKC1d}=O8`#nHTrTO!DFv(<(;>W z@%&w*^@ZsnQ5sF4f)G|eAeMB&i;pF`8qhK%a`_dEpE+iWA)r0qguAW_c>YiecU}`w zoD}CvHS(Vt$8+%bpGUZV*>>_B;QKJVQ|x&lfeQmL2XO^Po)usIBCJ_%Yr}t6Opav@SoB06X~WiZ|GJ%k3Q9akSx% zz;h7S5|uaj2>#ViFg4~#-IgfVtT0|Xp6qb537q`b*(73W4c)mNJ-ji}J?nfD&Q-x> z2X5f-*T_+E&)r)=uo=#Hou1p=P4FcsxIE$}E)Jtt-wfD*Ib+7jbR= z1W@M2R8#&2e)8|QIi=R?leug9gQWP}m{RU*EegCu*WYCV6a~qi_M4(Qjx*G?IV~J= z&dse49Yc{m@!fWXS9o%5ru>6#!cPDTyR#}hnN?v=R)8!rdF{!Zr4pcMRYJ<|b1M8W zJ3aOUsIxU$)BUa1`u_gC(^#{;-@2iV*G`uC@!eUR1J8u>#LGux4*aFW)4!htU?Asl z_|Y7JXM8YG=D?AdyRQ#%xpUmNx5C&f(3^$pK4}c}LLr~H`kOc5w{MAJ2{x~XJ%<`G zpznPZ9^K@a{HOzGB6Zoh#sL{%!aLOklvr0Q2DfU1Ik^z|6^WjXO6>YJK%*rqXEg#UJd~j8soPr^HwSKi*3*`CY5A7mz5Z~QJcsgab!QiDv#WYN^>rix zly7qy-`=B}R)(4yGsQ0?hVS`&Bf{4$3w1@O)4n@8w0r+4A~QwuZx(z1}3-z^h*MmZMU8Mt=? zZ2O841yHUu)<#2Gup6p0YE1mS6O|iP+IcalCFk*4%BW_Ge8LFtGut8PB7Xf5Qk%{* zHI^b8DmU4kw-=-fXPKB)^J}rk Date: Sun, 20 Nov 2022 01:41:21 -0500 Subject: [PATCH 16/23] Updated the readme.txt to reflect the changes. --- mods/ITEMS/mcl_hamburger/readme.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mods/ITEMS/mcl_hamburger/readme.txt b/mods/ITEMS/mcl_hamburger/readme.txt index 6ab18ef56..e479c01b9 100644 --- a/mods/ITEMS/mcl_hamburger/readme.txt +++ b/mods/ITEMS/mcl_hamburger/readme.txt @@ -24,9 +24,16 @@ suggestions are always welcome! ------------------------------------------------------------ +The images contained within have been altered to be more legible within the game and not rendered with weird +antialiasing by Michieal. All extraneous information in the images have been removed to decrease file size. -Note: there's an alt image that is licensed as "Only for personal use" as it is the original BurgerTime arcade game's -burger image. And it is copyright Data East, 1982 and Bally Midway. +This mod is licensed under CC-BY-SA 3, with the intent of it being used by the Mineclone 2 game for Minetest. +This code was written by Michieal, with additions included by Cora. + +The achievement "Burger Time!" is an homage to the classic coin-op arcade game BurgerTime, by Data East (1982) and +Bally Midway. + +Information about the BurgerTime Arcade Game: From https://thepinballgameroom.com/product/burgertime-arcade-machine/ on the original game: BurgerTime Arcade Machine, originally released as Hamburger in Japan, is a 1982 arcade game developed by Data East From f1ae86ede5bc6339aa762c6c9371da19d46a304b Mon Sep 17 00:00:00 2001 From: Michieal Date: Sun, 20 Nov 2022 02:35:27 -0500 Subject: [PATCH 17/23] Add in the Translation files for the base languages. --- mods/ITEMS/mcl_hamburger/init.lua | 4 ++-- .../mcl_hamburger/locale/mcl_hamburger.de.tr | 10 ++++++++++ .../mcl_hamburger/locale/mcl_hamburger.es.tr | 10 ++++++++++ .../mcl_hamburger/locale/mcl_hamburger.fr.tr | 10 ++++++++++ .../mcl_hamburger/locale/mcl_hamburger.pl.tr | 10 ++++++++++ .../mcl_hamburger/locale/mcl_hamburger.ru.tr | 10 ++++++++++ .../mcl_hamburger/locale/mcl_hamburger.zh_TW.tr | 16 ++++++++++++++++ 7 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.de.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.es.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.fr.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.pl.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.ru.tr create mode 100644 mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.zh_TW.tr diff --git a/mods/ITEMS/mcl_hamburger/init.lua b/mods/ITEMS/mcl_hamburger/init.lua index bc95f0248..7d4707bdd 100644 --- a/mods/ITEMS/mcl_hamburger/init.lua +++ b/mods/ITEMS/mcl_hamburger/init.lua @@ -17,7 +17,7 @@ local modname = minetest.get_current_modname() local modpath = minetest.get_modpath(modname) local table = table -local DEBUG = true +local DEBUG = false local enable_burger = minetest.settings:get_bool("mcl_enable_hamburger",true) local use_alt = minetest.settings:get_bool("mcl_hamburger_alt_texture",false) @@ -57,7 +57,7 @@ end local hamburger_def = { description = S("A Hamburger"), _doc_items_longdesc = S("A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten."), - _doc_items_usagehelp = S("wield this item to pull villagers to you."), + _doc_items_usagehelp = S("Wield this item to pull villagers to you."), _tt_help = S("A tasty hamburger that is sure to lure villagers. 'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy."), inventory_image = "mcl_hamburger.png", wield_image = "mcl_hamburger.png", diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.de.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.de.tr new file mode 100644 index 000000000..8d375dbd5 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.de.tr @@ -0,0 +1,10 @@ +# textdomain: mcl_hamburger +A Hamburger=Ein Hamburger + +A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten.=Ein leckerer Hamburger, der die Dorfbewohner sicher wie eine Leine anlocken wird. Kann gegessen werden. + +A tasty hamburger that is sure to lure villagers. 'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy.=Ein leckerer Hamburger, der die Dorfbewohner anlocken wird. "Ich bezahle dir gerne den Dienstag, für heute einen Hamburger." - Wimpy. + +Burger Time!=Burgerzeit! +Craft a Hamburger.=Stelle einen Hamburger her. +Wield this item to pull villagers to you.=Benutze diesen Gegenstand, um Dorfbewohner zu dir zu ziehen. diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.es.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.es.tr new file mode 100644 index 000000000..ad10560e4 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.es.tr @@ -0,0 +1,10 @@ +# textdomain: mcl_hamburger +A Hamburger=Una hamburguesa + +A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten.=Una sabrosa hamburguesa que seguramente atraerá a los aldeanos como una pista. Se puede comer. + +A tasty hamburger that is sure to lure villagers. 'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy.=Una sabrosa hamburguesa que seguramente atraerá a los aldeanos. 'Con gusto te pago el martes, por una hamburguesa hoy.' - Wimpy. + +Burger Time!=¡Tiempo de hamburguesas! +Craft a Hamburger.=Elabora una hamburguesa. +Wield this item to pull villagers to you.=Utiliza este objeto para atraer a los aldeanos hacia ti. diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.fr.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.fr.tr new file mode 100644 index 000000000..1463a69ad --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.fr.tr @@ -0,0 +1,10 @@ +# textdomain: mcl_hamburger +A Hamburger=Un hamburger + +A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten.=Un hamburger savoureux qui ne manquera pas d'attirer les villageois comme une piste. Peut être mangé. + +A tasty hamburger that is sure to lure villagers. 'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy.=Un hamburger savoureux qui ne manquera pas d'attirer les villageois. «Je vous paierai volontiers mardi, pour un hamburger aujourd'hui.» - Wimpy. + +Burger Time!=L'heure des burgers! +Craft a Hamburger.=Fabriquez un hamburger. +Wield this item to pull villagers to you.=Maniez cet objet pour attirer les villageois vers vous. \ No newline at end of file diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.pl.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.pl.tr new file mode 100644 index 000000000..09569a2ba --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.pl.tr @@ -0,0 +1,10 @@ +# textdomain: mcl_hamburger +A Hamburger=Hamburger + +A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten.=Smaczny hamburger, który zwabi wieśniaków jak trop. Można jeść. + +A tasty hamburger that is sure to lure villagers. 'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy.=Smaczny hamburger, który z pewnością zwabi wieśniaków. - Chętnie zapłacę we wtorek za hamburgera dzisiaj. - Mięczak (Wimpy). + +Burger Time!=Czas na burgery! +Craft a Hamburger.=Stwórz hamburgera. +Wield this item to pull villagers to you.=Chwyć ten przedmiot, aby przyciągnąć wieśniaków do siebie. diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.ru.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.ru.tr new file mode 100644 index 000000000..736f182a5 --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.ru.tr @@ -0,0 +1,10 @@ +# textdomain: mcl_hamburger +A Hamburger=Гамбургер + +A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten.=Вкусный гамбургер, который обязательно привлечет жителей деревни, как наживку. Можно есть. + +A tasty hamburger that is sure to lure villagers. 'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy.=Вкусный гамбургер, который обязательно привлечет жителей деревни. — Я с радостью заплачу тебе во вторник за гамбургер сегодня. - Вимпи. + +Burger Time!=Время бургеров! +Craft a Hamburger.=Изготовить гамбургер. +Wield this item to pull villagers to you.=Используйте этот предмет, чтобы притягивать к себе жителей деревни. diff --git a/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.zh_TW.tr b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.zh_TW.tr new file mode 100644 index 000000000..46f30c88e --- /dev/null +++ b/mods/ITEMS/mcl_hamburger/locale/mcl_hamburger.zh_TW.tr @@ -0,0 +1,16 @@ +# textdomain: mcl_hamburger +A Hamburger=一個漢堡 +A tasty hamburger that is sure to lure villagers around like a lead. Can be eaten.=一個美味的漢堡包，肯定會像鉛一樣吸引村民。 可以吃 +A tasty hamburger that is sure to lure villagers. 'I'll gladly pay you Tuesday, for a hamburger today.' - Wimpy.=一個美味的漢堡包，一定會吸引村民。 “我很樂意在星期二付錢給你，今天就買一個漢堡包。” - 懦弱。 +Burger Time!=漢堡時間！ +Craft a Hamburger.=製作一個漢堡包。 +Wield this item to pull villagers to you.=使用此物品將村民拉到你身邊。 + + + + + + + + + From b783e616df834cdd0fbc33170149c9f9c4201eea Mon Sep 17 00:00:00 2001 From: Michieal Date: Sun, 20 Nov 2022 06:47:37 +0000 Subject: [PATCH 18/23] Delete '.idea/.gitignore' . --- .idea/.gitignore | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521a..000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml From 7e31ece3250a3102f99d0347fdd7cf332b91a270 Mon Sep 17 00:00:00 2001 From: Michieal Date: Sun, 20 Nov 2022 06:47:50 +0000 Subject: [PATCH 19/23] Delete '.idea/MineClone2-mcl_hamburger.iml' . --- .idea/MineClone2-mcl_hamburger.iml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .idea/MineClone2-mcl_hamburger.iml diff --git a/.idea/MineClone2-mcl_hamburger.iml b/.idea/MineClone2-mcl_hamburger.iml deleted file mode 100644 index d6ebd4805..000000000 --- a/.idea/MineClone2-mcl_hamburger.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file From cc190eeb6265e32d419d3f10b9920185ed3aa834 Mon Sep 17 00:00:00 2001 From: Michieal Date: Sun, 20 Nov 2022 06:48:07 +0000 Subject: [PATCH 20/23] Delete '.idea/misc.xml' --- .idea/misc.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/misc.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 639900d13..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 4b570b1aa923bf56f0d22fcdc96429337da99ff7 Mon Sep 17 00:00:00 2001 From: Michieal Date: Sun, 20 Nov 2022 06:48:27 +0000 Subject: [PATCH 21/23] Delete '.idea/modules.xml' --- .idea/modules.xml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .idea/modules.xml diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 4dfb6100b..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file From a542503b724587b7b6d9f021ba984cee392cb873 Mon Sep 17 00:00:00 2001 From: Michieal Date: Sun, 20 Nov 2022 06:48:38 +0000 Subject: [PATCH 22/23] Delete '.idea/vcs.xml' --- .idea/vcs.xml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 .idea/vcs.xml diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfb..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From c45e4d292ac3887613396b9b6b2bf7dcef7abbf8 Mon Sep 17 00:00:00 2001 From: Michieal Date: Tue, 22 Nov 2022 07:28:26 -0500 Subject: [PATCH 23/23] Added in Author Info to the conf file. --- mods/ITEMS/mcl_hamburger/mod.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ITEMS/mcl_hamburger/mod.conf b/mods/ITEMS/mcl_hamburger/mod.conf index 32a5ad542..f5baca506 100644 --- a/mods/ITEMS/mcl_hamburger/mod.conf +++ b/mods/ITEMS/mcl_hamburger/mod.conf @@ -1,4 +1,5 @@ name = mcl_hamburger +author = Michieal description = A cute (and easy to use) replacement for not having leashes in MC2 depends = mcl_core, mcl_sounds, mobs_mc, mcl_mobitems, awards optional_depends = doc