Release v1.01

+ Chinese font download path error fixed.
+ New option to switch between custom fonts
+ Fix missing config.txt for pkgj (no folder found) and removed line for PSM Games
+ New Languages:
 - Yoti/Aleksandr112 for translation in Russian
 - Chronoss09 for translation in French
 - Schn1ek3 for translation in German
 - Kouchan for translation in Japanese
+ Update Spanish by gvaldebenit
+ Update English_us by Gadgetoid

Author: DevDavisNunez

AUTOPLUG2/git/shared.lua

@@ -4,5 +4,5 @@ APP_PROJECT = "AutoPlugin2"
 APP_FOLDER = "AUTOPLUG2"
 
 APP_VERSION_MAJOR = 0x01 -- major.minor
-APP_VERSION_MINOR = 0x00
+APP_VERSION_MINOR = 0x01
 APP_VERSION = ((APP_VERSION_MAJOR << 0x18) | (APP_VERSION_MINOR << 0x10)) -- Union Binary

AUTOPLUG2/resources/plugins/vitacheat.zip

@@ -12,15 +12,15 @@
 	<frame id="frame2">
 		<liveitem>
 			<text valign="bottom" align="left" text-align="left" text-valign="bottom" line-space="3" ellipsis="on">
-				<str color="#ffffff" size="34" bold="on" shadow="on">Autoplugin II</str>
+				<str color="#ffffff" size="34" bold="on" shadow="on">AutoPlugin II</str>
 			</text>
 		</liveitem>
 	</frame>
 
 	<frame id="frame3">
 		<liveitem>
 			<text align="left" text-align="left" word-wrap="off" ellipsis="on">
-				<str size="26" color="#ffffff" shadow="on">v1.00</str>
+				<str size="26" color="#ffffff" shadow="on">v1.01</str>
 			</text>
 		</liveitem>
 	</frame>

AUTOPLUG2/sce_sys/livearea/contents/template.xml

@@ -9,6 +9,7 @@
 	Collaborators: BaltazaR4 & Wzjk.
 ]]
 
+dofile("git/shared.lua")
 PLUGINS_PORT = channel.new("PLUGINS_PORT")
 cont_global = atomic.new(0)
 PLUGINS_PORT:push(cont_global)
@@ -43,33 +44,33 @@ __LANG = ini.read(__PATH_INI,"LANGUAGE","lang","")
 if __LANG == "" then __LANG = os.language() end
 dofile("scripts/language.lua")
 
-if os.access() == 0 then
-	if back then back:blit(0,0) end
-	screen.flip()
-	os.message(LANGUAGE["STRING_UNSAFE_MODE"])
-	os.exit()
-end
-
-dofile("scripts/commons.lua")
-dofile("scripts/scroll.lua")
-
 -- Loading font
 files.mkdir("ux0:data/AUTOPLUGIN2/font/")
+fnt = nil
+__FONT = ini.read(__PATH_INI,"FONT","font","")
+if __FONT != "" then
+	fnt = font.load("ux0:data/AUTOPLUGIN2/font/"..__FONT)
+end
+
 if __LANG == "CHINESE_T" or __LANG == "CHINESE_S" or __LANG == "TURKISH" then
 	if not files.exists("ux0:data/AUTOPLUGIN2/font/font.pgf") then
 		message_wait(CHINESE_FONT_DOWNLOAD)
 		http.getfile(string.format("https://raw.githubusercontent.com/%s/%s/master/font/font.pgf", APP_REPO, APP_PROJECT), "ux0:data/AUTOPLUGIN2/font/font.pgf")
 	end
+	if not fnt then fnt, __FONT = font.load("ux0:data/AUTOPLUGIN2/font/font.pgf"), "font.pgf" end
 end
+if fnt then font.setdefault(fnt) end
 
