~jadedctrl/gem-xwx-moe

Showing details for patch 153875db4fc59b857c42b169ce81d96851d59381.
2024-08-01 (Thu), 5:38 AM - - 153875db4fc59b857c42b169ce81d96851d59381

Aldonas servilregularan bonvenon

Montras fenestron kun la regularo; jen ĉio!
Summary of changes
3 files added
  • gemujo_ludo/flikaĵoj/bonvenon/0001-Traduki-kaj-specialigi-por-Gemujo.patch
  • gemujo_ludo/flikaĵoj/bonvenon/reguloj.txt
  • gemujo_ludo/flikaĵoj/bonvenon/ĉefvortoj.txt
2 files modified with 10 lines added and 1 lines removed
  • gemujo_ludo/minetest.publike.conf with 1 added and 0 removed lines
  • gemujo_ludo/pretigi.sh with 9 added and 1 removed lines
diff -rN -u "old-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/0001-Traduki-kaj-specialigi-por-Gemujo.patch" "new-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/0001-Traduki-kaj-specialigi-por-Gemujo.patch"
--- "old-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/0001-Traduki-kaj-specialigi-por-Gemujo.patch"	1970-01-01 00:00:00.000000000 +0000
+++ "new-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/0001-Traduki-kaj-specialigi-por-Gemujo.patch"	2024-11-21 21:50:35.467408666 +0000
@@ -0,0 +1,331 @@
+From d483c66fe082c5ee617e9fcbf4e80d6b5072feb5 Mon Sep 17 00:00:00 2001
+From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com>
+Date: Thu, 1 Aug 2024 00:30:39 -0500
+Subject: [PATCH] Traduki kaj specialigi por Gemujo
+
+---
+ init.lua | 163 +++++++++++++++++--------------------------------------
+ 1 file changed, 50 insertions(+), 113 deletions(-)
+
+diff --git a/init.lua b/init.lua
+index b74026e..30fa001 100644
+--- a/init.lua
++++ b/init.lua
+@@ -8,7 +8,7 @@ else
+ 	end
+ end
+ 
+-local f = io.open(minetest.get_worldpath()..DIR_DELIM.."newplayer-keywords.txt","r")
++local f = io.open(minetest.get_modpath(minetest.get_current_modname())..DIR_DELIM.."ĉefvortoj.txt","r")
+ if f then
+ 	local d = f:read("*all")
+ 	newplayer.keywords = minetest.deserialize(d)
+@@ -21,34 +21,34 @@ newplayer.assigned_keywords = {}
+ 
+ newplayer.hudids = {}
+ 
+-local f = io.open(minetest.get_worldpath()..DIR_DELIM.."newplayer-rules.txt","r")
++local f = io.open(minetest.get_modpath(minetest.get_current_modname())..DIR_DELIM.."reguloj.txt","r")
+ if f then
+ 	local d = f:read("*all")
+ 	newplayer.rules = minetest.formspec_escape(d)
+ 	f:close()
+ else
+-	newplayer.rules = "Rules file not found!\n\nThe file should be named \"newplayer-rules.txt\" and placed in the following location:\n\n"..minetest.get_worldpath()..DIR_DELIM
++	newplayer.rules = "Rules file not found!\n\nThe file should be named \"reguloj.txt\" and placed in the following location:\n\n"..minetest.get_modpath(minetest.get_current_modname())..DIR_DELIM
+ end
+ 
+ function newplayer.savekeywords()
+-	local f = io.open(minetest.get_worldpath()..DIR_DELIM.."newplayer-keywords.txt","w")
++	local f = io.open(minetest.get_worldpath()..DIR_DELIM.."ĉefvortoj.txt","w")
+ 	local d = minetest.serialize(newplayer.keywords)
+ 	f:write(d)
+ 	f:close()
+ end
+ 
+ local editformspec1 = "size[13,9]"..
+-	"label[0,-0.1;Editing Server Rules]"..
++	"label[0,-0.1;Redaktante servilajn regulojn]"..
+ 	"textarea[0.25,0.5;12.5,7;rules;;"
+ -- the rules get inserted between these two on demand
+ local editformspec2 = "]"..
+-	"button_exit[0.5,8.1;2,1;save;Save]"..
+-	"button_exit[5,8.1;2,1;quit;Cancel]"
++	"button_exit[0.5,8.1;2,1;save;Konservi]"..
++	"button_exit[5,8.1;2,1;quit;Nuligi]"
+ 
+ function newplayer.showrulesform(name)
+ 
+ 	-- Word-wrap the file
+-	local strstart = 1
++	local strstart = 0
+ 	local charpos = 0
+ 	local linelen = 0
+ 	local tline = 1
+@@ -61,7 +61,7 @@ function newplayer.showrulesform(name)
+ 		linelen = linelen + 1
+ 		local c = string.sub(newplayer.rules, charpos, charpos)
+ 		if c == " " or c == "\t" or c == "\n" or c == "\r" then lastbreak = charpos end
+-		if linelen > 70 or c == "\n" or c == "\r" then
++		if linelen > 80 or c == "\n" or c == "\r" then
+ 			newplayer.rules_formspec_buffer = newplayer.rules_formspec_buffer..","..string.sub(newplayer.rules, strstart, lastbreak-1)
+ 			tline = tline + 1
+ 			strstart = lastbreak + 1
+@@ -82,23 +82,23 @@ function newplayer.showrulesform(name)
+ 		newplayer.rules_subbed_interact = newplayer.rules_formspec_buffer
+ 	end		
+ 	local form_interact = "size[13,9]"..
+-				"label[0,-0.1;Server Rules]"..
++				"label[0,-0.1;Reguloj]"..
+ 				"textlist[0.25,0.5;12.5,6.25;rules;"..newplayer.rules_subbed_interact.."]"
+ 	local form_nointeract = "size[13,9]"..
+-				"label[0,-0.1;Server Rules]"..
++				"label[0,-0.1;Reguloj]"..
+ 				"textlist[0.25,0.5;12.5,6.25;rules;"..newplayer.rules_subbed.."]"..
+-				"button[1,8;2,1;yes;I agree]"..
+-				"button[5,8;2,1;no;I do not agree]"
++				"button[1,8;2,1;yes;Akcepti]"..
++				"button[5,8;2,1;no;Malakcepti]"
+ 	if #newplayer.keywords > 0 then
+-		form_nointeract = form_nointeract.."field[0.5,7.6;8,1;keyword;Enter keyword from rules above:;]"
++		form_nointeract = form_nointeract.."field[0.5,7.6;8,1;keyword;Tajpu la «emfazitan» vorton supre:;]"
+ 	end
+ 	local hasinteract = minetest.check_player_privs(name,{interact=true})
+ 	if hasinteract then
+ 		if minetest.check_player_privs(name,{server=true}) then
+-			form_interact = form_interact.."button_exit[0.4,8.1;2,1;quit;OK]"
+-			form_interact = form_interact.."button[4,8.1;2,1;edit;Edit]"
++			form_interact = form_interact.."button_exit[0.4,8.1;2,1;quit;Bone]"
++			form_interact = form_interact.."button[4,8.1;2,1;edit;Redakti]"
+ 		else
+-			form_interact = form_interact.."button_exit[0.4,8.1;2,1;quit;OK]"
++			form_interact = form_interact.."button_exit[0.4,8.1;2,1;quit;Bone]"
+ 		end
+ 		minetest.show_formspec(name,"newplayer:rules_interact",form_interact)
+ 	else
+@@ -119,7 +119,7 @@ minetest.register_on_joinplayer(function(player)
+ 		hud_elem_type = "text",
+ 		position = {x=0.5,y=0.5},
+ 		scale = {x=100,y=100},
+-		text = "BUILDING DISABLED\nYou must agree to\nthe rules before building!\nUse the /rules command\nto see them.",
++		text = "KONSTRUADO MALŜALTITA\nVi akordu la regulojn antaŭ konstruado!\nRulu la ordonon «/reguloj» por ilin vidi.",
+ 		number = 0xFF6666,
+ 		alignment = {x=0,y=0},
+ 		offset = {x=0,y=0}
+@@ -148,30 +148,28 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
+ 				end
+ 				local spawn = minetest.setting_get_pos("spawnpoint_interact")
+ 				if spawn then
+-					minetest.chat_send_player(name,"Teleporting to spawn...")
++					minetest.chat_send_player(name,"Teleportante al naskejo…")
+ 					player:setpos(spawn)
+ 				else
+-					minetest.chat_send_player(name,newplayer.colorize("#FF0000","ERROR: ").."The spawn point is not set!")
++					minetest.chat_send_player(name,newplayer.colorize("#FF0000","Eraro: ").."Naskejo ne agordita!")
+ 				end
+ 				local form =    "size[5,3]"..
+-						"label[1,0;Thank you for agreeing]"..
+-						"label[1,0.5;to the rules!]"..
+-						"label[1,1;You are now free to play normally.]"..
+-						"label[1,1.5;You can also use /spawn to return here.]"..
+-						"button_exit[1.5,2;2,1;quit;OK]"
++						"label[1,0;Bonvenon, samideano!]"..
++						"label[1,0.5;Ĝuan ludadon!]"..
++						"button_exit[1.5,2;2,1;quit;Bone]"
+ 				minetest.show_formspec(name,"newplayer:agreethanks",form)
+ 			else
+ 				local form =    "size[5,3]"..
+-						"label[1,0;Incorrect keyword!]"..
+-						"button[1.5,2;2,1;quit;Try Again]"
++						"label[1,0;Malprava ĉefvorto!]"..
++						"button[1.5,2;2,1;quit;Reprovu]"
+ 				minetest.show_formspec(name,"newplayer:tryagain",form)
+ 			end
+ 		elseif fields.no then
+ 			local form =    "size[5,3]"..
+-					"label[1,0;You may remain on the server,]"..
+-					"label[1,0.5;but you may not dig or build]"..
+-					"label[1,1;until you agree to the rules.]"..
+-					"button_exit[1.5,2;2,1;quit;OK]"
++					"label[1,0;Vi rajtas resti ĉi tie,]"..
++					"label[1,0.5;tamen vi nek rajtas fosi]"..
++					"label[1,1;nek konstrui ĝis regulakordo.]"..
++					"button_exit[1.5,2;2,1;quit;Bone]"
+ 			minetest.show_formspec(name,"newplayer:disagreewarning",form)
+ 		end
+ 		return true
+@@ -185,10 +183,10 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
+ 				f:write(fields.rules)
+ 				f:close()
+ 				newplayer.rules = minetest.formspec_escape(fields.rules)
+-				minetest.chat_send_player(name,newplayer.colorize("#55FF55","Success: ").."Rules/keyword updated.")
++				minetest.chat_send_player(name,newplayer.colorize("#55FF55","Sukcese: ").."Reguloj/ĉefvorto redaktita.")
+ 			end
+ 		else
+-			minetest.chat_send_player(name,"You hacker you... nice try!")
++			minetest.chat_send_player(name,"Fia trompisto… bona provo!")
+ 		end
+ 	elseif formname == "newplayer:rules_interact" then
+ 		if fields.edit and minetest.check_player_privs(name,{server=true}) then
+@@ -206,26 +204,16 @@ minetest.register_on_player_receive_fields(function(player,formname,fields)
+ 	end
+ end)
+ 
+-minetest.register_chatcommand("rules",{
++minetest.register_chatcommand("reguloj",{
+ 	params = "",
+-	description = "View the rules",
++	description = "Legi la servilregulojn.",
+ 	func = newplayer.showrulesform
+ 	}
+ )
+ 
+-minetest.register_chatcommand("editrules",{
++minetest.register_chatcommand("agordu_naskejon_senrajtan",{
+ 	params = "",
+-	description = "Edit the rules",
+-	privs = {server=true},
+-	func = function(name)
+-		minetest.show_formspec(name,"newplayer:editrules",editformspec1..newplayer.rules..editformspec2)
+-		return true
+-	end}
+-)
+-
+-minetest.register_chatcommand("set_no_interact_spawn",{
+-	params = "",
+-	description = "Set the spawn point for players without interact to your current position",
++	description = "Agordas la naskejon por ludantoj sen la «interact» rajto.",
+ 	privs = {server=true},
+ 	func = function(name)
+ 		local player = minetest.get_player_by_name(name)
+@@ -233,13 +221,13 @@ minetest.register_chatcommand("set_no_interact_spawn",{
+ 		local pos = player:get_pos()
+ 		minetest.setting_set("spawnpoint_no_interact",string.format("%s,%s,%s",pos.x,pos.y,pos.z))
+ 		minetest.setting_save()
+-		return true, newplayer.colorize("#55FF55","Success: ").."Spawn point for players without interact set to: "..newplayer.colorize("#00FFFF",minetest.pos_to_string(pos))
++		return true, newplayer.colorize("#55FF55","Success: ").."Naskejo por senrajtaj ludantoj agordita al: "..newplayer.colorize("#00FFFF",minetest.pos_to_string(pos))
+ 	end}
+ )
+ 
+-minetest.register_chatcommand("set_interact_spawn",{
++minetest.register_chatcommand("agordu_naskejon",{
+ 	params = "",
+-	description = "Set the spawn point for players with interact to your current position",
++	description = "Agordas la naskejon por ludantoj kun la rajto «interact».",
+ 	privs = {server=true},
+ 	func = function(name)
+ 		local player = minetest.get_player_by_name(name)
+@@ -247,64 +235,13 @@ minetest.register_chatcommand("set_interact_spawn",{
+ 		local pos = player:get_pos()
+ 		minetest.setting_set("spawnpoint_interact",string.format("%s,%s,%s",pos.x,pos.y,pos.z))
+ 		minetest.setting_save()
+-		return true, newplayer.colorize("#55FF55","Success: ").."Spawn point for players with interact set to: "..newplayer.colorize("#00FFFF",minetest.pos_to_string(pos))
++		return true, newplayer.colorize("#55FF55","Success: ").."Naskejo por kunrajtaj ludantoj agordita al: "..newplayer.colorize("#00FFFF",minetest.pos_to_string(pos))
+ 	end}
+ )
+ 
+-minetest.register_chatcommand("getkeywords",{
++minetest.register_chatcommand("naskejo",{
+ 	params = "",
+-	description = "Gets the list of keywords used to obtain the interact privilege",
+-	privs = {server=true},
+-	func = function(name)
+-		local out = ""
+-		if #newplayer.keywords > 0 then
+-			out = "Currently configured keywords:"
+-			for _,kw in pairs(newplayer.keywords) do
+-				out = out.."\n"..newplayer.colorize("#00FFFF",kw)
+-			end
+-		else
+-			out = "No keywords are currently set."
+-		end
+-		return true, out
+-	end}
+-)
+-
+-minetest.register_chatcommand("addkeyword",{
+-	params = "<keyword>",
+-	description = "Add a keyword to the list of keywords used to obtain the interact privilege",
+-	privs = {server=true},
+-	func = function(name,param)
+-		if (not param) or param == "" then
+-			return true, newplayer.colorize("#FF0000","ERROR: ").."No keyword supplied"
+-		end
+-		table.insert(newplayer.keywords,param)
+-		newplayer.savekeywords()
+-		return true, string.format("Keyword \"%s\" added",param)
+-	end}
+-)
+-
+-minetest.register_chatcommand("delkeyword",{
+-	params = "<keyword>",
+-	description = "Remove a keyword from the list of keywords used to obtain the interact privilege",
+-	privs = {server=true},
+-	func = function(name,param)
+-		if (not param) or param == "" then
+-			return true, newplayer.colorize("#FF0000","ERROR: ").."No keyword supplied"
+-		end
+-		for k,v in pairs(newplayer.keywords) do
+-			if v == param then
+-				newplayer.keywords[k] = nil
+-				newplayer.savekeywords()
+-				return true, "Keyword "..newplayer.colorize("#00FFFF",param).." removed"
+-			end
+-		end
+-		return true, newplayer.colorize("#FF0000","ERROR: ").."Keyword "..newplayer.colorize("#00FFFF",param).." not found"
+-	end}
+-)
+-
+-minetest.register_chatcommand("spawn",{
+-	params = "",
+-	description = "Teleport to the spawn",
++	description = "Teleportas onin al la naskejo.",
+ 	func = function(name)
+ 		local player = minetest.get_player_by_name(name)
+ 		if not player then return end
+@@ -313,9 +250,9 @@ minetest.register_chatcommand("spawn",{
+ 			local pos = minetest.setting_get_pos("spawnpoint_interact")
+ 			if pos then
+ 				player:set_pos(pos)
+-				return true, "Teleporting to spawn..."
++				return true, "Teleportante al la naskejo…"
+ 			else
+-				return true, newplayer.colorize("#FF0000","ERROR: ").."The spawn point is not set!"
++				return true, newplayer.colorize("#FF0000","Eraro: ").."La naskejo ne estas agordita!"
+ 			end
+ 		else
+ 			local pos = minetest.setting_get_pos("spawnpoint_no_interact")
+@@ -323,7 +260,7 @@ minetest.register_chatcommand("spawn",{
+ 				player:set_pos(pos)
+ 				return true, "Teleporting to spawn..."
+ 			else
+-				return true, newplayer.colorize("#FF0000","ERROR: ").."The spawn point is not set!"
++				return true, newplayer.colorize("#FF0000","Eraro: ").."La naskejo ne estas agordita!"
+ 			end
+ 		end
+ 	end}
+@@ -333,15 +270,15 @@ minetest.register_on_chat_message(function(name, message)
+ 	if minetest.check_player_privs(name,{interact=true}) then
+ 		return
+ 	end
+-	if message:lower():find("rules") then
++	if message:lower():find("reguloj") then
+ 		newplayer.showrulesform(name)
+ 	elseif message:lower():find("help") then
+ 		local fs =      "size[5,3]"..
+-				"label[0,0;In order to build,]"..
+-				"label[0,0.5;you must read and agree to the rules.]"..
+-				"label[0,1;View them now?]"..
+-				"button[0,2;2,1;yes;Yes]"..
+-				"button_exit[3,2;2,1;quit;No]"
++				"label[0,0;Por povi konstrui,]"..
++				"label[0,0.5;vi nepre akceptu la regulojn.]"..
++				"label[0,1;Ĉu vi legos nun?]"..
++				"button[0,2;2,1;yes;Jes]"..
++				"button_exit[3,2;2,1;quit;Ne]"
+ 		minetest.show_formspec(name,"newplayer:help",fs)
+ 	end
+ end)
+-- 
+2.45.2
+
diff -rN -u "old-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/\304\211efvortoj.txt" "new-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/\304\211efvortoj.txt"
--- "old-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/\304\211efvortoj.txt"	1970-01-01 00:00:00.000000000 +0000
+++ "new-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/\304\211efvortoj.txt"	2024-11-21 21:50:35.467408666 +0000
@@ -0,0 +1,5 @@
+return {"kek",
+		"ek", "ek!",
+		"EK", "EK!",
+		"Ek", "Ek!",
+		"eK", "eK!"}
diff -rN -u "old-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/reguloj.txt" "new-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/reguloj.txt"
--- "old-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/reguloj.txt"	1970-01-01 00:00:00.000000000 +0000
+++ "new-gem-xwx-moe/gemujo_ludo/flika\304\265oj/bonvenon/reguloj.txt"	2024-11-21 21:50:35.467408666 +0000
@@ -0,0 +1,35 @@
+~~~ BONVENON AL GEMUJO! [EO] ~~~
+La brilanta Esperantujo ĉe Minetest!
+Ĉi tiu servilo estas sole en la internacia lingvo, Esperanto!
+
+Nia sola regulo estas:
+ • Ne kondutu tro malafable. (Ekz., ne ĉikanu kaj ne minacu aliulojn.)
+
+Ni tamen konsilas ke vi…
+ • … kondutu afable. Strebu esti ĝentila kaj komprenema!
+ • … parolu Esperanton prefere. Tamen, krokodili foje ja enordas!
+ • … ferigu vian koron. Kuraĝon!
+
+Se vi pretas komenci, tajpu «ek»! Ek!
+
+
+~~~ WELCOME TO GEMUJO! [EN] ~~~
+The brilliant land of Esperanto in Minetest!
+This server is purely in the international language, Esperanto!
+
+If you’re unfamiliar with Esperanto, here are some resources:
+ • [Intro] https://esperanto.net
+ • [Course] https://lernu.net/
+ • [Dictionary] https://www.reta-vortaro.de/
+
+Our sole rule is:
+ • Don’t be too rude. (I.e., don’t bully or threaten others.)
+
+We recommend:
+ • … being polite. Try to be kind and understanding!
+ • … trying to speak Esperanto when you can. Asking for help is always OK!
+ • … crossing your fingers. Good luck!
+
+If you’re ready, type, «ek»!
+
+
diff -rN -u old-gem-xwx-moe/gemujo_ludo/minetest.publike.conf new-gem-xwx-moe/gemujo_ludo/minetest.publike.conf
--- old-gem-xwx-moe/gemujo_ludo/minetest.publike.conf	2024-11-21 21:50:35.467408666 +0000
+++ new-gem-xwx-moe/gemujo_ludo/minetest.publike.conf	2024-11-21 21:50:35.467408666 +0000
@@ -3,3 +3,4 @@
 everness_feature_sneak_pickup = false
 everness_feature_skybox = false
 i4_inventory_size = 32
+default_privs = shout
diff -rN -u old-gem-xwx-moe/gemujo_ludo/pretigi.sh new-gem-xwx-moe/gemujo_ludo/pretigi.sh
--- old-gem-xwx-moe/gemujo_ludo/pretigi.sh	2024-11-21 21:50:35.467408666 +0000
+++ new-gem-xwx-moe/gemujo_ludo/pretigi.sh	2024-11-21 21:50:35.467408666 +0000
@@ -102,9 +102,12 @@
 		https://github.com/minetest-mods/carpets       \
 		https://github.com/HybridDog/connected_chests
 
+	mv mods.retaj/servilo/bonvenon mods.retaj/servilo/newplayer
 	git_elshuti_al           \
 		"mods.retaj/servilo" \
-		https://github.com/minetest-mods/irc
+		https://github.com/minetest-mods/irc \
+		https://cheapiesystems.com/git/newplayer
+	mv mods.retaj/servilo/newplayer mods.retaj/servilo/bonvenon
 }
 
 
@@ -135,6 +138,11 @@
 	cd mods.retaj/servilo/irc/irc/
 	git apply ../../../../flikaĵoj/lua-irc/*.patch
 	cd ../../../../
+
+	cp -r flikaĵoj/bonvenon/*.txt mods.retaj/servilo/bonvenon/
+	cd mods.retaj/servilo/bonvenon
+	git apply ../../../flikaĵoj/bonvenon/*.patch
+	cd ../../../
 }