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 022fc1c02..70fd29448 100644
Binary files a/mods/ITEMS/mcl_hamburger/textures/mcl_hamburger_alt.png and b/mods/ITEMS/mcl_hamburger/textures/mcl_hamburger_alt.png differ