-fnt = font.load("ux0:data/AUTOPLUGIN2/font/font.pgf") or font.load("ux0:data/AUTOPLUGIN2/font/font.pvf") or font.load("ux0:data/AUTOPLUGIN2/font/font.ttf")
-if fnt then	font.setdefault(fnt) end
-
---Updater
-if not game.exists("AUTOPLUG2") then
-	dofile("git/updater.lua")
+if os.access() == 0 then
+	if back then back:blit(0,0) end
+	screen.flip()
+	os.message(LANGUAGE["STRING_UNSAFE_MODE"])
+	os.exit()
 end
 
+dofile("scripts/commons.lua")
+dofile("scripts/scroll.lua")
+
 __UPDATE = tonumber(ini.read(__PATH_INI,"UPDATE","update","1"))
 _update = LANGUAGE["NO"]
 if __UPDATE == 1 then

AUTOPLUG2/sce_sys/param.sfo

@@ -53,9 +53,35 @@ function onAppInstall(step, size_argv, written, file, totalsize, totalwritten)
 	screen.flip()
 end
 
+function onExtractFiles(size,written,file,totalsize,totalwritten)
+
+	if back then back:blit(0,0) end
+	draw.fillrect(0,0,960,40, color.blue:a(100))
+
+	if written != 0 then
+		l = (written*940)/size
+			screen.print(3+l,495,math.floor((written*100)/size).."%",0.8,0xFFFFFFFF,0x0,__ACENTER)
+				draw.fillrect(10,524,l,6,color.new(0,255,0))
+					draw.circle(10+l,526,6,color.new(0,255,0),30)
+	end
+
+	if totalwritten != 0 then
+		screen.print(940,10,LANGUAGE["UPDATER_PERCENT"]..math.floor((totalwritten*100)/totalsize).." %",1.0,color.white, color.blue:a(135),__ARIGHT)
+	end
+	screen.print(10,10,tostring(file),1.0,color.white, color.blue:a(135))
+
+	message_wait(LANGUAGE["STRING_PLEASE_WAIT"],true)
+
+	screen.flip()
+	
+	buttons.read()
+	return 1
+end
+
 function write_config()
 	ini.write(__PATH_INI,"UPDATE","update",__UPDATE)
 	ini.write(__PATH_INI,"LANGUAGE","lang",__LANG)
+	ini.write(__PATH_INI,"FONT","font",__FONT)
 end
 
 function draw.offsetgradrect(x,y,sx,sy,c1,c2,c3,c4,offset)
@@ -64,7 +90,7 @@ function draw.offsetgradrect(x,y,sx,sy,c1,c2,c3,c4,offset)
 			draw.gradrect(x,y + sizey - offset,sx,sizey + offset,c3,c4,c1,c2)
 end
 
-function message_wait(message)
+function message_wait(message,noflip)
 	local mge = (message or LANGUAGE["STRING_PLEASE_WAIT"])
 	local titlew = string.format(mge)
 	local w,h = screen.textwidth(titlew,1) + 30,70
@@ -73,7 +99,11 @@ function message_wait(message)
 	draw.fillrect(x,y,w,h, color.shine)
 	draw.rect(x,y,w,h,color.white)
 		screen.print(480,y+15, titlew,1,color.white,color.black,__ACENTER)
-	screen.flip()
+		
+	if not noflip then
+		screen.flip()
+	end
+
 end
 
 --Variables Universales

AUTOPLUG2/script.lua

@@ -140,11 +140,14 @@ function menu_extras()
 	tai.load()
 	if tai[__UR0].exist then loc = 2 end
 	local menu = {
-		{ text = LANGUAGE["MENU_EXTRAS_PKGJ_TITLE"],		desc = LANGUAGE["MENU_EXTRAS_CUSTOM_PKG_CONFIG_DESC"],	funct = config_callback },
 		{ text = LANGUAGE["MENU_EXTRAS_INSTALL_ITLSENSO"],	desc = LANGUAGE["MENU_EXTRAS_INSTALL_ITLSENSO_DESC"],	funct = itls_callback },
 		{ text = LANGUAGE["MENU_EXTRAS_INSTALL_BATTFIX"],	desc = LANGUAGE["MENU_EXTRAS_INSTALL_DESC_BATTFIX"],	funct = batteryfixer_callback },
 	}
 
+	if game.exists("PKGJ00000") then
+		table.insert(menu, 1, { text = LANGUAGE["MENU_EXTRAS_PKGJ_TITLE"],		desc = LANGUAGE["MENU_EXTRAS_CUSTOM_PKG_CONFIG_DESC"],	funct = config_callback } )
+	end
+
 	local idx = tai.find(loc, "KERNEL", "custom_boot_splash.skprx")
 	if idx then
 		table.insert(menu, { text = LANGUAGE["MENU_EXTRAS_CONVERT_BOOTSPLASH"],	desc = LANGUAGE["MENU_EXTRAS_CUSTOMBOOTSPLASH_DESC"],	funct = convertimgsplash_callback } )

AUTOPLUG2/scripts/commons.lua

@@ -17,19 +17,17 @@ function update_configtxt(path, tb_config, options)
 	--Update Line install_psp_psx_location
 	if line_find_install_location > 0 then tb_config[line_find_install_location] = "install_psp_psx_location "..options[2].status end
 
-	--Remove lines for install_psp_as_pbp & psm_disclaimer_yes_i_read_the_readme ??
-	if line_find_install_as_pbp > line_find_add_psm then
-		if options[1].status == false then table.remove(tb_config,line_find_install_as_pbp) end
-		if options[3].status == false then table.remove(tb_config,line_find_add_psm) end
-	elseif line_find_install_as_pbp < line_find_add_psm then
-		if options[3].status == false then table.remove(tb_config,line_find_add_psm) end
-		if options[1].status == false then table.remove(tb_config,line_find_install_as_pbp) end
+	--Remove lines for psm_disclaimer_yes_i_read_the_readme
+	if line_find_add_psm > 0 then
+		table.remove(tb_config,line_find_add_psm)
 	end
 
+	--Remove lines for install_psp_as_pbp
+	if options[1].status == false then table.remove(tb_config,line_find_install_as_pbp) end
+
 	--Insert new lines
 	if line_find_install_location == 0 then table.insert(tb_config, "install_psp_psx_location "..options[2].status) end
 	if line_find_install_as_pbp == 0 and options[1].status == true then	table.insert(tb_config, "install_psp_as_pbp 1") end
-	if line_find_add_psm == 0 and options[3].status == true then table.insert(tb_config, "psm_disclaimer_yes_i_read_the_readme NoPsmDrm") end
 
 	--Update config.txt
 	local fp = io.open(path, "w+")
@@ -42,15 +40,8 @@ end
 
 function read_config(file, tb_config)
 
-	if not files.exists(file) then
-		if files.exists("ux0:pkgi/config.txt") then
-			file = "ux0:pkgi/config.txt"
-		else
-			files.new("ux0:pkgj/config.txt")
-			file = "ux0:pkgj/config.txt"
-			--return nil
-		end
-	end
+	files.mkdir(files.nofile(file))
+	if not files.exists(file) then files.new(file)	end
 
 	local cont = 0
 	for line in io.lines(file) do
@@ -90,18 +81,20 @@ local psp_psx_location_callback = function (obj)
 
 end
 
-local add_psm_callback = function (obj)
-	obj.status = not obj.status
-end
-
 function config_pkgj()
 
 	--Clean
 	line_find_install_as_pbp, line_find_install_location, line_find_add_psm = 0,0,0
 	mount_install = "ux0:"
 	local tb_config = {}
 
-	local check_config = read_config("ux0:pkgj/config.txt", tb_config)
+	local path_configtxt = "ux0:pkgj/config.txt"
+	if files.exists("ur0:pkgj/config.txt") then path_configtxt = "ur0:pkgj/config.txt"
+	elseif files.exists("ux0:pkgj/config.txt") then path_configtxt = "ux0:pkgj/config.txt"
+	elseif files.exists("ur0:pkgi/config.txt") then path_configtxt = "ur0:pkgi/config.txt"
+	elseif files.exists("ux0:pkgi/config.txt") then path_configtxt = "ux0:pkgi/config.txt" end
+
+	local check_config = read_config(path_configtxt, tb_config)
 	if not check_config then
 		if vbuff then vbuff:blit(0,0) elseif back2 then back2:blit(0,0) end
 		message_wait(LANGUAGE["NO_CONFIG_PKGJ"])
@@ -117,14 +110,12 @@ function config_pkgj()
 	local menuext = {
 		{ text = LANGUAGE["PKGJ_TITLE_INSTALL_PBP"],	desc = LANGUAGE["PKGJ_DESC_INSTALL_PBP"],	status = false,		funct = psp_eboot_callback },
 		{ text = LANGUAGE["PKGJ_TITLE_CHANGE_LOC"],		desc = LANGUAGE["PKGJ_DESC_CHANGE_LOC"],	status = "ux0:",	funct = psp_psx_location_callback },
-		{ text = LANGUAGE["PKGJ_TITLE_ADD_PSM"],		desc = LANGUAGE["PKGJ_DESC_ADD_PSM"],		status = false,		funct = add_psm_callback },
 	}
 
 	--UPdate Status
 	if line_find_install_as_pbp > 0 then menuext[1].status = true end
 	if pmount == 0 then menuext[2].pmount = 1 else menuext[2].pmount = pmount end
 	menuext[2].status = PMounts[menuext[2].pmount]
-	if line_find_add_psm > 0 then	menuext[3].status = true end
 
 	local scroll,xscroll = newScroll(menuext,#menuext),5
 	while true do
@@ -141,7 +132,6 @@ function config_pkgj()
 
 			if i == scroll.sel then draw.offsetgradrect(3,y-10,952,38,color.shine:a(75),color.shine:a(135),0x0,0x0,21) end
 
-			--if i == scroll.sel then draw.fillrect(3,y-4,952,26,color.green:a(105)) end
 			screen.print(25,y, menuext[i].text)
 
 			if menuext[i].status == true then
@@ -155,6 +145,8 @@ function config_pkgj()
 			y+=35
 		end
 
+		screen.print(480, 360, path_configtxt,1.2,color.green,0x0,__ACENTER)
+
 		if screen.textwidth(menuext[scroll.sel].desc) > 925 then
 			xscroll = screen.print(xscroll, 400, menuext[scroll.sel].desc,1,color.white,color.blue,__SLEFT,935)
 		else
@@ -200,8 +192,6 @@ function config_pkgj()
 
 			if buttons.triangle then
 
-				--local vbuff = screen.toimage()
-				--if vbuff then vbuff:blit(0,0) elseif back2 then back2:blit(0,0) end
 				if back2 then back2:blit(0,0) end
 					message_wait(LANGUAGE["PKGJ_UPDATING"])
 				os.delay(1500)

AUTOPLUG2/scripts/extras/menu_extras.lua

@@ -46,6 +46,10 @@ function plugins_installation(sel)
 						install = false
 					end
 				end
+			elseif plugins[sel].path:find(string.lower("repatch"),1,true) then
+				tai.del(loc, "KERNEL", "repatch.skprx")
+				tai.del(loc, "KERNEL", "repatch_4.skprx")
+
 			elseif plugins[sel].path == "vitastick.skprx" and not game.exists("VITASTICK") then
 				__file = "vitastick.vpk"
 				game.install("resources/plugins/vitastick.vpk",false)
@@ -212,6 +216,7 @@ function plugins_installation(sel)
 					if henkaku then img2splashbin(henkaku,false) end
 
 				elseif plugins[sel].path == "vitacheat.skprx" then		--Vitacheat 3.65
+
 					files.extract("resources/plugins/vitacheat.zip","ux0:")
 					files.copy("resources/plugins/vitacheat365/vitacheat.suprx","ux0:vitacheat/")