external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Adventure] Support for localization

Browse Source 
-refactor some codes for localization
This commit is contained in:
Anthony Calosa
2022-03-06 12:23:33 +08:00
parent 0933034f98
commit d4be53c72f
113 changed files with 11780 additions and 1977 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
forge-gui-android/assets/fallback_skin/MiKrollFantasy(2).fnt
View File

@@ -1,102 +0,0 @@
info face="MiKrollFantasy(2)" size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=2 padding=1,1,1,1 spacing=0,0
common lineHeight=14 base=10 scaleW=506 scaleH=18 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
page id=0 file="MiKrollFantasy(2).png"
chars count=97
char id=0 x=2 y=2 width=5 height=11 xoffset=-1 yoffset=-1 xadvance=6 page=0 chnl=0
char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=-1 xadvance=5 page=0 chnl=0
char id=33 x=178 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=34 x=5 y=15 width=3 height=2 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=35 x=384 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=36 x=81 y=2 width=4 height=6 xoffset=-1 yoffset=5 xadvance=5 page=0 chnl=0
char id=37 x=476 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=38 x=391 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=39 x=10 y=15 width=1 height=2 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=40 x=24 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=41 x=28 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=42 x=482 y=2 width=3 height=3 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=43 x=487 y=2 width=3 height=3 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=44 x=504 y=2 width=1 height=2 xoffset=-1 yoffset=9 xadvance=2 page=0 chnl=0
char id=45 x=25 y=15 width=2 height=1 xoffset=-1 yoffset=7 xadvance=3 page=0 chnl=0
char id=46 x=22 y=15 width=1 height=1 xoffset=-1 yoffset=9 xadvance=2 page=0 chnl=0
char id=47 x=50 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=48 x=187 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=49 x=242 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=50 x=236 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=51 x=230 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=52 x=223 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=53 x=217 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=54 x=211 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=55 x=205 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=56 x=199 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=57 x=193 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=58 x=137 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=59 x=21 y=2 width=1 height=7 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=60 x=377 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=61 x=492 y=2 width=3 height=3 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=62 x=369 y=2 width=6 height=5 xoffset=-1 yoffset=5 xadvance=7 page=0 chnl=0
char id=63 x=165 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=64 x=55 y=2 width=7 height=7 xoffset=-1 yoffset=3 xadvance=8 page=0 chnl=0
char id=65 x=69 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=66 x=75 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=67 x=90 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=68 x=96 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=69 x=102 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=70 x=108 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=71 x=114 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=72 x=120 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=73 x=126 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=74 x=131 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=75 x=140 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=76 x=146 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=77 x=152 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=78 x=159 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=79 x=171 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=80 x=181 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=81 x=14 y=2 width=5 height=7 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=82 x=247 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=83 x=259 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=84 x=265 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=85 x=272 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=86 x=278 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=87 x=289 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=88 x=296 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=89 x=315 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=90 x=322 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=91 x=32 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=92 x=64 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=93 x=36 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=94 x=0 y=15 width=3 height=2 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=95 x=16 y=15 width=4 height=1 xoffset=-1 yoffset=9 xadvance=5 page=0 chnl=0
char id=96 x=13 y=15 width=1 height=2 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=97 x=459 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=98 x=328 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=99 x=471 y=2 width=3 height=4 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=100 x=343 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=101 x=398 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=102 x=364 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=103 x=358 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=104 x=352 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=105 x=349 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=106 x=9 y=2 width=3 height=8 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=107 x=337 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=108 x=334 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=109 x=404 y=2 width=5 height=4 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=110 x=411 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=111 x=417 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=112 x=309 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=113 x=303 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=114 x=423 y=2 width=3 height=4 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=115 x=428 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=116 x=285 y=2 width=2 height=6 xoffset=-1 yoffset=4 xadvance=3 page=0 chnl=0
char id=117 x=434 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=118 x=440 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=119 x=446 y=2 width=5 height=4 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=120 x=453 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=121 x=253 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=122 x=465 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=123 x=40 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=124 x=87 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=125 x=45 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=126 x=497 y=2 width=5 height=3 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=160 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=10 xadvance=5 page=0 chnl=0
kernings count=0

BIN
forge-gui-android/assets/fallback_skin/MiKrollFantasy(2).png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

102
forge-gui-android/assets/fallback_skin/MiKrollFantasy(3).fnt
View File

@@ -1,102 +0,0 @@
info face="MiKrollFantasy(3)" size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=2 padding=1,1,1,1 spacing=0,0
common lineHeight=28 base=21 scaleW=506 scaleH=39 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
page id=0 file="MiKrollFantasy(3).png"
chars count=97
char id=0 x=2 y=2 width=9 height=22 xoffset=0 yoffset=-1 xadvance=12 page=0 chnl=0
char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=-1 xadvance=10 page=0 chnl=0
char id=33 x=289 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=34 x=332 y=26 width=6 height=4 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=35 x=124 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=36 x=129 y=2 width=8 height=12 xoffset=-1 yoffset=11 xadvance=10 page=0 chnl=0
char id=37 x=278 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=38 x=136 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=39 x=344 y=26 width=2 height=4 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=40 x=37 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=41 x=43 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=42 x=288 y=26 width=6 height=6 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=43 x=296 y=26 width=6 height=6 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=44 x=340 y=26 width=2 height=4 xoffset=-1 yoffset=19 xadvance=4 page=0 chnl=0
char id=45 x=366 y=26 width=4 height=2 xoffset=-1 yoffset=15 xadvance=6 page=0 chnl=0
char id=46 x=362 y=26 width=2 height=2 xoffset=-1 yoffset=19 xadvance=4 page=0 chnl=0
char id=47 x=77 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=48 x=303 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=49 x=395 y=2 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=50 x=385 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=51 x=375 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=52 x=363 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=53 x=353 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=54 x=343 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=55 x=333 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=56 x=323 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=57 x=313 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=58 x=221 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=59 x=33 y=2 width=2 height=14 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=60 x=112 y=26 width=10 height=10 xoffset=-1 yoffset=11 xadvance=12 page=0 chnl=0
char id=61 x=304 y=26 width=6 height=6 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=62 x=98 y=26 width=12 height=10 xoffset=-1 yoffset=11 xadvance=14 page=0 chnl=0
char id=63 x=267 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=64 x=85 y=2 width=14 height=14 xoffset=-1 yoffset=7 xadvance=16 page=0 chnl=0
char id=65 x=109 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=66 x=119 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=67 x=143 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=68 x=153 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=69 x=163 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=70 x=173 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=71 x=183 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=72 x=193 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=73 x=203 y=2 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=74 x=211 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=75 x=225 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=76 x=235 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=77 x=245 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=78 x=257 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=79 x=277 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=80 x=293 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=81 x=21 y=2 width=10 height=14 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=82 x=403 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=83 x=423 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=84 x=433 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=85 x=445 y=2 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=86 x=455 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=87 x=473 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=88 x=485 y=2 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=89 x=10 y=26 width=10 height=12 xoffset=-1 yoffset=9 xadvance=12 page=0 chnl=0
char id=90 x=22 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=91 x=49 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=92 x=101 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=93 x=55 y=2 width=4 height=14 xoffset=-1 yoffset=7 xadvance=6 page=0 chnl=0
char id=94 x=324 y=26 width=6 height=4 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=95 x=352 y=26 width=8 height=2 xoffset=-1 yoffset=19 xadvance=10 page=0 chnl=0
char id=96 x=348 y=26 width=2 height=4 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=97 x=250 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=98 x=32 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=99 x=270 y=26 width=6 height=8 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=100 x=56 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=101 x=148 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=102 x=90 y=26 width=6 height=12 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=103 x=80 y=26 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=104 x=70 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=105 x=66 y=26 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=106 x=13 y=2 width=6 height=16 xoffset=-1 yoffset=9 xadvance=8 page=0 chnl=0
char id=107 x=46 y=26 width=8 height=12 xoffset=-1 yoffset=9 xadvance=10 page=0 chnl=0
char id=108 x=42 y=26 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=109 x=158 y=26 width=10 height=8 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=110 x=170 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=111 x=180 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=112 x=0 y=26 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=113 x=497 y=2 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=114 x=190 y=26 width=6 height=8 xoffset=-1 yoffset=13 xadvance=8 page=0 chnl=0
char id=115 x=198 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=116 x=467 y=2 width=4 height=12 xoffset=-1 yoffset=9 xadvance=6 page=0 chnl=0
char id=117 x=208 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=118 x=218 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=119 x=228 y=26 width=10 height=8 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=120 x=240 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=121 x=413 y=2 width=8 height=12 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=122 x=260 y=26 width=8 height=8 xoffset=-1 yoffset=13 xadvance=10 page=0 chnl=0
char id=123 x=61 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=124 x=139 y=2 width=2 height=12 xoffset=-1 yoffset=9 xadvance=4 page=0 chnl=0
char id=125 x=69 y=2 width=6 height=14 xoffset=-1 yoffset=7 xadvance=8 page=0 chnl=0
char id=126 x=312 y=26 width=10 height=6 xoffset=-1 yoffset=13 xadvance=12 page=0 chnl=0
char id=160 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=21 xadvance=10 page=0 chnl=0
kernings count=0

BIN
forge-gui-android/assets/fallback_skin/MiKrollFantasy(3).png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

102
forge-gui-android/assets/fallback_skin/MiKrollFantasy.fnt
View File

@@ -1,102 +0,0 @@
info face="MiKrollFantasy" size=12 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=2 padding=1,1,1,1 spacing=0,0
common lineHeight=14 base=10 scaleW=506 scaleH=18 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
page id=0 file="MiKrollFantasy.png"
chars count=97
char id=0 x=2 y=2 width=5 height=11 xoffset=-1 yoffset=-1 xadvance=6 page=0 chnl=0
char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=-1 xadvance=5 page=0 chnl=0
char id=33 x=178 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=34 x=5 y=15 width=3 height=2 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=35 x=384 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=36 x=81 y=2 width=4 height=6 xoffset=-1 yoffset=5 xadvance=5 page=0 chnl=0
char id=37 x=476 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=38 x=391 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=39 x=10 y=15 width=1 height=2 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=40 x=24 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=41 x=28 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=42 x=482 y=2 width=3 height=3 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=43 x=487 y=2 width=3 height=3 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=44 x=504 y=2 width=1 height=2 xoffset=-1 yoffset=9 xadvance=2 page=0 chnl=0
char id=45 x=25 y=15 width=2 height=1 xoffset=-1 yoffset=7 xadvance=3 page=0 chnl=0
char id=46 x=22 y=15 width=1 height=1 xoffset=-1 yoffset=9 xadvance=2 page=0 chnl=0
char id=47 x=50 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=48 x=187 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=49 x=242 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=50 x=236 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=51 x=230 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=52 x=223 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=53 x=217 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=54 x=211 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=55 x=205 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=56 x=199 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=57 x=193 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=58 x=137 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=59 x=21 y=2 width=1 height=7 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=60 x=377 y=2 width=5 height=5 xoffset=-1 yoffset=5 xadvance=6 page=0 chnl=0
char id=61 x=492 y=2 width=3 height=3 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=62 x=369 y=2 width=6 height=5 xoffset=-1 yoffset=5 xadvance=7 page=0 chnl=0
char id=63 x=165 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=64 x=55 y=2 width=7 height=7 xoffset=-1 yoffset=3 xadvance=8 page=0 chnl=0
char id=65 x=69 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=66 x=75 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=67 x=90 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=68 x=96 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=69 x=102 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=70 x=108 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=71 x=114 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=72 x=120 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=73 x=126 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=74 x=131 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=75 x=140 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=76 x=146 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=77 x=152 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=78 x=159 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=79 x=171 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=80 x=181 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=81 x=14 y=2 width=5 height=7 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=82 x=247 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=83 x=259 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=84 x=265 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=85 x=272 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=86 x=278 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=87 x=289 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=88 x=296 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=89 x=315 y=2 width=5 height=6 xoffset=-1 yoffset=4 xadvance=6 page=0 chnl=0
char id=90 x=322 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=91 x=32 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=92 x=64 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=93 x=36 y=2 width=2 height=7 xoffset=-1 yoffset=3 xadvance=3 page=0 chnl=0
char id=94 x=0 y=15 width=3 height=2 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=95 x=16 y=15 width=4 height=1 xoffset=-1 yoffset=9 xadvance=5 page=0 chnl=0
char id=96 x=13 y=15 width=1 height=2 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=97 x=459 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=98 x=328 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=99 x=471 y=2 width=3 height=4 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=100 x=343 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=101 x=398 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=102 x=364 y=2 width=3 height=6 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=103 x=358 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=104 x=352 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=105 x=349 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=106 x=9 y=2 width=3 height=8 xoffset=-1 yoffset=4 xadvance=4 page=0 chnl=0
char id=107 x=337 y=2 width=4 height=6 xoffset=-1 yoffset=4 xadvance=5 page=0 chnl=0
char id=108 x=334 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=109 x=404 y=2 width=5 height=4 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=110 x=411 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=111 x=417 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=112 x=309 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=113 x=303 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=114 x=423 y=2 width=3 height=4 xoffset=-1 yoffset=6 xadvance=4 page=0 chnl=0
char id=115 x=428 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=116 x=285 y=2 width=2 height=6 xoffset=-1 yoffset=4 xadvance=3 page=0 chnl=0
char id=117 x=434 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=118 x=440 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=119 x=446 y=2 width=5 height=4 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=120 x=453 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=121 x=253 y=2 width=4 height=6 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=122 x=465 y=2 width=4 height=4 xoffset=-1 yoffset=6 xadvance=5 page=0 chnl=0
char id=123 x=40 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=124 x=87 y=2 width=1 height=6 xoffset=-1 yoffset=4 xadvance=2 page=0 chnl=0
char id=125 x=45 y=2 width=3 height=7 xoffset=-1 yoffset=3 xadvance=4 page=0 chnl=0
char id=126 x=497 y=2 width=5 height=3 xoffset=-1 yoffset=6 xadvance=6 page=0 chnl=0
char id=160 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=10 xadvance=5 page=0 chnl=0
kernings count=0

BIN
forge-gui-android/assets/fallback_skin/MiKrollFantasy.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
forge-gui-android/assets/fallback_skin/MiKrollFantasy.ttf
View File

Binary file not shown.

49
forge-gui-mobile/src/forge/Forge.java
View File

@@ -79,7 +79,7 @@ public class Forge implements ApplicationListener {
protected static TransitionScreen transitionScreen;
public static KeyInputAdapter keyInputAdapter;
private static boolean exited;
public static boolean safeToClose = false;
public static boolean safeToClose = true;
public static boolean magnify = false;
public static boolean magnifyToggle = true;
public static boolean magnifyShowDetails = false;
@@ -118,6 +118,7 @@ public class Forge implements ApplicationListener {
public static InputProcessor inputProcessor;
private static Cursor cursor0, cursor1, cursor2, cursorA0, cursorA1, cursorA2;
public static boolean forcedEnglishonCJKMissing = false;
private static Localizer localizer;
public static ApplicationListener getApp(Clipboard clipboard0, IDeviceAdapter deviceAdapter0, String assetDir0, boolean value, boolean androidOrientation, int totalRAM, boolean isTablet, int AndroidAPI, String AndroidRelease, String deviceName) {
app = new Forge();
@@ -139,6 +140,11 @@ public class Forge implements ApplicationListener {
private Forge() {
}
public static Localizer getLocalizer() {
if (localizer == null)
localizer = Localizer.getInstance();
return localizer;
}
@Override
public void create() {
//install our error handler
@@ -201,7 +207,6 @@ public class Forge implements ApplicationListener {
}
//init cache
ImageCache.initCache(cacheSize);
final Localizer localizer = Localizer.getInstance();
//load model on background thread (using progress bar to report progress)
FThreads.invokeInBackgroundThread(new Runnable() {
@@ -209,32 +214,30 @@ public class Forge implements ApplicationListener {
public void run() {
//see if app or assets need updating
AssetsDownloader.checkForUpdates(splashScreen);
if (exited) {
return;
} //don't continue if user chose to exit or couldn't download required assets
safeToClose = false;
ImageKeys.setIsLibGDXPort(GuiBase.getInterface().isLibgdxPort());
FModel.initialize(splashScreen.getProgressBar(), null);
splashScreen.getProgressBar().setDescription(localizer.getMessage("lblLoadingFonts"));
splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblLoadingFonts"));
FSkinFont.preloadAll(locale);
splashScreen.getProgressBar().setDescription(localizer.getMessage("lblLoadingCardTranslations"));
splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblLoadingCardTranslations"));
CardTranslation.preloadTranslation(locale, ForgeConstants.LANG_DIR);
splashScreen.getProgressBar().setDescription(localizer.getMessage("lblFinishingStartup"));
splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup"));
//add reminder to preload
if (enablePreloadExtendedArt) {
if (autoCache)
splashScreen.getProgressBar().setDescription(localizer.getMessage("lblPreloadExtendedArt") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblPreloadExtendedArt") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
else
splashScreen.getProgressBar().setDescription(localizer.getMessage("lblPreloadExtendedArt"));
splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblPreloadExtendedArt"));
} else {
if (autoCache)
splashScreen.getProgressBar().setDescription(localizer.getMessage("lblFinishingStartup") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
else
splashScreen.getProgressBar().setDescription(localizer.getMessage("lblFinishingStartup"));
splashScreen.getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup"));
}
Gdx.app.postRunnable(new Runnable() {
@@ -300,7 +303,7 @@ public class Forge implements ApplicationListener {
public static void openHomeDefault() {
//default to English only if CJK is missing
Localizer.getInstance().setEnglish(Forge.forcedEnglishonCJKMissing);
getLocalizer().setEnglish(Forge.forcedEnglishonCJKMissing);
GuiBase.setIsAdventureMode(false);
openHomeScreen(-1, null); //default for startup
isMobileAdventureMode = false;
@@ -312,7 +315,7 @@ public class Forge implements ApplicationListener {
public static void openAdventure() {
//default to english since it doesn't have CJK fonts, it will be updated on Forgescene enter/exit
Localizer.getInstance().setEnglish(true);
getLocalizer().setEnglish(forcedEnglishonCJKMissing);
//continuous rendering is needed for adventure mode
startContinuousRendering();
GuiBase.setIsAdventureMode(true);
@@ -511,7 +514,7 @@ public class Forge implements ApplicationListener {
public static void setForcedEnglishonCJKMissing() {
if (!forcedEnglishonCJKMissing) {
forcedEnglishonCJKMissing = true;
Localizer.getInstance().setEnglish(true);
getLocalizer().setEnglish(forcedEnglishonCJKMissing);
System.err.println("Forge switches to English due to an error generating CJK Fonts. Language: "+Forge.locale);
}
}
@@ -593,14 +596,13 @@ public class Forge implements ApplicationListener {
}
};
final Localizer localizer = Localizer.getInstance();
if (silent) {
callback.run(true);
} else {
FOptionPane.showConfirmDialog(
localizer.getMessage("lblAreYouSureYouWishRestartForge"), localizer.getMessage("lblRestartForge"),
localizer.getMessage("lblRestart"), localizer.getMessage("lblCancel"), callback);
getLocalizer().getMessage("lblAreYouSureYouWishRestartForge"), getLocalizer().getMessage("lblRestartForge"),
getLocalizer().getMessage("lblRestart"), getLocalizer().getMessage("lblCancel"), callback);
}
}
@@ -609,11 +611,10 @@ public class Forge implements ApplicationListener {
return;
} //don't allow exiting multiple times
final Localizer localizer = Localizer.getInstance();
final List<String> options = new ArrayList<>();
options.add(localizer.getMessage("lblExit"));
options.add(localizer.getMessage("lblAdventure"));
options.add(localizer.getMessage("lblCancel"));
options.add(getLocalizer().getMessage("lblExit"));
options.add(getLocalizer().getMessage("lblAdventure"));
options.add(getLocalizer().getMessage("lblCancel"));
Callback<Integer> callback = new Callback<Integer>() {
@Override
@@ -630,7 +631,7 @@ public class Forge implements ApplicationListener {
if (silent) {
callback.run(0);
} else {
FOptionPane.showOptionDialog(localizer.getMessage("lblAreYouSureYouWishExitForge"), "",
FOptionPane.showOptionDialog(getLocalizer().getMessage("lblAreYouSureYouWishExitForge"), "",
FOptionPane.QUESTION_ICON, options, 0, callback);
}
}
@@ -1012,7 +1013,7 @@ public class Forge implements ApplicationListener {
return true;
}
static void exitAnimation(boolean restart) {
public static void exitAnimation(boolean restart) {
if (transitionScreen != null)
return; //finish transition incase exit is touched
if (closingScreen == null) {

61
forge-gui-mobile/src/forge/adventure/scene/AdventureDeckEditor.java
View File

@@ -89,10 +89,10 @@ import java.util.Map;
}
}
private static DeckEditorPage[] getPages() {
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
return new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, localizer.getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, Forge.getLocalizer().getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.QUEST_DECK_EDITOR),
new DeckSectionPage(DeckSection.Sideboard, ItemManagerConfig.QUEST_DECK_EDITOR)
};
@@ -149,9 +149,9 @@ import java.util.Map;
FPopupMenu menu = new FPopupMenu() {
@Override
protected void buildMenu() {
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
addItem(new FMenuItem(localizer.getMessage("btnCopyToClipboard"), Forge.hdbuttons ? FSkinImage.HDEXPORT : FSkinImage.BLANK, new FEvent.FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("btnCopyToClipboard"), Forge.hdbuttons ? FSkinImage.HDEXPORT : FSkinImage.BLANK, new FEvent.FEventHandler() {
@Override
public void handleEvent(FEvent e1) {
FDeckViewer.copyDeckToClipboard(getDeck());
@@ -431,20 +431,20 @@ import java.util.Map;
if (max == 1) {
callback.run(max);
} else {
final Localizer localizer = Localizer.getInstance();
GuiChoose.getInteger(cardManager.getSelectedItem() + " - " + verb + " " + localizer.getMessage("lblHowMany"), 1, max, 20, callback);
final Localizer localizer = Forge.getLocalizer().getInstance();
GuiChoose.getInteger(cardManager.getSelectedItem() + " - " + verb + " " + Forge.getLocalizer().getMessage("lblHowMany"), 1, max, 20, callback);
}
}
}));
}
protected void addCommanderItems(final FDropDownMenu menu, final PaperCard card, boolean isAddMenu, boolean isAddSource) {
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
if (parentScreen.getCommanderPage() == null) {
return;
}
boolean isLegalCommander;
String captionSuffix = localizer.getMessage("lblCommander");
String captionSuffix = Forge.getLocalizer().getMessage("lblCommander");
isLegalCommander = DeckFormat.Commander.isLegalCommander(card.getRules());
if (isLegalCommander && !parentScreen.getCommanderPage().cardManager.getPool().contains(card)) {
addItem(menu, "Set", "as " + captionSuffix, parentScreen.getCommanderPage().getIcon(), isAddMenu, isAddSource, new Callback<Integer>() {
@@ -578,8 +578,8 @@ import java.util.Map;
}
protected String getItemManagerCaption() {
final Localizer localizer = Localizer.getInstance();
return localizer.getMessage("lblCards");
final Localizer localizer = Forge.getLocalizer().getInstance();
return Forge.getLocalizer().getMessage("lblCards");
}
@Override
@@ -598,7 +598,7 @@ import java.util.Map;
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoading"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getInstance().getMessage("lblLoading"), new Runnable() {
@Override
public void run() {
final ItemPool<PaperCard> adventurePool = new ItemPool<>(PaperCard.class);
@@ -635,10 +635,10 @@ import java.util.Map;
@Override
protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
if (!needsCommander() && !canOnlyBePartnerCommander(card)) {
addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lblTo") + " " + parentScreen.getMainDeckPage().cardManager.getCaption(), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lblTo") + " " + parentScreen.getMainDeckPage().cardManager.getCaption(), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -650,7 +650,7 @@ import java.util.Map;
}
});
if (parentScreen.getSideboardPage() != null) {
addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -686,8 +686,8 @@ import java.util.Map;
@Override
protected void buildDeckMenu(FPopupMenu menu) {
if (cardManager.getConfig().getShowUniqueCardsOption()) {
final Localizer localizer = Localizer.getInstance();
menu.addItem(new FCheckBoxMenuItem(localizer.getMessage("lblUniqueCardsOnly"), cardManager.getWantUnique(), new FEvent.FEventHandler() {
final Localizer localizer = Forge.getLocalizer().getInstance();
menu.addItem(new FCheckBoxMenuItem(Forge.getLocalizer().getMessage("lblUniqueCardsOnly"), cardManager.getWantUnique(), new FEvent.FEventHandler() {
@Override
public void handleEvent(FEvent e) {
boolean wantUnique = !cardManager.getWantUnique();
@@ -707,24 +707,24 @@ import java.util.Map;
protected DeckSectionPage(DeckSection deckSection0, ItemManagerConfig config) {
super(config, null, null);
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
deckSection = deckSection0;
switch (deckSection) {
default:
case Main:
captionPrefix = localizer.getMessage("lblMain");
cardManager.setCaption(localizer.getMessage("ttMain"));
captionPrefix = Forge.getLocalizer().getMessage("lblMain");
cardManager.setCaption(Forge.getLocalizer().getMessage("ttMain"));
icon = MAIN_DECK_ICON;
break;
case Sideboard:
captionPrefix = localizer.getMessage("lblSide");
cardManager.setCaption(localizer.getMessage("lblSideboard"));
captionPrefix = Forge.getLocalizer().getMessage("lblSide");
cardManager.setCaption(Forge.getLocalizer().getMessage("lblSideboard"));
icon = SIDEBOARD_ICON;
break;
case Commander:
captionPrefix = localizer.getMessage("lblCommander");
cardManager.setCaption(localizer.getMessage("lblCommander"));
captionPrefix = Forge.getLocalizer().getMessage("lblCommander");
cardManager.setCaption(Forge.getLocalizer().getMessage("lblCommander"));
icon = FSkinImage.COMMANDER;
break;
}
@@ -768,11 +768,10 @@ import java.util.Map;
@Override
protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
final Localizer localizer = Localizer.getInstance();
switch (deckSection) {
default:
case Main:
addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -781,7 +780,7 @@ import java.util.Map;
addCard(card, result);
}
});
addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -793,7 +792,7 @@ import java.util.Map;
}
});
if (parentScreen.getSideboardPage() != null) {
addItem(menu, localizer.getMessage("lblMove"), localizer.getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -806,7 +805,7 @@ import java.util.Map;
addCommanderItems(menu, card, false, false);
break;
case Sideboard:
addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -815,7 +814,7 @@ import java.util.Map;
addCard(card, result);
}
});
addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -826,7 +825,7 @@ import java.util.Map;
}
}
});
addItem(menu, localizer.getMessage("lblMove"), localizer.getMessage("lblToMainDeck"), parentScreen.getMainDeckPage().getIcon(), false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lblToMainDeck"), parentScreen.getMainDeckPage().getIcon(), false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -839,7 +838,7 @@ import java.util.Map;
break;
case Commander:
if ( isPartnerCommander(card)) {
addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) {

5
forge-gui-mobile/src/forge/adventure/scene/ForgeScene.java
View File

@@ -10,7 +10,6 @@ import forge.interfaces.IUpdateable;
import forge.screens.FScreen;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FOverlay;
import forge.util.Localizer;
import java.util.List;
@@ -67,7 +66,7 @@ public abstract class ForgeScene extends Scene implements IUpdateable {
if(getScreen()!=null)
getScreen().setSize(Forge.getScreenWidth(), Forge.getScreenHeight());
//update language for ForgeScene
Localizer.getInstance().setEnglish(Forge.forcedEnglishonCJKMissing);
Forge.getLocalizer().setEnglish(Forge.forcedEnglishonCJKMissing);
Forge.openScreen(getScreen());
Gdx.input.setInputProcessor(Forge.getInputProcessor());
}
@@ -86,7 +85,7 @@ public abstract class ForgeScene extends Scene implements IUpdateable {
@Override
public boolean leave() {
//non ForgeScene is english atm...
Localizer.getInstance().setEnglish(true);
Forge.getLocalizer().setEnglish(Forge.forcedEnglishonCJKMissing);
return super.leave();
}

4
forge-gui-mobile/src/forge/adventure/scene/NewGameScene.java
View File

@@ -153,6 +153,7 @@ public class NewGameScene extends UIScene {
scrollPane = ui.findActor("scroll");
titleL = ui.findActor("titleL");
titleL.setScale(2, 2);
avatarL = ui.findActor("avatarL");
nameL = ui.findActor("nameL");
raceL = ui.findActor("raceL");
@@ -174,7 +175,8 @@ public class NewGameScene extends UIScene {
selectedName.setX(w/2- selectedName.getWidth()/2);
nameL.setFontScaleX(2);
titleL.setFontScaleX(2);
titleL.setScale(4, 2);
titleL.setFontScale(4, 2);
titleL.setX(selectedName.getX()-20);
avatarImage.setScaleX(2);

43
forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java
View File

@@ -23,7 +23,6 @@ import forge.adventure.util.Controls;
import forge.gui.GuiBase;
import forge.localinstance.properties.ForgePreferences;
import forge.model.FModel;
import forge.util.Localizer;
import java.util.function.Function;
@@ -160,15 +159,12 @@ public class SettingsScene extends UIScene {
void addLabel(String name) {
Label label = new Label(name, Controls.GetSkin().get("white", Label.LabelStyle.class));
label.setWrap(true);
if (!Forge.isLandscapeMode()) {
label.setFontScaleX(2);
label.setWrap(true);
settingGroup.row().space(5);
settingGroup.add(label).align(Align.left).pad(2, 2, 2, 5).expandX();
} else {
settingGroup.row().space(5);
settingGroup.add(label).align(Align.left).pad(2, 2, 2, 5);
}
settingGroup.row().space(5);
settingGroup.add(label).align(Align.left).pad(2, 2, 2, 5).expand();
}
@Override
@@ -178,7 +174,6 @@ public class SettingsScene extends UIScene {
if (Preference == null) {
Preference = new ForgePreferences();
}
Localizer localizer = Localizer.getInstance();
SelectBox plane = Controls.newComboBox(Config.instance().getAllAdventures(), Config.instance().getSettingData().plane, new Function<Object, Void>() {
@Override
@@ -240,28 +235,28 @@ public class SettingsScene extends UIScene {
}
});
}
addCheckBox(localizer.getMessage("lblCardName"), ForgePreferences.FPref.UI_OVERLAY_CARD_NAME);
addSettingSlider(localizer.getMessage("cbAdjustMusicVolume"), ForgePreferences.FPref.UI_VOL_MUSIC, 0, 100);
addSettingSlider(localizer.getMessage("cbAdjustSoundsVolume"), ForgePreferences.FPref.UI_VOL_SOUNDS, 0, 100);
addCheckBox(localizer.getMessage("lblManaCost"), ForgePreferences.FPref.UI_OVERLAY_CARD_MANA_COST);
addCheckBox(localizer.getMessage("lblPowerOrToughness"), ForgePreferences.FPref.UI_OVERLAY_CARD_POWER);
addCheckBox(localizer.getMessage("lblCardID"), ForgePreferences.FPref.UI_OVERLAY_CARD_ID);
addCheckBox(localizer.getMessage("lblAbilityIcon"), ForgePreferences.FPref.UI_OVERLAY_ABILITY_ICONS);
addCheckBox(localizer.getMessage("cbImageFetcher"), ForgePreferences.FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER);
addCheckBox(Forge.getLocalizer().getMessage("lblCardName"), ForgePreferences.FPref.UI_OVERLAY_CARD_NAME);
addSettingSlider(Forge.getLocalizer().getMessage("cbAdjustMusicVolume"), ForgePreferences.FPref.UI_VOL_MUSIC, 0, 100);
addSettingSlider(Forge.getLocalizer().getMessage("cbAdjustSoundsVolume"), ForgePreferences.FPref.UI_VOL_SOUNDS, 0, 100);
addCheckBox(Forge.getLocalizer().getMessage("lblManaCost"), ForgePreferences.FPref.UI_OVERLAY_CARD_MANA_COST);
addCheckBox(Forge.getLocalizer().getMessage("lblPowerOrToughness"), ForgePreferences.FPref.UI_OVERLAY_CARD_POWER);
addCheckBox(Forge.getLocalizer().getMessage("lblCardID"), ForgePreferences.FPref.UI_OVERLAY_CARD_ID);
addCheckBox(Forge.getLocalizer().getMessage("lblAbilityIcon"), ForgePreferences.FPref.UI_OVERLAY_ABILITY_ICONS);
addCheckBox(Forge.getLocalizer().getMessage("cbImageFetcher"), ForgePreferences.FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER);
if (!GuiBase.isAndroid()) {
addCheckBox(localizer.getMessage("lblBattlefieldTextureFiltering"), ForgePreferences.FPref.UI_LIBGDX_TEXTURE_FILTERING);
addCheckBox(localizer.getMessage("lblAltZoneTabs"), ForgePreferences.FPref.UI_ALT_PLAYERZONETABS);
addCheckBox(Forge.getLocalizer().getMessage("lblBattlefieldTextureFiltering"), ForgePreferences.FPref.UI_LIBGDX_TEXTURE_FILTERING);
addCheckBox(Forge.getLocalizer().getMessage("lblAltZoneTabs"), ForgePreferences.FPref.UI_ALT_PLAYERZONETABS);
}
addCheckBox(localizer.getMessage("lblAnimatedCardTapUntap"), ForgePreferences.FPref.UI_ANIMATED_CARD_TAPUNTAP);
addCheckBox(Forge.getLocalizer().getMessage("lblAnimatedCardTapUntap"), ForgePreferences.FPref.UI_ANIMATED_CARD_TAPUNTAP);
if (!GuiBase.isAndroid()) {
addCheckBox(localizer.getMessage("lblBorderMaskOption"), ForgePreferences.FPref.UI_ENABLE_BORDER_MASKING);
addCheckBox(localizer.getMessage("lblPreloadExtendedArtCards"), ForgePreferences.FPref.UI_ENABLE_PRELOAD_EXTENDED_ART);
addCheckBox(localizer.getMessage("lblAutoCacheSize"), ForgePreferences.FPref.UI_AUTO_CACHE_SIZE);
addCheckBox(localizer.getMessage("lblDisposeTextures"), ForgePreferences.FPref.UI_ENABLE_DISPOSE_TEXTURES);
//addInputField(localizer.getMessage("lblDisposeTextures"), ForgePreferences.FPref.UI_LANGUAGE);
addCheckBox(Forge.getLocalizer().getMessage("lblBorderMaskOption"), ForgePreferences.FPref.UI_ENABLE_BORDER_MASKING);
addCheckBox(Forge.getLocalizer().getMessage("lblPreloadExtendedArtCards"), ForgePreferences.FPref.UI_ENABLE_PRELOAD_EXTENDED_ART);
addCheckBox(Forge.getLocalizer().getMessage("lblAutoCacheSize"), ForgePreferences.FPref.UI_AUTO_CACHE_SIZE);
addCheckBox(Forge.getLocalizer().getMessage("lblDisposeTextures"), ForgePreferences.FPref.UI_ENABLE_DISPOSE_TEXTURES);
//addInputField(Forge.getLocalizer().getMessage("lblDisposeTextures"), ForgePreferences.FPref.UI_LANGUAGE);
}

32
forge-gui-mobile/src/forge/adventure/util/Controls.java
View File

@@ -16,6 +16,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import java.util.function.Function;
@@ -24,6 +25,7 @@ import java.util.function.Function;
*/
public class Controls {
private static Skin SelectedSkin = null;
private static BitmapFont defaultfont, bigfont, miKrollFantasy;
static public TextButton newTextButton(String text) {
@@ -98,13 +100,17 @@ public class Controls {
CheckBox ret = new CheckBox(text, GetSkin());
return ret;
}
static public BitmapFont bigFont()
{
return SelectedSkin.getFont("big");
static public BitmapFont getBitmapFont(String fontName) {
switch (fontName) {
case "MiKrollFantasyBig":
return miKrollFantasy;
case "blackbig":
case "big":
return bigfont;
default:
return defaultfont;
}
static public BitmapFont font()
{
return SelectedSkin.getFont("default");
}
@@ -113,26 +119,34 @@ public class Controls {
if (SelectedSkin == null) {
SelectedSkin = new Skin();
FileHandle skinFile = Config.instance().getFile(Paths.SKIN);
FileHandle atlasFile = skinFile.sibling(skinFile.nameWithoutExtension() + ".atlas");
TextureAtlas atlas = new TextureAtlas(atlasFile);
SelectedSkin.addRegions(atlas);
SelectedSkin.load(skinFile);
//font
defaultfont = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("LanaPixelCJK.fnt"));
miKrollFantasy = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("MiKrollFantasyBig.fnt"));
bigfont = new BitmapFont(Config.instance().getFile(Paths.SKIN).sibling("LanaPixelCJK.fnt"));
bigfont.getData().setScale(2, 2);
}
return SelectedSkin;
}
public static Label newLabel(String name) {
Label ret = new Label(name, GetSkin());
if (!Forge.isLandscapeMode()) {
ret.setFontScaleX(2);
}
return ret;
}
public static Dialog newDialog(String title) {
Dialog ret = new Dialog(title, GetSkin());
if (!Forge.isLandscapeMode()) {
ret.getTitleLabel().setFontScaleX(2);
}
return ret;
}

10
forge-gui-mobile/src/forge/adventure/util/DrawOnPixmap.java
View File

@@ -5,7 +5,6 @@ import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.TextureData;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import forge.gui.GuiBase;
/*
Class to draw directly on a pixmap
@@ -26,14 +25,11 @@ public abstract class DrawOnPixmap {
}
public static void drawText(Pixmap drawingMap, String text, int x, int y, float width) {
BitmapFont font = Controls.bigFont();
if (GuiBase.isAndroid()) { //todo make this configurable
font = new BitmapFont(Gdx.files.internal("fallback_skin").child("MiKrollFantasy(1).fnt"));
}
//used for big numbers on Gold/Life for reward...
BitmapFont font = Controls.getBitmapFont("MiKrollFantasyBig");
BitmapFont.BitmapFontData data = font.getData();
Pixmap source = new Pixmap(Gdx.files.internal(data.imagePaths[0]));
Pixmap source = new Pixmap(Gdx.files.absolute(data.getImagePath(0)));
float totalLength = data.getGlyph('0').width * text.length();
float xOffset = (width - totalLength) / 2;

13
forge-gui-mobile/src/forge/adventure/util/UIActor.java
View File

@@ -1,6 +1,7 @@
package forge.adventure.util;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.scenes.scene2d.Actor;
@@ -162,7 +163,11 @@ public class UIActor extends Group {
break;
case "font":
Label.LabelStyle style = new Label.LabelStyle(newActor.getStyle());
style.font = Controls.GetSkin().getFont(property.value.toString());
style.font = Controls.getBitmapFont(property.value.toString());
if (property.value.toString().contains("black"))
style.fontColor = Color.BLACK;
if (property.value.toString().contains("big"))
newActor.setFontScale(2, 2);
newActor.setStyle(style);
break;
}
@@ -173,7 +178,11 @@ public class UIActor extends Group {
for (ObjectMap.Entry property : entries) {
switch (property.key.toString()) {
case "font":
newActor.getSkin().get(Label.LabelStyle.class).font = Controls.GetSkin().getFont(property.value.toString());
newActor.getSkin().get(Label.LabelStyle.class).font = Controls.getBitmapFont(property.value.toString());
if (property.value.toString().contains("black"))
newActor.getSkin().get(Label.LabelStyle.class).fontColor = Color.BLACK;
if (property.value.toString().contains("big"))
newActor.setScale(2, 2);
break;
}
}

14
forge-gui-mobile/src/forge/assets/AssetsDownloader.java
View File

@@ -64,13 +64,13 @@ public class AssetsDownloader {
Forge didn't open the apk so I downgrade the check so it will run only on target devices without FileUriExposedException */
if (Forge.androidVersion < 24) {
Forge.getDeviceAdapter().openFile(apkFile);
Forge.exit(true);
Forge.exitAnimation(false);
return;
}
// API 24 and above needs manual apk installation unless we provide a FileProvider for FileUriExposedException
switch (SOptionPane.showOptionDialog("Download Successful. Go to your downloads folder and install " + filename +" to update Forge. Forge will now exit.", "", null, ImmutableList.of("Ok"))) {
default:
Forge.exit(true);
Forge.exitAnimation(false);
}
return;
}
@@ -92,7 +92,7 @@ public class AssetsDownloader {
}
catch (IOException e) {
e.printStackTrace();
Forge.exit(true); //can't continue if this fails
Forge.exitAnimation(false); //can't continue if this fails
return;
}
}
@@ -114,7 +114,7 @@ public class AssetsDownloader {
}
SOptionPane.showMessageDialog(message, "No Internet Connection");
if (!canIgnoreDownload) {
Forge.exit(true); //exit if can't ignore download
Forge.exitAnimation(false); //exit if can't ignore download
}
return;
}
@@ -141,11 +141,11 @@ public class AssetsDownloader {
switch (SOptionPane.showOptionDialog(message, "", null, options)) {
case 1:
if (!canIgnoreDownload) {
Forge.exit(true); //exit if can't ignore download
Forge.exitAnimation(false); //exit if can't ignore download
}
return;
case 2:
Forge.exit(true);
Forge.exitAnimation(false);
return;
}
@@ -175,7 +175,7 @@ public class AssetsDownloader {
String msg = allowDeletion ? "Resource update finished..." : "Forge misses some files for deletion.\nIf you encounter issues, try deleting the Forge/res folder and/or deleting Forge/cache/fonts folder and try to download and update the assets.";
switch (SOptionPane.showOptionDialog(msg, "", null, ImmutableList.of("Restart"))) {
default:
Forge.restart(true);
Forge.exitAnimation(true);
}
}
}

5
forge-gui-mobile/src/forge/card/CardZoom.java
View File

@@ -27,7 +27,6 @@ import forge.screens.match.MatchController;
import forge.toolbox.FCardPanel;
import forge.toolbox.FDialog;
import forge.toolbox.FOverlay;
import forge.util.Localizer;
import forge.util.Utils;
import forge.util.collect.FCollectionView;
@@ -347,10 +346,10 @@ public class CardZoom extends FOverlay {
if (currentActivateAction != null) {
g.fillRect(FDialog.MSG_BACK_COLOR, 0, 0, w, messageHeight);
g.drawText(Localizer.getInstance().getMessage("lblSwipeUpTo").replace("%s", currentActivateAction), FDialog.MSG_FONT, FDialog.MSG_FORE_COLOR, 0, 0, w, messageHeight, false, Align.center, true);
g.drawText(Forge.getLocalizer().getMessage("lblSwipeUpTo").replace("%s", currentActivateAction), FDialog.MSG_FONT, FDialog.MSG_FORE_COLOR, 0, 0, w, messageHeight, false, Align.center, true);
}
g.fillRect(FDialog.MSG_BACK_COLOR, 0, h - messageHeight, w, messageHeight);
g.drawText(zoomMode ? Localizer.getInstance().getMessage("lblSwipeDownDetailView") : Localizer.getInstance().getMessage("lblSwipeDownPictureView"), FDialog.MSG_FONT, FDialog.MSG_FORE_COLOR, 0, h - messageHeight, w, messageHeight, false, Align.center, true);
g.drawText(zoomMode ? Forge.getLocalizer().getMessage("lblSwipeDownDetailView") : Forge.getLocalizer().getMessage("lblSwipeDownPictureView"), FDialog.MSG_FONT, FDialog.MSG_FORE_COLOR, 0, h - messageHeight, w, messageHeight, false, Align.center, true);
interrupt(false);
}

7
forge-gui-mobile/src/forge/card/GameEntityPicker.java
View File

@@ -21,21 +21,20 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.toolbox.FTextField;
import forge.util.Callback;
import forge.util.Localizer;
public class GameEntityPicker extends TabPageScreen<GameEntityPicker> {
private final FOptionPane optionPane;
public GameEntityPicker(String title, Collection<? extends GameEntityView> choiceList, Collection<CardView> revealList, String revealListCaption, FImage revealListImage, boolean isOptional, final Callback<GameEntityView> callback) {
super(new PickerTab[] {
new PickerTab(choiceList, Localizer.getInstance().getMessage("lblChoices"), Forge.hdbuttons ? FSkinImage.HDCHOICE : FSkinImage.DECKLIST, 1),
new PickerTab(choiceList, Forge.getLocalizer().getMessage("lblChoices"), Forge.hdbuttons ? FSkinImage.HDCHOICE : FSkinImage.DECKLIST, 1),
new PickerTab(revealList, revealListCaption, revealListImage, 0)
}, false);
setHeight(FOptionPane.getMaxDisplayObjHeight());
optionPane = new FOptionPane(null, null, title, null, this,
isOptional ? ImmutableList.of(Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel")) : ImmutableList.of(Localizer.getInstance().getMessage("lblOK")), 0, new Callback<Integer>() {
isOptional ? ImmutableList.of(Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblCancel")) : ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 0, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == 0) {
@@ -75,7 +74,7 @@ public class GameEntityPicker extends TabPageScreen<GameEntityPicker> {
super(caption0 + " (" + items.size() + ")", icon0);
txtSearch = add(new FTextField());
txtSearch.setFont(FSkinFont.get(12));
txtSearch.setGhostText(Localizer.getInstance().getMessage("lblSearch"));
txtSearch.setGhostText(Forge.getLocalizer().getMessage("lblSearch"));
txtSearch.setChangedHandler(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {

21
forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java
View File

@@ -49,7 +49,6 @@ import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextArea;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.Utils;
@@ -62,7 +61,7 @@ public class AddBasicLandsDialog extends FDialog {
private final Callback<CardPool> callback;
private final FLabel lblLandSet = add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblLandSet") + ":").font(FSkinFont.get(12)).textColor(FLabel.INLINE_LABEL_COLOR).build());
private final FLabel lblLandSet = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblLandSet") + ":").font(FSkinFont.get(12)).textColor(FLabel.INLINE_LABEL_COLOR).build());
private final FComboBox<CardEdition> cbLandSet = add(new FComboBox<>(Iterables.filter(StaticData.instance().getEditions(), CardEdition.Predicates.hasBasicLands)));
private final FScrollPane scroller = add(new FScrollPane() {
@@ -119,7 +118,7 @@ public class AddBasicLandsDialog extends FDialog {
private CardEdition landSet;
public AddBasicLandsDialog(Deck deck, CardEdition defaultLandSet, final Callback<CardPool> callback0) {
super(Localizer.getInstance().getMessage("lblAddBasicLandsAutoSuggest").replace("%s", deck.getName()), 2);
super(Forge.getLocalizer().getMessage("lblAddBasicLandsAutoSuggest").replace("%s", deck.getName()), 2);
callback = callback0;
currentDeck = deck;
@@ -142,7 +141,7 @@ public class AddBasicLandsDialog extends FDialog {
});
cbLandSet.setSelectedItem(defaultLandSet);
initButton(0, Localizer.getInstance().getMessage("lblOK"), new FEventHandler() {
initButton(0, Forge.getLocalizer().getMessage("lblOK"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
CardPool landsToAdd = new CardPool();
@@ -159,7 +158,7 @@ public class AddBasicLandsDialog extends FDialog {
}
}
});
initButton(1, Localizer.getInstance().getMessage("lblCancel"), new FEventHandler() {
initButton(1, Forge.getLocalizer().getMessage("lblCancel"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
hide();
@@ -293,10 +292,10 @@ public class AddBasicLandsDialog extends FDialog {
}
int newTotalCount = nonLandCount + oldLandCount + newLandCount;
lblDeckInfo.setText(
String.format(Localizer.getInstance().getMessage("lblNonLandCount"), nonLandCount) + " + " +
String.format(Localizer.getInstance().getMessage("lblOldLandCount"), oldLandCount) + " + " +
String.format(Localizer.getInstance().getMessage("lblNewLandCount"), newLandCount) + " = " +
String.format(Localizer.getInstance().getMessage("lblNewTotalCount"), newTotalCount) + "\n" +
String.format(Forge.getLocalizer().getMessage("lblNonLandCount"), nonLandCount) + " + " +
String.format(Forge.getLocalizer().getMessage("lblOldLandCount"), oldLandCount) + " + " +
String.format(Forge.getLocalizer().getMessage("lblNewLandCount"), newLandCount) + " = " +
String.format(Forge.getLocalizer().getMessage("lblNewTotalCount"), newTotalCount) + "\n" +
"{W} " + integer.format(pnlPlains.symbolCount) + " (" + percent.format(pnlPlains.symbolCount / totalSymbolCount) + ") | " +
"{U} " + integer.format(pnlIsland.symbolCount) + " (" + percent.format(pnlIsland.symbolCount / totalSymbolCount) + ") | " +
"{B} " + integer.format(pnlSwamp.symbolCount) + " (" + percent.format(pnlSwamp.symbolCount / totalSymbolCount) + ") | " +
@@ -378,9 +377,9 @@ public class AddBasicLandsDialog extends FDialog {
if (landSet == null) { return; }
int artChoiceCount = FModel.getMagicDb().getCommonCards().getArtCount(cardName, landSet.getCode());
cbLandArt.addItem(Localizer.getInstance().getMessage("lblAssortedArt"));
cbLandArt.addItem(Forge.getLocalizer().getMessage("lblAssortedArt"));
for (int i = 1; i <= artChoiceCount; i++) {
cbLandArt.addItem(Localizer.getInstance().getMessage("lblCardArtN", String.valueOf(i)));
cbLandArt.addItem(Forge.getLocalizer().getMessage("lblCardArtN", String.valueOf(i)));
}
}

42
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@@ -50,7 +50,6 @@ import forge.toolbox.FOptionPane;
import forge.toolbox.GuiChoose;
import forge.toolbox.ListChooser;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
import forge.util.storage.IStorage;
@@ -73,15 +72,14 @@ public class FDeckChooser extends FScreen {
private boolean firstActivation = true;
private final DeckManager lstDecks;
private final FButton btnNewDeck = new FButton(Localizer.getInstance().getMessage("lblNewDeck"));
private final FButton btnEditDeck = new FButton(Localizer.getInstance().getMessage("btnEditDeck"));
private final FButton btnViewDeck = new FButton(Localizer.getInstance().getMessage("lblViewDeck"));
private final FButton btnRandom = new FButton(Localizer.getInstance().getMessage("lblRandomDeck"));
private final FButton btnNewDeck = new FButton(Forge.getLocalizer().getInstance().getMessage("lblNewDeck"));
private final FButton btnEditDeck = new FButton(Forge.getLocalizer().getInstance().getMessage("btnEditDeck"));
private final FButton btnViewDeck = new FButton(Forge.getLocalizer().getInstance().getMessage("lblViewDeck"));
private final FButton btnRandom = new FButton(Forge.getLocalizer().getInstance().getMessage("lblRandomDeck"));
private RegisteredPlayer player;
private boolean isAi;
private final ForgePreferences prefs = FModel.getPreferences();
private final Localizer localizer = Localizer.getInstance();
private FPref stateSetting = null;
private FOptionPane optionPane;
@@ -107,7 +105,7 @@ public class FDeckChooser extends FScreen {
container.add(deckChooser.lstDecks);
container.setHeight(FOptionPane.getMaxDisplayObjHeight());
deckChooser.optionPane = new FOptionPane(null, null, title, null, container, ImmutableList.of(Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel")), 0, new Callback<Integer>() {
deckChooser.optionPane = new FOptionPane(null, null, title, null, container, ImmutableList.of(Forge.getLocalizer().getInstance().getMessage("lblOK"), Forge.getLocalizer().getInstance().getMessage("lblCancel")), 0, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == 0) {
@@ -350,7 +348,7 @@ public class FDeckChooser extends FScreen {
}
if (isGeneratedDeck(selectedDeckType)) {
if (deck == null) {
FOptionPane.showErrorDialog(localizer.getMessage("lblMustSelectGenerateNewDeck"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblMustSelectGenerateNewDeck"));
return;
}
}
@@ -424,8 +422,8 @@ public class FDeckChooser extends FScreen {
//prompt to duplicate deck if deck doesn't exist already
FOptionPane.showConfirmDialog(selectedDeckType + " " + localizer.getMessage("lblCannotEditDuplicateCustomDeck").replace("%s", deck.getName()),
localizer.getMessage("lblDuplicateDeck"), localizer.getMessage("lblDuplicate"), localizer.getMessage("lblCancel"), new Callback<Boolean>() {
FOptionPane.showConfirmDialog(selectedDeckType + " " + Forge.getLocalizer().getMessage("lblCannotEditDuplicateCustomDeck").replace("%s", deck.getName()),
Forge.getLocalizer().getMessage("lblDuplicateDeck"), Forge.getLocalizer().getMessage("lblDuplicate"), Forge.getLocalizer().getMessage("lblCancel"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -1116,16 +1114,16 @@ public class FDeckChooser extends FScreen {
btnViewDeck.setVisible(false);
btnRandom.setWidth(btnNewDeck.getWidth());
btnNewDeck.setText(localizer.getMessage("lblGenerateNewDeck"));
btnNewDeck.setText(Forge.getLocalizer().getMessage("lblGenerateNewDeck"));
switch (deckType) {
case COLOR_DECK:
btnRandom.setText(localizer.getMessage("lblRandomColors"));
btnRandom.setText(Forge.getLocalizer().getMessage("lblRandomColors"));
break;
case THEME_DECK:
btnRandom.setText(localizer.getMessage("lblRandomTheme"));
btnRandom.setText(Forge.getLocalizer().getMessage("lblRandomTheme"));
break;
default:
btnRandom.setText(localizer.getMessage("lblRandomDeck"));
btnRandom.setText(Forge.getLocalizer().getMessage("lblRandomDeck"));
break;
}
}
@@ -1135,11 +1133,11 @@ public class FDeckChooser extends FScreen {
btnViewDeck.setVisible(true);
btnRandom.setWidth(btnNewDeck.getWidth());
btnNewDeck.setText(localizer.getMessage("lblNewDeck"));
btnNewDeck.setText(Forge.getLocalizer().getMessage("lblNewDeck"));
if (lstDecks.getGameType() == GameType.DeckManager) {
//handle special case of Deck Editor screen where this button will start a game with the deck
btnRandom.setText(localizer.getMessage("lblTestDeck"));
btnRandom.setText(Forge.getLocalizer().getMessage("lblTestDeck"));
switch (selectedDeckType) {
case SCHEME_DECK:
@@ -1152,7 +1150,7 @@ public class FDeckChooser extends FScreen {
}
}
else {
btnRandom.setText(localizer.getMessage("lblRandomDeck"));
btnRandom.setText(Forge.getLocalizer().getMessage("lblRandomDeck"));
}
}
@@ -1437,7 +1435,7 @@ public class FDeckChooser extends FScreen {
return;
}
GuiChoose.getInteger(localizer.getMessage("lblHowManyOpponents"), 1, 50, new Callback<Integer>() {
GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 1, 50, new Callback<Integer>() {
@Override
public void run(final Integer numOpponents) {
if (numOpponents == null) { return; }
@@ -1475,7 +1473,7 @@ public class FDeckChooser extends FScreen {
}
ListChooser<DeckType> chooser = new ListChooser<>(
localizer.getMessage("lblChooseAllowedDeckTypeOpponents"), 0, deckTypes.size(), deckTypes, null, new Callback<List<DeckType>>() {
Forge.getLocalizer().getMessage("lblChooseAllowedDeckTypeOpponents"), 0, deckTypes.size(), deckTypes, null, new Callback<List<DeckType>>() {
@Override
public void run(final List<DeckType> allowedDeckTypes) {
if (allowedDeckTypes == null || allowedDeckTypes.isEmpty()) {
@@ -1495,7 +1493,7 @@ public class FDeckChooser extends FScreen {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(localizer.getMessage("lblLoadingNewGame"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
GauntletData gauntlet = GauntletUtil.createQuickGauntlet(userDeck, numOpponents, allowedDeckTypes, netCat);
@@ -1521,12 +1519,12 @@ public class FDeckChooser extends FScreen {
}
private void testVariantDeck(final Deck userDeck, final GameType variant) {
promptForDeck(localizer.getMessage("lblSelectOpponentDeck"), variant, true, new Callback<Deck>() {
promptForDeck(Forge.getLocalizer().getMessage("lblSelectOpponentDeck"), variant, true, new Callback<Deck>() {
@Override
public void run(final Deck aiDeck) {
if (aiDeck == null) { return; }
LoadingOverlay.show(localizer.getMessage("lblLoadingNewGame"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
Set<GameType> appliedVariants = new HashSet<>();

192
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@@ -168,7 +168,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
private static DeckEditorPage[] getPages(EditorType editorType) {
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
boolean isLandscape = Forge.isLandscapeMode();
switch (editorType) {
default:
@@ -207,13 +207,13 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
case Oathbreaker:
return isLandscape ? new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.CARD_CATALOG),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.OATHBREAKER_SECTION, localizer.getMessage("lblOathbreaker"), FSkinImage.COMMANDER),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.OATHBREAKER_SECTION, Forge.getLocalizer().getMessage("lblOathbreaker"), FSkinImage.COMMANDER),
new DeckSectionPage(DeckSection.Main),
new DeckSectionPage(DeckSection.Sideboard)
} : new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.CARD_CATALOG),
new DeckSectionPage(DeckSection.Main),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.OATHBREAKER_SECTION, localizer.getMessage("lblOathbreaker"), FSkinImage.COMMANDER),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.OATHBREAKER_SECTION, Forge.getLocalizer().getMessage("lblOathbreaker"), FSkinImage.COMMANDER),
new DeckSectionPage(DeckSection.Sideboard)
};
case Archenemy:
@@ -228,28 +228,28 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
};
case Quest:
return new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, localizer.getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, Forge.getLocalizer().getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.QUEST_DECK_EDITOR),
new DeckSectionPage(DeckSection.Sideboard, ItemManagerConfig.QUEST_DECK_EDITOR)
};
case QuestCommander:
return isLandscape ? new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, localizer.getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, Forge.getLocalizer().getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.COMMANDER_SECTION),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.QUEST_DECK_EDITOR)
} : new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, localizer.getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new CatalogPage(ItemManagerConfig.QUEST_EDITOR_POOL, Forge.getLocalizer().getMessage("lblInventory"), FSkinImage.QUEST_BOX),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.QUEST_DECK_EDITOR),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.COMMANDER_SECTION)
};
case PlanarConquest:
return isLandscape ? new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.CONQUEST_COLLECTION, localizer.getMessage("lblCollection"), FSkinImage.SPELLBOOK),
new CatalogPage(ItemManagerConfig.CONQUEST_COLLECTION, Forge.getLocalizer().getMessage("lblCollection"), FSkinImage.SPELLBOOK),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.COMMANDER_SECTION),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.CONQUEST_DECK_EDITOR, localizer.getMessage("lblDeck"), Forge.hdbuttons ? FSkinImage.HDLIBRARY : FSkinImage.DECKLIST)
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.CONQUEST_DECK_EDITOR, Forge.getLocalizer().getMessage("lblDeck"), Forge.hdbuttons ? FSkinImage.HDLIBRARY : FSkinImage.DECKLIST)
} : new DeckEditorPage[] {
new CatalogPage(ItemManagerConfig.CONQUEST_COLLECTION, localizer.getMessage("lblCollection"), FSkinImage.SPELLBOOK),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.CONQUEST_DECK_EDITOR, localizer.getMessage("lblDeck"), Forge.hdbuttons ? FSkinImage.HDLIBRARY : FSkinImage.DECKLIST),
new CatalogPage(ItemManagerConfig.CONQUEST_COLLECTION, Forge.getLocalizer().getMessage("lblCollection"), FSkinImage.SPELLBOOK),
new DeckSectionPage(DeckSection.Main, ItemManagerConfig.CONQUEST_DECK_EDITOR, Forge.getLocalizer().getMessage("lblDeck"), Forge.hdbuttons ? FSkinImage.HDLIBRARY : FSkinImage.DECKLIST),
new DeckSectionPage(DeckSection.Commander, ItemManagerConfig.COMMANDER_SECTION)
};
}
@@ -371,10 +371,10 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
FPopupMenu menu = new FPopupMenu() {
@Override
protected void buildMenu() {
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
if (allowsAddBasic())
addItem(new FMenuItem(localizer.getMessage("lblAddBasicLands"), FSkinImage.LANDLOGO, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblAddBasicLands"), FSkinImage.LANDLOGO, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
CardEdition defaultLandSet;
@@ -407,7 +407,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
}));
if (!isLimitedEditor()) {
addItem(new FMenuItem(localizer.getMessage("lblImportFromClipboard"), Forge.hdbuttons ? FSkinImage.HDIMPORT : FSkinImage.OPEN, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblImportFromClipboard"), Forge.hdbuttons ? FSkinImage.HDIMPORT : FSkinImage.OPEN, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
FDeckImportDialog dialog = new FDeckImportDialog(!deck.isEmpty(), editorType);
@@ -438,11 +438,11 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
}));
if(allowsSave())
addItem(new FMenuItem(localizer.getMessage("lblSaveAs"), Forge.hdbuttons ? FSkinImage.HDSAVEAS : FSkinImage.SAVEAS, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblSaveAs"), Forge.hdbuttons ? FSkinImage.HDSAVEAS : FSkinImage.SAVEAS, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
String defaultName = editorType.getController().getNextAvailableName();
FOptionPane.showInputDialog(localizer.getMessage("lblNameNewCopyDeck"), defaultName, new Callback<String>() {
FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblNameNewCopyDeck"), defaultName, new Callback<String>() {
@Override
public void run(String result) {
if (!StringUtils.isEmpty(result)) {
@@ -454,10 +454,10 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}));
}
if (allowRename()) {
addItem(new FMenuItem(localizer.getMessage("lblRenameDeck"), Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblRenameDeck"), Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
FOptionPane.showInputDialog(localizer.getMessage("lblNewNameDeck"), deck.getName(), new Callback<String>() {
FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblNewNameDeck"), deck.getName(), new Callback<String>() {
@Override
public void run(String result) {
editorType.getController().rename(result);
@@ -467,12 +467,12 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}));
}
if (allowDelete()) {
addItem(new FMenuItem(localizer.getMessage("lblDeleteDeck"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblDeleteDeck"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
FOptionPane.showConfirmDialog(
localizer.getMessage("lblConfirmDelete") + " '" + deck.getName() + "'?",
localizer.getMessage("lblDeleteDeck"), localizer.getMessage("lblDelete"), localizer.getMessage("lblCancel"), false, new Callback<Boolean>() {
Forge.getLocalizer().getMessage("lblConfirmDelete") + " '" + deck.getName() + "'?",
Forge.getLocalizer().getMessage("lblDeleteDeck"), Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblCancel"), false, new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -484,7 +484,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
}));
}
addItem(new FMenuItem(localizer.getMessage("btnCopyToClipboard"), Forge.hdbuttons ? FSkinImage.HDEXPORT : FSkinImage.BLANK, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("btnCopyToClipboard"), Forge.hdbuttons ? FSkinImage.HDEXPORT : FSkinImage.BLANK, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
FDeckViewer.copyDeckToClipboard(deck);
@@ -591,8 +591,8 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
if (StringUtils.isEmpty(deck.getName())) {
List<PaperCard> commanders = deck.getCommanders(); //use commander name as default deck name
String initialInput = Lang.joinHomogenous(commanders);
final Localizer localizer = Localizer.getInstance();
FOptionPane.showInputDialog(localizer.getMessage("lblNameNewDeck"), initialInput, new Callback<String>() {
final Localizer localizer = Forge.getLocalizer().getInstance();
FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblNameNewDeck"), initialInput, new Callback<String>() {
@Override
public void run(String result) {
if (StringUtils.isEmpty(result)) { return; }
@@ -613,9 +613,9 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
private final static ImmutableList<String> onCloseOptions = ImmutableList.of(
Localizer.getInstance().getMessage("lblSave"),
Localizer.getInstance().getMessage("lblDontSave"),
Localizer.getInstance().getMessage("lblCancel")
Forge.getLocalizer().getInstance().getMessage("lblSave"),
Forge.getLocalizer().getInstance().getMessage("lblDontSave"),
Forge.getLocalizer().getInstance().getMessage("lblCancel")
);
@Override
@@ -624,8 +624,8 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
super.onClose(canCloseCallback); //can skip prompt if draft saved
return;
}
final Localizer localizer = Localizer.getInstance();
FOptionPane.showOptionDialog(localizer.getMessage("lblSaveChangesCurrentDeck"), "",
final Localizer localizer = Forge.getLocalizer().getInstance();
FOptionPane.showOptionDialog(Forge.getLocalizer().getMessage("lblSaveChangesCurrentDeck"), "",
FOptionPane.QUESTION_ICON, onCloseOptions, new Callback<Integer>() {
@Override
public void run(Integer result) {
@@ -699,7 +699,14 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
case Brawl:
return true;
default:
{
if (editorType == EditorType.Draft || editorType == EditorType.Sealed || editorType == EditorType.Winston || editorType == EditorType.QuestDraft)
return false;
else if (editorType == EditorType.PlanarConquest || editorType == EditorType.Quest || editorType == EditorType.QuestCommander)
return FModel.getPreferences().getPrefBoolean(FPref.DEV_MODE_ENABLED);
else
return false;
}
}
}
@@ -938,20 +945,20 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
if (max == 1) {
callback.run(max);
} else {
final Localizer localizer = Localizer.getInstance();
GuiChoose.getInteger(cardManager.getSelectedItem() + " - " + verb + " " + localizer.getMessage("lblHowMany"), 1, max, 20, callback);
final Localizer localizer = Forge.getLocalizer().getInstance();
GuiChoose.getInteger(cardManager.getSelectedItem() + " - " + verb + " " + Forge.getLocalizer().getMessage("lblHowMany"), 1, max, 20, callback);
}
}
}));
}
protected void addCommanderItems(final FDropDownMenu menu, final PaperCard card, boolean isAddMenu, boolean isAddSource) {
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
if (parentScreen.getCommanderPage() == null) {
return;
}
boolean isLegalCommander;
String captionSuffix = localizer.getMessage("lblCommander");
String captionSuffix = Forge.getLocalizer().getMessage("lblCommander");
switch (parentScreen.editorType) {
case Brawl:
isLegalCommander = card.getRules().canBeBrawlCommander();
@@ -961,7 +968,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
break;
case Oathbreaker:
isLegalCommander = card.getRules().canBeOathbreaker();
captionSuffix = localizer.getMessage("lblOathbreaker");
captionSuffix = Forge.getLocalizer().getMessage("lblOathbreaker");
break;
case PlanarConquest:
isLegalCommander = false; //don't set commander this way in Planar Conquest
@@ -1077,7 +1084,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
private boolean initialized, needRefreshWhenShown;
protected CatalogPage(ItemManagerConfig config) {
this(config, Localizer.getInstance().getMessage("lblCatalog"), Forge.hdbuttons ? FSkinImage.HDFOLDER : FSkinImage.FOLDER);
this(config, Forge.getLocalizer().getInstance().getMessage("lblCatalog"), Forge.hdbuttons ? FSkinImage.HDFOLDER : FSkinImage.FOLDER);
}
protected CatalogPage(ItemManagerConfig config, String caption0, FImage icon0) {
super(config, caption0, icon0);
@@ -1108,14 +1115,14 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
protected String getItemManagerCaption() {
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
switch (parentScreen.getEditorType()) {
case Archenemy:
return localizer.getMessage("lblSchemes");
return Forge.getLocalizer().getMessage("lblSchemes");
case Planechase:
return localizer.getMessage("lblPlanes");
return Forge.getLocalizer().getMessage("lblPlanes");
default:
return localizer.getMessage("lblCards");
return Forge.getLocalizer().getMessage("lblCards");
}
}
@@ -1134,7 +1141,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
public void refresh() {
Predicate<PaperCard> additionalFilter = null;
final EditorType editorType = parentScreen.getEditorType();
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
switch (editorType) {
case Archenemy:
cardManager.setPool(FModel.getArchenemyCards(), true);
@@ -1166,19 +1173,19 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
case Commander:
case QuestCommander:
additionalFilter = DeckFormat.Commander.isLegalCommanderPredicate();
cardManager.setCaption(localizer.getMessage("lblCommanders"));
cardManager.setCaption(Forge.getLocalizer().getMessage("lblCommanders"));
break;
case Oathbreaker:
additionalFilter = DeckFormat.Oathbreaker.isLegalCommanderPredicate();
cardManager.setCaption(localizer.getMessage("lblOathbreakers"));
cardManager.setCaption(Forge.getLocalizer().getMessage("lblOathbreakers"));
break;
case TinyLeaders:
additionalFilter = DeckFormat.TinyLeaders.isLegalCommanderPredicate();
cardManager.setCaption(localizer.getMessage("lblCommanders"));
cardManager.setCaption(Forge.getLocalizer().getMessage("lblCommanders"));
break;
case Brawl:
additionalFilter = DeckFormat.Brawl.isLegalCommanderPredicate();
cardManager.setCaption(localizer.getMessage("lblCommanders"));
cardManager.setCaption(Forge.getLocalizer().getMessage("lblCommanders"));
break;
default:
// Do nothing
@@ -1202,7 +1209,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
default:
// Do nothing
}
cardManager.setCaption(localizer.getMessage("lblCards"));
cardManager.setCaption(Forge.getLocalizer().getMessage("lblCards"));
}
// fall through to below
default:
@@ -1235,10 +1242,12 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
@Override
protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
final Localizer localizer = Localizer.getInstance();
if (card == null)
return;
final Localizer localizer = Forge.getLocalizer().getInstance();
if (!needsCommander() && !canOnlyBePartnerCommander(card)) {
addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lblTo") + " " + parentScreen.getMainDeckPage().cardManager.getCaption(), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lblTo") + " " + parentScreen.getMainDeckPage().cardManager.getCaption(), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1250,7 +1259,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
});
if (parentScreen.getSideboardPage() != null) {
addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1271,7 +1280,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
//add option to add or remove card from favorites
final CardPreferences prefs = CardPreferences.getPrefs(card);
if (prefs.getStarCount() == 0) {
menu.addItem(new FMenuItem(localizer.getMessage("lblAddFavorites"), Forge.hdbuttons ? FSkinImage.HDSTAR_FILLED : FSkinImage.STAR_FILLED, new FEventHandler() {
menu.addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblAddFavorites"), Forge.hdbuttons ? FSkinImage.HDSTAR_FILLED : FSkinImage.STAR_FILLED, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
prefs.setStarCount(1);
@@ -1279,7 +1288,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
}));
} else {
menu.addItem(new FMenuItem(localizer.getMessage("lblRemoveFavorites"), Forge.hdbuttons ? FSkinImage.HDSTAR_OUTLINE : FSkinImage.STAR_OUTLINE, new FEventHandler() {
menu.addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblRemoveFavorites"), Forge.hdbuttons ? FSkinImage.HDSTAR_OUTLINE : FSkinImage.STAR_OUTLINE, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
prefs.setStarCount(0);
@@ -1291,7 +1300,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
//if card has more than one art option, add item to change user's preferred art
final List<PaperCard> artOptions = FModel.getMagicDb().getCommonCards().getAllCardsNoAlt(card.getName());
if (artOptions != null && artOptions.size() > 1) {
menu.addItem(new FMenuItem(localizer.getMessage("lblChangePreferredArt"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
menu.addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblChangePreferredArt"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
//sort options so current option is on top and selected by default
@@ -1302,7 +1311,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
sortedOptions.add(option);
}
}
GuiChoose.oneOrNone(localizer.getMessage("lblSelectPreferredArt") + " " + card.getName(), sortedOptions, new Callback<PaperCard>() {
GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectPreferredArt") + " " + card.getName(), sortedOptions, new Callback<PaperCard>() {
@Override
public void run(PaperCard result) {
if (result != null) {
@@ -1323,8 +1332,8 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
@Override
protected void buildDeckMenu(FPopupMenu menu) {
if (cardManager.getConfig().getShowUniqueCardsOption()) {
final Localizer localizer = Localizer.getInstance();
menu.addItem(new FCheckBoxMenuItem(localizer.getMessage("lblUniqueCardsOnly"), cardManager.getWantUnique(), new FEventHandler() {
final Localizer localizer = Forge.getLocalizer().getInstance();
menu.addItem(new FCheckBoxMenuItem(Forge.getLocalizer().getMessage("lblUniqueCardsOnly"), cardManager.getWantUnique(), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
boolean wantUnique = !cardManager.getWantUnique();
@@ -1347,39 +1356,39 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
protected DeckSectionPage(DeckSection deckSection0, ItemManagerConfig config) {
super(config, null, null);
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
deckSection = deckSection0;
switch (deckSection) {
default:
case Main:
captionPrefix = localizer.getMessage("lblMain");
cardManager.setCaption(localizer.getMessage("ttMain"));
captionPrefix = Forge.getLocalizer().getMessage("lblMain");
cardManager.setCaption(Forge.getLocalizer().getMessage("ttMain"));
icon = MAIN_DECK_ICON;
break;
case Sideboard:
captionPrefix = localizer.getMessage("lblSide");
cardManager.setCaption(localizer.getMessage("lblSideboard"));
captionPrefix = Forge.getLocalizer().getMessage("lblSide");
cardManager.setCaption(Forge.getLocalizer().getMessage("lblSideboard"));
icon = SIDEBOARD_ICON;
break;
case Commander:
captionPrefix = localizer.getMessage("lblCommander");
cardManager.setCaption(localizer.getMessage("lblCommander"));
captionPrefix = Forge.getLocalizer().getMessage("lblCommander");
cardManager.setCaption(Forge.getLocalizer().getMessage("lblCommander"));
icon = FSkinImage.COMMANDER;
break;
case Avatar:
captionPrefix = localizer.getMessage("lblAvatar");
cardManager.setCaption(localizer.getMessage("lblAvatar"));
captionPrefix = Forge.getLocalizer().getMessage("lblAvatar");
cardManager.setCaption(Forge.getLocalizer().getMessage("lblAvatar"));
icon = new FTextureRegionImage(FSkin.getAvatars().get(0));
break;
case Planes:
captionPrefix = localizer.getMessage("lblPlanes");
cardManager.setCaption(localizer.getMessage("lblPlanes"));
captionPrefix = Forge.getLocalizer().getMessage("lblPlanes");
cardManager.setCaption(Forge.getLocalizer().getMessage("lblPlanes"));
icon = FSkinImage.CHAOS;
break;
case Schemes:
captionPrefix = localizer.getMessage("lblSchemes");
cardManager.setCaption(localizer.getMessage("lblSchemes"));
captionPrefix = Forge.getLocalizer().getMessage("lblSchemes");
cardManager.setCaption(Forge.getLocalizer().getMessage("lblSchemes"));
icon = FSkinImage.POISON;
break;
}
@@ -1439,11 +1448,11 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
@Override
protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
final Localizer localizer = Localizer.getInstance();
final Localizer localizer = Forge.getLocalizer().getInstance();
switch (deckSection) {
default:
case Main:
addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1458,7 +1467,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
});
if (!parentScreen.isLimitedEditor()) {
addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1471,7 +1480,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
});
}
if (parentScreen.getSideboardPage() != null) {
addItem(menu, localizer.getMessage("lblMove"), localizer.getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1484,7 +1493,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
if (parentScreen.isAllowedReplacement()) {
final List<PaperCard> cardOptions = FModel.getMagicDb().getCommonCards().getAllCardsNoAlt(card.getName());
if (cardOptions != null && cardOptions.size() > 1) {
menu.addItem(new FMenuItem(localizer.getMessage("lblReplaceCard"), Forge.hdbuttons ? FSkinImage.HDCHOICE : FSkinImage.DECKLIST, new FEventHandler() {
menu.addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblReplaceCard"), Forge.hdbuttons ? FSkinImage.HDCHOICE : FSkinImage.DECKLIST, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
//sort options so current option is on top and selected by default
@@ -1495,7 +1504,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
sortedOptions.add(option);
}
}
GuiChoose.oneOrNone(localizer.getMessage("lblSelectReplacementCard") + " " + card.getName(), sortedOptions, new Callback<PaperCard>() {
GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectReplacementCard") + " " + card.getName(), sortedOptions, new Callback<PaperCard>() {
@Override
public void run(PaperCard result) {
if (result != null) {
@@ -1513,7 +1522,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
addCommanderItems(menu, card, false, false);
break;
case Sideboard:
addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1528,7 +1537,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
});
if (!parentScreen.isLimitedEditor()) {
addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1540,7 +1549,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
});
}
addItem(menu, localizer.getMessage("lblMove"), localizer.getMessage("lblToMainDeck"), parentScreen.getMainDeckPage().getIcon(), false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lblToMainDeck"), parentScreen.getMainDeckPage().getIcon(), false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1552,7 +1561,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
if (parentScreen.isAllowedReplacement()) {
final List<PaperCard> cardOptions = FModel.getMagicDb().getCommonCards().getAllCardsNoAlt(card.getName());
if (cardOptions != null && cardOptions.size() > 1) {
menu.addItem(new FMenuItem(localizer.getMessage("lblReplaceCard"), Forge.hdbuttons ? FSkinImage.HDCHOICE : FSkinImage.DECKLIST, new FEventHandler() {
menu.addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblReplaceCard"), Forge.hdbuttons ? FSkinImage.HDCHOICE : FSkinImage.DECKLIST, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
//sort options so current option is on top and selected by default
@@ -1563,7 +1572,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
sortedOptions.add(option);
}
}
GuiChoose.oneOrNone(localizer.getMessage("lblSelectReplacementCard") + " " + card.getName(), sortedOptions, new Callback<PaperCard>() {
GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectReplacementCard") + " " + card.getName(), sortedOptions, new Callback<PaperCard>() {
@Override
public void run(PaperCard result) {
if (result != null) {
@@ -1582,7 +1591,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
break;
case Commander:
if (parentScreen.editorType != EditorType.PlanarConquest || isPartnerCommander(card)) {
addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) {
@@ -1598,7 +1607,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
if (parentScreen.isAllowedReplacement()) {
final List<PaperCard> cardOptions = FModel.getMagicDb().getCommonCards().getAllCardsNoAlt(card.getName());
if (cardOptions != null && cardOptions.size() > 1) {
menu.addItem(new FMenuItem(localizer.getMessage("lblReplaceCard"), Forge.hdbuttons ? FSkinImage.HDCHOICE : FSkinImage.DECKLIST, new FEventHandler() {
menu.addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblReplaceCard"), Forge.hdbuttons ? FSkinImage.HDCHOICE : FSkinImage.DECKLIST, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
//sort options so current option is on top and selected by default
@@ -1609,7 +1618,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
sortedOptions.add(option);
}
}
GuiChoose.oneOrNone(localizer.getMessage("lblSelectReplacementCard") + " " + card.getName(), sortedOptions, new Callback<PaperCard>() {
GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectReplacementCard") + " " + card.getName(), sortedOptions, new Callback<PaperCard>() {
@Override
public void run(PaperCard result) {
if (result != null) {
@@ -1626,7 +1635,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
}
break;
case Avatar:
addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1636,7 +1645,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
});
break;
case Schemes:
addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1644,7 +1653,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
addCard(card, result);
}
});
addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1654,7 +1663,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
});
break;
case Planes:
addItem(menu, localizer.getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), null, Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, true, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1662,7 +1671,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
addCard(card, result);
}
});
addItem(menu, localizer.getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblRemove"), null, Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS, false, false, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -1686,7 +1695,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
private static class DraftPackPage extends CatalogPage {
protected DraftPackPage() {
super(ItemManagerConfig.DRAFT_PACK, Localizer.getInstance().getMessage("lblPackN", String.valueOf(1)), FSkinImage.PACK);
super(ItemManagerConfig.DRAFT_PACK, Forge.getLocalizer().getInstance().getMessage("lblPackN", String.valueOf(1)), FSkinImage.PACK);
}
@Override
@@ -1696,7 +1705,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
CardPool pool = draft.nextChoice();
int packNumber = draft.getCurrentBoosterIndex() + 1;
caption = Localizer.getInstance().getMessage("lblPackN", String.valueOf(packNumber));
caption = Forge.getLocalizer().getInstance().getMessage("lblPackN", String.valueOf(packNumber));
cardManager.setPool(pool);
cardManager.setShowRanking(true);
}
@@ -1724,15 +1733,15 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
@Override
protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
final Localizer localizer = Localizer.getInstance();
addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lblToMainDeck"), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
final Localizer localizer = Forge.getLocalizer().getInstance();
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lblToMainDeck"), parentScreen.getMainDeckPage().getIcon(), true, true, new Callback<Integer>() {
@Override
public void run(Integer result) { //ignore quantity
parentScreen.getMainDeckPage().addCard(card);
afterCardPicked(card);
}
});
addItem(menu, localizer.getMessage("lblAdd"), localizer.getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblAdd"), Forge.getLocalizer().getMessage("lbltosideboard"), parentScreen.getSideboardPage().getIcon(), true, true, new Callback<Integer>() {
@Override
public void run(Integer result) { //ignore quantity
parentScreen.getSideboardPage().addCard(card);
@@ -1840,8 +1849,7 @@ public class FDeckEditor extends TabPageScreen<FDeckEditor> {
if (editor != null) {
String name = this.getModelName();
if (name.isEmpty()) {
final Localizer localizer = Localizer.getInstance();
name = "[" + localizer.getMessage("lblNewDeck") + "]";
name = "[" + Forge.getLocalizer().getMessage("lblNewDeck") + "]";
}
if (!saved && editor.allowsSave()) {
name = "*" + name;

23
forge-gui-mobile/src/forge/deck/FDeckImportDialog.java
View File

@@ -37,24 +37,23 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.toolbox.FTextArea;
import forge.util.Callback;
import forge.util.Localizer;
public class FDeckImportDialog extends FDialog {
private Callback<Deck> callback;
private final FTextArea txtInput = add(new FTextArea(true));
private final FCheckBox newEditionCheck = add(new FCheckBox(Localizer.getInstance().getMessage("lblImportLatestVersionCard"), false));
private final FCheckBox dateTimeCheck = add(new FCheckBox(Localizer.getInstance().getMessage("lblUseOnlySetsReleasedBefore"), false));
private final FCheckBox smartCardArtCheck = add(new FCheckBox(Localizer.getInstance().getMessage("lblUseSmartCardArt"), false));
private final FCheckBox createNewDeckCheck = add(new FCheckBox(Localizer.getInstance().getMessage("lblNewDeckCheckbox"), false));
private final FCheckBox newEditionCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblImportLatestVersionCard"), false));
private final FCheckBox dateTimeCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblUseOnlySetsReleasedBefore"), false));
private final FCheckBox smartCardArtCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblUseSmartCardArt"), false));
private final FCheckBox createNewDeckCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblNewDeckCheckbox"), false));
// private final FCheckBox importInDeck = add(new FCheckBox()
/*setting onlyCoreExpCheck to false allow the copied cards to pass the check of deck contents
forge-core\src\main\java\forge\deck\Deck.javaDeck.java starting @ Line 320 which is called by
forge-gui-mobile\src\forge\deck\FDeckEditor.java starting @ Line 373
(as of latest commit: 8e6655e3ee67688cff66b422d4722c58392eaa7e)
*/
private final FCheckBox onlyCoreExpCheck = add(new FCheckBox(Localizer.getInstance().getMessage("lblUseOnlyCoreAndExpansionSets"), false));
private final FCheckBox onlyCoreExpCheck = add(new FCheckBox(Forge.getLocalizer().getMessage("lblUseOnlyCoreAndExpansionSets"), false));
private final FComboBox<String> monthDropdown = add(new FComboBox<>()); //don't need wrappers since skin can't change while this dialog is open
private final FComboBox<Integer> yearDropdown = add(new FComboBox<>());
@@ -64,10 +63,10 @@ public class FDeckImportDialog extends FDialog {
private boolean createNewDeckControl;
private final DeckImportController controller;
private final static ImmutableList<String> importOrCancel = ImmutableList.of(Localizer.getInstance().getMessage("lblImport"), Localizer.getInstance().getMessage("lblCancel"));
private final static ImmutableList<String> importOrCancel = ImmutableList.of(Forge.getLocalizer().getMessage("lblImport"), Forge.getLocalizer().getMessage("lblCancel"));
public FDeckImportDialog(final boolean replacingDeck, final FDeckEditor.EditorType editorType) {
super(Localizer.getInstance().getMessage("lblImportFromClipboard"), 2);
super(Forge.getLocalizer().getMessage("lblImportFromClipboard"), 2);
controller = new DeckImportController(dateTimeCheck, monthDropdown, yearDropdown, replacingDeck);
String contents = Forge.getClipboard().getContents();
if (contents == null)
@@ -92,7 +91,7 @@ public class FDeckImportDialog extends FDialog {
this.currentDeckIsEmpty = !replacingDeck;
this.createNewDeckControl = replacingDeck;
initButton(0, Localizer.getInstance().getMessage("lblImport"), new FEventHandler() {
initButton(0, Forge.getLocalizer().getMessage("lblImport"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
FThreads.invokeInBackgroundThread(new Runnable() {
@@ -116,7 +115,7 @@ public class FDeckImportDialog extends FDialog {
}
}
if (sb.length() > 0) {
if (SOptionPane.showOptionDialog(Localizer.getInstance().getMessage("lblFollowingCardsCannotBeImported") + "\n\n" + sb, Localizer.getInstance().getMessage("lblImportRemainingCards"), SOptionPane.INFORMATION_ICON, importOrCancel) == 1) {
if (SOptionPane.showOptionDialog(Forge.getLocalizer().getMessage("lblFollowingCardsCannotBeImported") + "\n\n" + sb, Forge.getLocalizer().getMessage("lblImportRemainingCards"), SOptionPane.INFORMATION_ICON, importOrCancel) == 1) {
return;
}
}
@@ -136,7 +135,7 @@ public class FDeckImportDialog extends FDialog {
});
}
});
initButton(1, Localizer.getInstance().getMessage("lblCancel"), new FEventHandler() {
initButton(1, Forge.getLocalizer().getMessage("lblCancel"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
hide();
@@ -186,7 +185,7 @@ public class FDeckImportDialog extends FDialog {
showOptions = false;
setButtonEnabled(0, false);
txtInput.setText(Localizer.getInstance().getMessage("lblNoKnownCardsOnClipboard"));
txtInput.setText(Forge.getLocalizer().getMessage("lblNoKnownCardsOnClipboard"));
}
private void setArtPreferenceInController() {

17
forge-gui-mobile/src/forge/deck/FDeckViewer.java
View File

@@ -19,7 +19,6 @@ import forge.screens.match.MatchController;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
public class FDeckViewer extends FScreen {
private static FDeckViewer deckViewer;
@@ -38,27 +37,27 @@ public class FDeckViewer extends FScreen {
switch (section) {
default:
case Main:
captionPrefix = Localizer.getInstance().getMessage("ttMain");
captionPrefix = Forge.getLocalizer().getMessage("ttMain");
icon = FDeckEditor.MAIN_DECK_ICON;
break;
case Sideboard:
captionPrefix = Localizer.getInstance().getMessage("lblSideboard");
captionPrefix = Forge.getLocalizer().getMessage("lblSideboard");
icon = FDeckEditor.SIDEBOARD_ICON;
break;
case Commander:
captionPrefix = Localizer.getInstance().getMessage("lblCommander");
captionPrefix = Forge.getLocalizer().getMessage("lblCommander");
icon = FSkinImage.COMMANDER;
break;
case Avatar:
captionPrefix = Localizer.getInstance().getMessage("lblAvatar");
captionPrefix = Forge.getLocalizer().getMessage("lblAvatar");
icon = new FTextureRegionImage(FSkin.getAvatars().get(0));
break;
case Planes:
captionPrefix = Localizer.getInstance().getMessage("lblPlanes");
captionPrefix = Forge.getLocalizer().getMessage("lblPlanes");
icon = FSkinImage.CHAOS;
break;
case Schemes:
captionPrefix = Localizer.getInstance().getMessage("lblSchemes");
captionPrefix = Forge.getLocalizer().getMessage("lblSchemes");
icon = FSkinImage.POISON;
break;
}
@@ -74,7 +73,7 @@ public class FDeckViewer extends FScreen {
}
addItem(item);
}
addItem(new FMenuItem(Localizer.getInstance().getMessage("btnCopyToClipboard"), Forge.hdbuttons ? FSkinImage.HDEXPORT : FSkinImage.BLANK, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("btnCopyToClipboard"), Forge.hdbuttons ? FSkinImage.HDEXPORT : FSkinImage.BLANK, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
copyDeckToClipboard(deckViewer.deck);
@@ -106,7 +105,7 @@ public class FDeckViewer extends FScreen {
}
Forge.getClipboard().setContents(deckList.toString());
FOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblDeckListCopiedClipboard", deck.getName()));
FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblDeckListCopiedClipboard", deck.getName()));
}
private final Deck deck;

20
forge-gui-mobile/src/forge/deck/FSideboardDialog.java
View File

@@ -2,6 +2,7 @@ package forge.deck;
import java.util.List;
import forge.Forge;
import org.apache.commons.lang3.StringUtils;
import forge.assets.FImage;
@@ -18,18 +19,17 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.GuiChoose;
import forge.util.Callback;
import forge.util.Localizer;
public class FSideboardDialog extends FDialog {
private final SideboardTabs tabs;
private final Callback<List<PaperCard>> callback;
public FSideboardDialog(CardPool sideboard, CardPool main, final Callback<List<PaperCard>> callback0, String message) {
super(String.format(Localizer.getInstance().getMessage("lblUpdateMainFromSideboard"), message), 1);
super(String.format(Forge.getLocalizer().getMessage("lblUpdateMainFromSideboard"), message), 1);
callback = callback0;
tabs = add(new SideboardTabs(sideboard, main));
initButton(0, Localizer.getInstance().getMessage("lblOK"), new FEventHandler() {
initButton(0, Forge.getLocalizer().getMessage("lblOK"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
hide();
@@ -130,7 +130,7 @@ public class FSideboardDialog extends FDialog {
callback.run(max);
}
else {
GuiChoose.getInteger(card + " - " + verb + " " + Localizer.getInstance().getMessage("lblHowMany"), 1, max, 20, callback);
GuiChoose.getInteger(card + " - " + verb + " " + Forge.getLocalizer().getMessage("lblHowMany"), 1, max, 20, callback);
}
}
}));
@@ -149,12 +149,12 @@ public class FSideboardDialog extends FDialog {
private static class SideboardPage extends TabPageBase {
protected SideboardPage(CardPool cardPool) {
super(cardPool, FDeckEditor.SIDEBOARD_ICON);
cardManager.setCaption(Localizer.getInstance().getMessage("lblSideboard"));
cardManager.setCaption(Forge.getLocalizer().getMessage("lblSideboard"));
}
@Override
protected void updateCaption() {
caption = Localizer.getInstance().getMessage("lblSideboard") + " (" + cardManager.getPool().countAll() + ")";
caption = Forge.getLocalizer().getMessage("lblSideboard") + " (" + cardManager.getPool().countAll() + ")";
}
@Override
@@ -165,7 +165,7 @@ public class FSideboardDialog extends FDialog {
@Override
protected void buildMenu(FDropDownMenu menu, final PaperCard card) {
addItem(menu, Localizer.getInstance().getMessage("lblMove"), Localizer.getInstance().getMessage("lblToMainDeck"), FDeckEditor.MAIN_DECK_ICON, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lblToMainDeck"), FDeckEditor.MAIN_DECK_ICON, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }
@@ -180,12 +180,12 @@ public class FSideboardDialog extends FDialog {
private static class MainDeckPage extends TabPageBase {
protected MainDeckPage(CardPool cardPool) {
super(cardPool, FDeckEditor.MAIN_DECK_ICON);
cardManager.setCaption(Localizer.getInstance().getMessage("ttMain"));
cardManager.setCaption(Forge.getLocalizer().getMessage("ttMain"));
}
@Override
protected void updateCaption() {
caption = Localizer.getInstance().getMessage("ttMain") + " (" + cardManager.getPool().countAll() + ")";
caption = Forge.getLocalizer().getMessage("ttMain") + " (" + cardManager.getPool().countAll() + ")";
}
@Override
@@ -196,7 +196,7 @@ public class FSideboardDialog extends FDialog {
@Override
protected void buildMenu(FDropDownMenu menu, final PaperCard card) {
addItem(menu, Localizer.getInstance().getMessage("lblMove"), Localizer.getInstance().getMessage("lbltosideboard"), FDeckEditor.SIDEBOARD_ICON, new Callback<Integer>() {
addItem(menu, Forge.getLocalizer().getMessage("lblMove"), Forge.getLocalizer().getMessage("lbltosideboard"), FDeckEditor.SIDEBOARD_ICON, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result == null || result <= 0) { return; }

3
forge-gui-mobile/src/forge/deck/FVanguardChooser.java
View File

@@ -10,7 +10,6 @@ import forge.toolbox.FButton;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Aggregates;
import forge.util.Localizer;
import forge.util.Utils;
public class FVanguardChooser extends FScreen {
@@ -39,7 +38,7 @@ public class FVanguardChooser extends FScreen {
}
private final CardManager lstVanguards = add(new CardManager(true));
private final FButton btnRandom = add(new FButton(Localizer.getInstance().getMessage("lblRandomVanguard")));
private final FButton btnRandom = add(new FButton(Forge.getLocalizer().getMessage("lblRandomVanguard")));
private boolean isAi;
public FVanguardChooser(boolean isAi0, FEventHandler selectionChangedHandler) {

3
forge-gui-mobile/src/forge/itemmanager/DeckManager.java
View File

@@ -23,7 +23,6 @@ import forge.itemmanager.filters.DeckFormatFilter;
import forge.itemmanager.filters.TextSearchFilter;
import forge.toolbox.FList;
import forge.toolbox.FList.CompactModeHandler;
import forge.util.Localizer;
import forge.util.Utils;
/**
@@ -41,7 +40,7 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
public DeckManager(final GameType gt) {
super(DeckProxy.class, true);
gameType = gt;
setCaption(Localizer.getInstance().getMessage("lblDecks"));
setCaption(Forge.getLocalizer().getMessage("lblDecks"));
}
public GameType getGameType() {

11
forge-gui-mobile/src/forge/itemmanager/ItemManager.java
View File

@@ -63,7 +63,6 @@ import forge.toolbox.FList;
import forge.toolbox.FList.CompactModeHandler;
import forge.util.ItemPool;
import forge.util.LayoutHelper;
import forge.util.Localizer;
public abstract class ItemManager<T extends InventoryItem> extends FContainer implements IItemManager<T>, ActivateHandler {
@@ -134,7 +133,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
add(btnAdvancedSearchOptions);
btnAdvancedSearchOptions.setSelected(!hideFilters);
if (allowSortChange()) {
cbxSortOptions = add(new FComboBox<>(Localizer.getInstance().getMessage("lblSort") + ": "));
cbxSortOptions = add(new FComboBox<>(Forge.getLocalizer().getMessage("lblSort") + ": "));
cbxSortOptions.setFont(FSkinFont.get(12));
}
else {
@@ -149,7 +148,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
FPopupMenu menu = new FPopupMenu() {
@Override
protected void buildMenu() {
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblAdvancedSearch"), Forge.hdbuttons ? FSkinImage.HDSEARCH : FSkinImage.SEARCH, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblAdvancedSearch"), Forge.hdbuttons ? FSkinImage.HDSEARCH : FSkinImage.SEARCH, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
if (advancedSearchFilter == null) {
@@ -159,7 +158,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
advancedSearchFilter.edit();
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblResetFilters"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblResetFilters"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
resetFilters();
@@ -270,7 +269,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
}
if (cbxSortOptions != null) {
cbxSortOptions.setText("(" + Localizer.getInstance().getMessage("lblNone") + ")");
cbxSortOptions.setText("(" + Forge.getLocalizer().getMessage("lblNone") + ")");
}
model.getCascadeManager().reset();
@@ -989,7 +988,7 @@ public abstract class ItemManager<T extends InventoryItem> extends FContainer im
@Override
public String getActivateAction(int index) {
if (contextMenuBuilder != null) {
return Localizer.getInstance().getMessage("lblSelectCard");
return Forge.getLocalizer().getMessage("lblSelectCard");
}
return null;
}

4
forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
View File

@@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.utils.Align;
import com.google.common.base.Function;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinFont;
@@ -19,7 +20,6 @@ import forge.itemmanager.filters.AdvancedSearchFilter;
import forge.itemmanager.filters.TextSearchFilter;
import forge.toolbox.FList;
import forge.toolbox.FList.CompactModeHandler;
import forge.util.Localizer;
public class SpellShopManager extends ItemManager<InventoryItem> {
@@ -30,7 +30,7 @@ public class SpellShopManager extends ItemManager<InventoryItem> {
fnGetPrice = isShop0 ? QuestSpellShop.fnPriceGet : QuestSpellShop.fnPriceSellGet;
if (!isShop0) {
setCaption(Localizer.getInstance().getMessage("lblCards"));
setCaption(Forge.getLocalizer().getMessage("lblCards"));
}
}

7
forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
View File

@@ -25,7 +25,6 @@ import forge.toolbox.FList;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.util.Callback;
import forge.util.Localizer;
public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
@@ -127,13 +126,13 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
item.setTextRenderer(new TextRenderer()); //ensure symbols are displayed
addItem(item);
}
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblEditExpression"), Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblEditExpression"), Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
edit();
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblRemoveFilter"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblRemoveFilter"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
reset();
@@ -177,7 +176,7 @@ public class AdvancedSearchFilter<T extends InventoryItem> extends ItemFilter<T>
});
private EditScreen() {
super(Localizer.getInstance().getMessage("lblAdvancedSearch"));
super(Forge.getLocalizer().getMessage("lblAdvancedSearch"));
Filter filter = new Filter();
model.addFilterControl(filter);
scroller.add(filter);

8
forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
View File

@@ -27,7 +27,6 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FGroupList;
import forge.toolbox.FList;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.TextUtil;
import forge.util.Utils;
@@ -41,14 +40,13 @@ public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T
public FormatFilter(ItemManager<? super T> itemManager0) {
super(itemManager0);
final Localizer localizer = Localizer.getInstance();
cbxFormats.setFont(FSkinFont.get(12));
cbxFormats.addItem(localizer.getMessage("lblAllSetsFormats"));
cbxFormats.addItem(Forge.getLocalizer().getMessage("lblAllSetsFormats"));
for (GameFormat format : FModel.getFormats().getFilterList()) {
cbxFormats.addItem(format);
}
cbxFormats.addItem(localizer.getMessage("lblOtherFormats"));
cbxFormats.addItem(localizer.getMessage("lblChooseSets"));
cbxFormats.addItem(Forge.getLocalizer().getMessage("lblOtherFormats"));
cbxFormats.addItem(Forge.getLocalizer().getMessage("lblChooseSets"));
selectedFormat = cbxFormats.getText();
cbxFormats.setChangedHandler(new FEventHandler() {

3
forge-gui-mobile/src/forge/itemmanager/filters/HistoricFormatSelect.java
View File

@@ -17,7 +17,6 @@ import forge.screens.settings.SettingsScreen;
import forge.toolbox.FGroupList;
import forge.toolbox.FList;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
/**
@@ -34,7 +33,7 @@ public class HistoricFormatSelect extends FScreen {
private Runnable onCloseCallBack;
public HistoricFormatSelect() {
super(Localizer.getInstance().getMessage("lblChooseFormat"));
super(Forge.getLocalizer().getMessage("lblChooseFormat"));
for (GameFormat.FormatType group:GameFormat.FormatType.values()){
if (group == GameFormat.FormatType.HISTORIC){
for (GameFormat.FormatSubType subgroup:GameFormat.FormatSubType.values()){

8
forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
View File

@@ -4,6 +4,7 @@ import com.badlogic.gdx.utils.Align;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinFont;
import forge.item.InventoryItem;
@@ -13,7 +14,6 @@ import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FTextField;
import forge.util.Localizer;
public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
@@ -79,10 +79,10 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
}
public String getCaption() {
return txtSearch.getGhostText().substring((Localizer.getInstance().getMessage("lblSearch") + " ").length());
return txtSearch.getGhostText().substring((Forge.getLocalizer().getMessage("lblSearch") + " ").length());
}
public void setCaption(String caption0) {
txtSearch.setGhostText(Localizer.getInstance().getMessage("lblSearch") + " " + caption0);
txtSearch.setGhostText(Forge.getLocalizer().getMessage("lblSearch") + " " + caption0);
}
protected class SearchField extends FTextField {
@@ -90,7 +90,7 @@ public class TextSearchFilter<T extends InventoryItem> extends ItemFilter<T> {
private SearchField() {
setFont(FONT);
setGhostText(Localizer.getInstance().getMessage("lblSearch"));
setGhostText(Forge.getLocalizer().getMessage("lblSearch"));
setHeight(getDefaultHeight(DEFAULT_FONT)); //set height based on default filter font
}

9
forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
View File

@@ -28,7 +28,6 @@ import forge.model.FModel;
import forge.toolbox.*;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.ImageUtil;
import forge.util.Localizer;
import forge.util.TextUtil;
import forge.util.Utils;
@@ -132,8 +131,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
}
}
private final ExpandCollapseButton btnExpandCollapseAll = new ExpandCollapseButton();
private final FComboBox<Object> cbGroupByOptions = new FComboBox<>(Localizer.getInstance().getMessage("lblGroups") + " ");
private final FComboBox<Object> cbPileByOptions = new FComboBox<>(Localizer.getInstance().getMessage("lblPiles") + " ");
private final FComboBox<Object> cbGroupByOptions = new FComboBox<>(Forge.getLocalizer().getMessage("lblGroups") + " ");
private final FComboBox<Object> cbPileByOptions = new FComboBox<>(Forge.getLocalizer().getMessage("lblPiles") + " ");
public ImageView(ItemManager<T> itemManager0, ItemManagerModel<T> model0) {
super(itemManager0, model0);
@@ -355,7 +354,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
otherItems = groups.get(groups.size() - 1);
}
else {
otherItems = new Group(Localizer.getInstance().getMessage("lblOther"));
otherItems = new Group(Forge.getLocalizer().getMessage("lblOther"));
otherItems.isCollapsed = btnExpandCollapseAll.isAllCollapsed;
groups.add(otherItems);
}
@@ -662,7 +661,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
@Override
public String getCaption() {
return Localizer.getInstance().getMessage("lblImageView");
return Forge.getLocalizer().getMessage("lblImageView");
}
@Override

4
forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
View File

@@ -25,6 +25,7 @@ import java.util.Map.Entry;
import com.badlogic.gdx.math.Rectangle;
import forge.Forge;
import forge.Graphics;
import forge.assets.FImage;
import forge.assets.FSkinColor;
@@ -40,7 +41,6 @@ import forge.itemmanager.ItemManagerModel;
import forge.toolbox.FCheckBox;
import forge.toolbox.FDisplayObject;
import forge.toolbox.FList;
import forge.util.Localizer;
public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
@@ -82,7 +82,7 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
@Override
public String getCaption() {
return Localizer.getInstance().getMessage("lblListView");
return Forge.getLocalizer().getMessage("lblListView");
}
@Override

7
forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java
View File

@@ -6,13 +6,12 @@ import forge.screens.match.views.VPrompt;
import forge.toolbox.FContainer;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
public abstract class MultiStepWizardScreen<T> extends FScreen {
protected final WizardStep<T>[] steps;
protected final T model;
private WizardStep<T> currentStep;
private final VPrompt prompt = add(new VPrompt(Localizer.getInstance().getMessage("lblBack"), Localizer.getInstance().getMessage("lblNext"), new FEventHandler() {
private final VPrompt prompt = add(new VPrompt(Forge.getLocalizer().getMessage("lblBack"), Forge.getLocalizer().getMessage("lblNext"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
advanceStep(-1);
@@ -80,7 +79,7 @@ public abstract class MultiStepWizardScreen<T> extends FScreen {
currentStep.setVisible(false);
if (currentStep.index == steps.length - 1) {
prompt.getBtnCancel().setText(Localizer.getInstance().getMessage("lblNext"));
prompt.getBtnCancel().setText(Forge.getLocalizer().getMessage("lblNext"));
}
}
@@ -89,7 +88,7 @@ public abstract class MultiStepWizardScreen<T> extends FScreen {
currentStep.setVisible(true);
prompt.getBtnOk().setEnabled(index > 0);
if (index == steps.length - 1) {
prompt.getBtnCancel().setText(Localizer.getInstance().getMessage("lblFinish"));
prompt.getBtnCancel().setText(Forge.getLocalizer().getMessage("lblFinish"));
}
prompt.setMessage(currentStep.getMessage());

5
forge-gui-mobile/src/forge/screens/SplashScreen.java
View File

@@ -18,7 +18,6 @@ import forge.toolbox.FButton;
import forge.toolbox.FContainer;
import forge.toolbox.FEvent;
import forge.toolbox.FProgressBar;
import forge.util.Localizer;
public class SplashScreen extends FContainer {
private TextureRegion background;
@@ -229,8 +228,8 @@ public class SplashScreen extends FContainer {
if (!init) {
init = true;
btnAdventure = new FButton(Localizer.getInstance().getMessageorUseDefault("lblAdventureMode", "Adventure Mode"));
btnHome = new FButton(Localizer.getInstance().getMessageorUseDefault("lblClassicMode", "Classic Mode"));
btnAdventure = new FButton(Forge.getLocalizer().getMessageorUseDefault("lblAdventureMode", "Adventure Mode"));
btnHome = new FButton(Forge.getLocalizer().getMessageorUseDefault("lblClassicMode", "Classic Mode"));
btnAdventure.setCommand(new FEvent.FEventHandler() {
@Override
public void handleEvent(FEvent e) {

3
forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java
View File

@@ -23,7 +23,6 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Localizer;
import forge.util.Utils;
public class AchievementsScreen extends FScreen {
@@ -50,7 +49,7 @@ public class AchievementsScreen extends FScreen {
private final TrophyCase trophyCase = add(new TrophyCase());
private AchievementsScreen() {
super(Localizer.getInstance().getMessage("lblAchievements"));
super(Forge.getLocalizer().getMessage("lblAchievements"));
AchievementCollection.buildComboBox(cbCollections);

3
forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java
View File

@@ -18,7 +18,6 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.Utils;
@@ -64,7 +63,7 @@ public class AvatarSelector extends FScreen {
};
private AvatarSelector(final String playerName, final int currentIndex0, final List<Integer> usedAvatars0, final Callback<Integer> callback0) {
super(Localizer.getInstance().getMessage("lblSelectAvatarFor").replace("%s",playerName));
super(Forge.getLocalizer().getMessage("lblSelectAvatarFor").replace("%s",playerName));
currentIndex = currentIndex0;
usedAvatars = usedAvatars0;

36
forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
View File

@@ -48,7 +48,6 @@ import forge.toolbox.FLabel;
import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.TextUtil;
import forge.util.Utils;
@@ -62,17 +61,16 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
// General variables
private GameLobby lobby;
private IPlayerChangeListener playerChangeListener = null;
final Localizer localizer = Localizer.getInstance();
private final FLabel lblPlayers = new FLabel.Builder().text(localizer.getMessage("lblPlayers") + ":").font(VARIANTS_FONT).build();
private final FLabel lblPlayers = new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblPlayers") + ":").font(VARIANTS_FONT).build();
private final FComboBox<Integer> cbPlayerCount;
private final Deck[] decks = new Deck[MAX_PLAYERS];
// Variants frame and variables
private final FLabel lblVariants = new FLabel.Builder().text(localizer.getMessage("lblVariants") + ":").font(VARIANTS_FONT).build();
private final FLabel lblVariants = new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblVariants") + ":").font(VARIANTS_FONT).build();
private final FComboBox<Object> cbVariants = new FComboBox<>();
// Max games in a match frame and variables
private final FLabel lblGamesInMatch = new FLabel.Builder().text(localizer.getMessage("lblMatch") + ":").font(VARIANTS_FONT).build();
private final FLabel lblGamesInMatch = new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblMatch") + ":").font(VARIANTS_FONT).build();
private final FComboBox<String> cbGamesInMatch = new FComboBox<>();
private final List<PlayerPanel> playerPanels = new ArrayList<>(MAX_PLAYERS);
@@ -149,7 +147,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
add(lblVariants);
add(cbVariants);
cbVariants.setFont(VARIANTS_FONT);
cbVariants.addItem("(" + localizer.getMessage("lblNone") + ")");
cbVariants.addItem("(" + Forge.getLocalizer().getMessage("lblNone") + ")");
cbVariants.addItem(GameType.Vanguard);
cbVariants.addItem(GameType.MomirBasic);
cbVariants.addItem(GameType.MoJhoSto);
@@ -160,7 +158,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
cbVariants.addItem(GameType.Planechase);
cbVariants.addItem(GameType.Archenemy);
cbVariants.addItem(GameType.ArchenemyRumble);
cbVariants.addItem(localizer.getMessage("lblMore"));
cbVariants.addItem(Forge.getLocalizer().getMessage("lblMore"));
cbVariants.setChangedHandler(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
@@ -191,12 +189,14 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
public void run() {
playerPanels.get(0).initialize(FPref.CONSTRUCTED_P1_DECK_STATE, FPref.COMMANDER_P1_DECK_STATE, FPref.OATHBREAKER_P1_DECK_STATE, FPref.TINY_LEADER_P1_DECK_STATE, FPref.BRAWL_P1_DECK_STATE, DeckType.PRECONSTRUCTED_DECK);
playerPanels.get(1).initialize(FPref.CONSTRUCTED_P2_DECK_STATE, FPref.COMMANDER_P2_DECK_STATE, FPref.OATHBREAKER_P2_DECK_STATE, FPref.TINY_LEADER_P2_DECK_STATE, FPref.BRAWL_P2_DECK_STATE, DeckType.COLOR_DECK);
try {
if (getNumPlayers() > 2) {
playerPanels.get(2).initialize(FPref.CONSTRUCTED_P3_DECK_STATE, FPref.COMMANDER_P3_DECK_STATE, FPref.OATHBREAKER_P3_DECK_STATE, FPref.TINY_LEADER_P3_DECK_STATE, FPref.BRAWL_P3_DECK_STATE, DeckType.COLOR_DECK);
}
if (getNumPlayers() > 3) {
playerPanels.get(3).initialize(FPref.CONSTRUCTED_P4_DECK_STATE, FPref.COMMANDER_P4_DECK_STATE, FPref.OATHBREAKER_P3_DECK_STATE, FPref.TINY_LEADER_P4_DECK_STATE, FPref.BRAWL_P4_DECK_STATE, DeckType.COLOR_DECK);
}
} catch (Exception e) {}
/*playerPanels.get(4).initialize(FPref.CONSTRUCTED_P5_DECK_STATE, DeckType.COLOR_DECK);
playerPanels.get(5).initialize(FPref.CONSTRUCTED_P6_DECK_STATE, DeckType.COLOR_DECK);
playerPanels.get(6).initialize(FPref.CONSTRUCTED_P7_DECK_STATE, DeckType.COLOR_DECK);
@@ -341,7 +341,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(localizer.getMessage("lblLoadingNewGame"), startGame);
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), startGame);
}
});
}
@@ -403,7 +403,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
// Name
String prefName = prefs.getPref(FPref.PLAYER_NAME);
playerPanels.get(0).setPlayerName(StringUtils.isBlank(prefName) ? Localizer.getInstance().getMessage("lblHuman") : prefName);
playerPanels.get(0).setPlayerName(StringUtils.isBlank(prefName) ? Forge.getLocalizer().getInstance().getMessage("lblHuman") : prefName);
}
List<Integer> getUsedAvatars() {
@@ -451,7 +451,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
private final FList<Variant> lstVariants = add(new FList<>());
private MultiVariantSelect() {
super(Localizer.getInstance().getMessage("lblSelectVariants"));
super(Forge.getLocalizer().getInstance().getMessage("lblSelectVariants"));
lstVariants.setListItemRenderer(new VariantRenderer());
lstVariants.addItem(new Variant(GameType.Vanguard));
@@ -697,7 +697,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
deck = playerPanel.getCommanderDeck();
if (deck != null) {
playerPanel.getCommanderDeckChooser().saveState();
deckName = localizer.getMessage("lblCommanderDeck") + ": "
deckName = Forge.getLocalizer().getMessage("lblCommanderDeck") + ": "
+ playerPanel.getCommanderDeckChooser().getDeck().getName();
}
}
@@ -705,7 +705,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
deck = playerPanel.getOathbreakerDeck();
if (deck != null) {
playerPanel.getOathbreakerDeckChooser().saveState();
deckName = localizer.getMessage("lblOathbreakerDeck") + ": "
deckName = Forge.getLocalizer().getMessage("lblOathbreakerDeck") + ": "
+ playerPanel.getOathbreakerDeckChooser().getDeck().getName();
}
}
@@ -713,7 +713,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
deck = playerPanel.getTinyLeadersDeck();
if (deck != null) {
playerPanel.getTinyLeadersDeckChooser().saveState();
deckName = localizer.getMessage("lblTinyLeadersDeck") + ": "
deckName = Forge.getLocalizer().getMessage("lblTinyLeadersDeck") + ": "
+ playerPanel.getTinyLeadersDeckChooser().getDeck().getName();
}
}
@@ -721,7 +721,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
deck = playerPanel.getBrawlDeck();
if (deck != null) {
playerPanel.getBrawlDeckChooser().saveState();
deckName = localizer.getMessage("lblBrawlDeck") + ": "
deckName = Forge.getLocalizer().getMessage("lblBrawlDeck") + ": "
+ playerPanel.getBrawlDeckChooser().getDeck().getName();
}
}else {
@@ -749,7 +749,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
}
playerDeck.putSection(DeckSection.Schemes, playerPanel.getSchemeDeck().get(DeckSection.Schemes));
if (!playerPanel.getSchemeDeck().getName().isEmpty()) {
SchemeDeckName = localizer.getMessage("lblSchemeDeck") + ": " + playerPanel.getSchemeDeck().getName();
SchemeDeckName = Forge.getLocalizer().getMessage("lblSchemeDeck") + ": " + playerPanel.getSchemeDeck().getName();
playerPanel.setSchemeDeckName(SchemeDeckName);
}
}
@@ -759,7 +759,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
}
playerDeck.putSection(DeckSection.Planes, playerPanel.getPlanarDeck().get(DeckSection.Planes));
if(!playerPanel.getPlanarDeck().getName().isEmpty()) {
PlanarDeckname = localizer.getMessage("lblPlanarDeck") + ": " + playerPanel.getPlanarDeck().getName();
PlanarDeckname = Forge.getLocalizer().getMessage("lblPlanarDeck") + ": " + playerPanel.getPlanarDeck().getName();
playerPanel.setPlanarDeckName(PlanarDeckname);
}
}
@@ -770,7 +770,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
CardPool avatarPool = new CardPool();
avatarPool.add(playerPanel.getVanguardAvatar());
playerDeck.putSection(DeckSection.Avatar, avatarPool);
VanguardAvatar = localizer.getMessage("lblVanguard") + ": " + playerPanel.getVanguardAvatar().getName();
VanguardAvatar = Forge.getLocalizer().getMessage("lblVanguard") + ": " + playerPanel.getVanguardAvatar().getName();
playerPanel.setVanguarAvatarName(VanguardAvatar);
}
@@ -808,7 +808,7 @@ public abstract class LobbyScreen extends LaunchScreen implements ILobbyView {
if (ready) {
updateDeck(index);
if (decks[index] == null) {
FOptionPane.showErrorDialog(localizer.getMessage("msgSelectAdeckBeforeReadying"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("msgSelectAdeckBeforeReadying"));
update(false);
return;
}

93
forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
View File

@@ -42,7 +42,6 @@ import forge.toolbox.FTextField;
import forge.toolbox.FToggleSwitch;
import forge.util.Callback;
import forge.util.Lang;
import forge.util.Localizer;
import forge.util.NameGenerator;
import forge.util.TextUtil;
import forge.util.Utils;
@@ -63,23 +62,21 @@ public class PlayerPanel extends FContainer {
private final FLabel avatarLabel = new FLabel.Builder().opaque(true).iconScaleFactor(0.99f).selectable().alphaComposite(1).iconInBackground(true).build();
private final FLabel sleeveLabel = new FLabel.Builder().opaque(true).iconScaleFactor(0.99f).selectable().alphaComposite(1).iconInBackground(true).build();
private int avatarIndex, sleeveIndex;
final Localizer localizer = Localizer.getInstance();
private final FTextField txtPlayerName = new FTextField(localizer.getMessage("lblPlayerName"));
private final FTextField txtPlayerName = new FTextField(Forge.getLocalizer().getMessage("lblPlayerName"));
private final FToggleSwitch humanAiSwitch;
private final FToggleSwitch devModeSwitch;
private FComboBox<Object> cbTeam = new FComboBox<>();
private FComboBox<Object> cbArchenemyTeam = new FComboBox<>();
private final FLabel btnDeck = new FLabel.ButtonBuilder().text(localizer.getMessage("lblLoadingDeck")).build();
private final FLabel btnSchemeDeck = new FLabel.ButtonBuilder().text(localizer.getMessage("lblSchemeDeckRandomGenerated")).build();
private final FLabel btnCommanderDeck = new FLabel.ButtonBuilder().text(localizer.getMessage("lblCommanderDeckRandomGenerated")).build();
private final FLabel btnOathbreakDeck = new FLabel.ButtonBuilder().text(localizer.getMessage("lblOathbreakerDeckRandomGenerated")).build();
private final FLabel btnTinyLeadersDeck = new FLabel.ButtonBuilder().text(localizer.getMessage("lblTinyLeadersDeckRandomGenerated")).build();
private final FLabel btnBrawlDeck = new FLabel.ButtonBuilder().text(localizer.getMessage("lblBrawlDeckRandomGenerated")).build();
private final FLabel btnPlanarDeck = new FLabel.ButtonBuilder().text(localizer.getMessage("lblPlanarDeckRandomGenerated")).build();
private final FLabel btnVanguardAvatar = new FLabel.ButtonBuilder().text(localizer.getMessage("lblVanguardAvatarRandom")).build();
private final FLabel btnDeck = new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblLoadingDeck")).build();
private final FLabel btnSchemeDeck = new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblSchemeDeckRandomGenerated")).build();
private final FLabel btnCommanderDeck = new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblCommanderDeckRandomGenerated")).build();
private final FLabel btnOathbreakDeck = new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblOathbreakerDeckRandomGenerated")).build();
private final FLabel btnTinyLeadersDeck = new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblTinyLeadersDeckRandomGenerated")).build();
private final FLabel btnBrawlDeck = new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblBrawlDeckRandomGenerated")).build();
private final FLabel btnPlanarDeck = new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblPlanarDeckRandomGenerated")).build();
private final FLabel btnVanguardAvatar = new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblVanguardAvatarRandom")).build();
private final FDeckChooser deckChooser, lstSchemeDecks, lstCommanderDecks, lstOathbreakerDecks, lstTinyLeadersDecks, lstBrawlDecks, lstPlanarDecks;
private final FVanguardChooser lstVanguardAvatars;
@@ -89,10 +86,10 @@ public class PlayerPanel extends FContainer {
screen = screen0;
allowNetworking = allowNetworking0;
if (allowNetworking) {
humanAiSwitch = new FToggleSwitch(localizer.getMessage("lblNotReady"), localizer.getMessage("lblReady"));
humanAiSwitch = new FToggleSwitch(Forge.getLocalizer().getMessage("lblNotReady"), Forge.getLocalizer().getMessage("lblReady"));
}
else {
humanAiSwitch = new FToggleSwitch(localizer.getMessage("lblHuman"), localizer.getMessage("lblAI"));
humanAiSwitch = new FToggleSwitch(Forge.getLocalizer().getMessage("lblHuman"), Forge.getLocalizer().getMessage("lblAI"));
}
index = index0;
populateTeamsComboBoxes();
@@ -103,7 +100,7 @@ public class PlayerPanel extends FContainer {
setAvatarIndex(slot.getAvatarIndex());
setSleeveIndex(slot.getSleeveIndex());
devModeSwitch = new FToggleSwitch(localizer.getMessage("lblNormal"), localizer.getMessage("lblDevMode"));
devModeSwitch = new FToggleSwitch(Forge.getLocalizer().getMessage("lblNormal"), Forge.getLocalizer().getMessage("lblDevMode"));
devModeSwitch.setVisible(isNetworkHost());
cbTeam.setEnabled(true);
@@ -126,14 +123,14 @@ public class PlayerPanel extends FContainer {
@Override
public void handleEvent(FEvent e) {
if( ((DeckManager)e.getSource()).getSelectedItem() != null) {
btnCommanderDeck.setText(localizer.getMessage("lblCommanderDeck")
btnCommanderDeck.setText(Forge.getLocalizer().getMessage("lblCommanderDeck")
+ ":" + (Forge.isLandscapeMode() ? " " : "\n") + ((DeckManager) e.getSource()).getSelectedItem().getName());
lstCommanderDecks.saveState();
if (allowNetworking && btnCommanderDeck.isEnabled() && humanAiSwitch.isToggled()) {
screen.updateMyDeck(index);
}
}else{
btnCommanderDeck.setText(localizer.getMessage("lblCommanderDeck"));
btnCommanderDeck.setText(Forge.getLocalizer().getMessage("lblCommanderDeck"));
}
}
});
@@ -141,14 +138,14 @@ public class PlayerPanel extends FContainer {
@Override
public void handleEvent(FEvent e) {
if( ((DeckManager)e.getSource()).getSelectedItem() != null) {
btnOathbreakDeck.setText(localizer.getMessage("lblOathbreakerDeck")
btnOathbreakDeck.setText(Forge.getLocalizer().getMessage("lblOathbreakerDeck")
+ ":" + (Forge.isLandscapeMode() ? " " : "\n") + ((DeckManager) e.getSource()).getSelectedItem().getName());
lstOathbreakerDecks.saveState();
if (allowNetworking && btnOathbreakDeck.isEnabled() && humanAiSwitch.isToggled()) {
screen.updateMyDeck(index);
}
}else{
btnOathbreakDeck.setText(localizer.getMessage("lblOathbreakerDeck"));
btnOathbreakDeck.setText(Forge.getLocalizer().getMessage("lblOathbreakerDeck"));
}
}
});
@@ -156,14 +153,14 @@ public class PlayerPanel extends FContainer {
@Override
public void handleEvent(FEvent e) {
if( ((DeckManager)e.getSource()).getSelectedItem() != null) {
btnTinyLeadersDeck.setText(localizer.getMessage("lblTinyLeadersDeck")
btnTinyLeadersDeck.setText(Forge.getLocalizer().getMessage("lblTinyLeadersDeck")
+ ":" + (Forge.isLandscapeMode() ? " " : "\n") + ((DeckManager) e.getSource()).getSelectedItem().getName());
lstTinyLeadersDecks.saveState();
if (allowNetworking && btnTinyLeadersDeck.isEnabled() && humanAiSwitch.isToggled()) {
screen.updateMyDeck(index);
}
}else{
btnTinyLeadersDeck.setText(localizer.getMessage("lblTinyLeadersDeck"));
btnTinyLeadersDeck.setText(Forge.getLocalizer().getMessage("lblTinyLeadersDeck"));
}
}
});
@@ -171,14 +168,14 @@ public class PlayerPanel extends FContainer {
@Override
public void handleEvent(FEvent e) {
if( ((DeckManager)e.getSource()).getSelectedItem() != null) {
btnBrawlDeck.setText(localizer.getMessage("lblBrawlDeck")
btnBrawlDeck.setText(Forge.getLocalizer().getMessage("lblBrawlDeck")
+ ":" + (Forge.isLandscapeMode() ? " " : "\n") + ((DeckManager) e.getSource()).getSelectedItem().getName());
lstBrawlDecks.saveState();
if (allowNetworking && btnBrawlDeck.isEnabled() && humanAiSwitch.isToggled()) {
screen.updateMyDeck(index);
}
}else{
btnBrawlDeck.setText(localizer.getMessage("lblBrawlDeck"));
btnBrawlDeck.setText(Forge.getLocalizer().getMessage("lblBrawlDeck"));
}
}
});
@@ -186,13 +183,13 @@ public class PlayerPanel extends FContainer {
@Override
public void handleEvent(FEvent e) {
if( ((DeckManager)e.getSource()).getSelectedItem() != null){
btnSchemeDeck.setText(localizer.getMessage("lblSchemeDeck")
btnSchemeDeck.setText(Forge.getLocalizer().getMessage("lblSchemeDeck")
+ ":" + (Forge.isLandscapeMode() ? " " : "\n") + ((DeckManager)e.getSource()).getSelectedItem().getName());
if (allowNetworking && btnSchemeDeck.isEnabled() && humanAiSwitch.isToggled()) {
screen.updateMyDeck(index);
}
}else{
btnSchemeDeck.setText(localizer.getMessage("lblSchemeDeck"));
btnSchemeDeck.setText(Forge.getLocalizer().getMessage("lblSchemeDeck"));
}
}
});
@@ -200,20 +197,20 @@ public class PlayerPanel extends FContainer {
@Override
public void handleEvent(FEvent e) {
if( ((DeckManager)e.getSource()).getSelectedItem() != null){
btnPlanarDeck.setText(localizer.getMessage("lblPlanarDeck")
btnPlanarDeck.setText(Forge.getLocalizer().getMessage("lblPlanarDeck")
+ ":" + (Forge.isLandscapeMode() ? " " : "\n") + ((DeckManager)e.getSource()).getSelectedItem().getName());
if (allowNetworking && btnPlanarDeck.isEnabled() && humanAiSwitch.isToggled()) {
screen.updateMyDeck(index);
}
}else{
btnPlanarDeck.setText(localizer.getMessage("lblPlanarDeck"));
btnPlanarDeck.setText(Forge.getLocalizer().getMessage("lblPlanarDeck"));
}
}
});
lstVanguardAvatars = new FVanguardChooser(isAi, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
btnVanguardAvatar.setText(localizer.getMessage("lblVanguard")
btnVanguardAvatar.setText(Forge.getLocalizer().getMessage("lblVanguard")
+ ":" + (Forge.isLandscapeMode() ? " " : "\n") + ((CardManager)e.getSource()).getSelectedItem().getName());
if (allowNetworking && btnVanguardAvatar.isEnabled() && humanAiSwitch.isToggled()) {
screen.updateMyDeck(index);
@@ -228,7 +225,7 @@ public class PlayerPanel extends FContainer {
add(sleeveLabel);
createNameEditor();
add(newLabel(localizer.getMessage("lblName") + ":"));
add(newLabel(Forge.getLocalizer().getMessage("lblName") + ":"));
add(txtPlayerName);
nameRandomiser = createNameRandomizer();
@@ -237,7 +234,7 @@ public class PlayerPanel extends FContainer {
humanAiSwitch.setChangedHandler(humanAiSwitched);
add(humanAiSwitch);
add(newLabel(localizer.getMessage("lblTeam") + ":"));
add(newLabel(Forge.getLocalizer().getMessage("lblTeam") + ":"));
cbTeam.setChangedHandler(teamChangedHandler);
cbArchenemyTeam.setChangedHandler(teamChangedHandler);
add(cbTeam);
@@ -251,7 +248,7 @@ public class PlayerPanel extends FContainer {
btnDeck.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
deckChooser.setHeaderCaption(localizer.getMessage("lblSelectDeckFor").replace("%s", txtPlayerName.getText()));
deckChooser.setHeaderCaption(Forge.getLocalizer().getMessage("lblSelectDeckFor").replace("%s", txtPlayerName.getText()));
Forge.openScreen(deckChooser);
}
});
@@ -259,7 +256,7 @@ public class PlayerPanel extends FContainer {
btnCommanderDeck.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
lstCommanderDecks.setHeaderCaption(localizer.getMessage("lblSelectCommanderDeckFor").replace("%s", txtPlayerName.getText()));
lstCommanderDecks.setHeaderCaption(Forge.getLocalizer().getMessage("lblSelectCommanderDeckFor").replace("%s", txtPlayerName.getText()));
Forge.openScreen(lstCommanderDecks);
}
});
@@ -267,7 +264,7 @@ public class PlayerPanel extends FContainer {
btnOathbreakDeck.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
lstOathbreakerDecks.setHeaderCaption(localizer.getMessage("lblSelectOathbreakerDeckFor").replace("%s", txtPlayerName.getText()));
lstOathbreakerDecks.setHeaderCaption(Forge.getLocalizer().getMessage("lblSelectOathbreakerDeckFor").replace("%s", txtPlayerName.getText()));
Forge.openScreen(lstOathbreakerDecks);
}
});
@@ -275,7 +272,7 @@ public class PlayerPanel extends FContainer {
btnTinyLeadersDeck.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
lstTinyLeadersDecks.setHeaderCaption(localizer.getMessage("lblSelectTinyLeadersDeckFor").replace("%s", txtPlayerName.getText()));
lstTinyLeadersDecks.setHeaderCaption(Forge.getLocalizer().getMessage("lblSelectTinyLeadersDeckFor").replace("%s", txtPlayerName.getText()));
Forge.openScreen(lstTinyLeadersDecks);
}
});
@@ -283,7 +280,7 @@ public class PlayerPanel extends FContainer {
btnBrawlDeck.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
lstBrawlDecks.setHeaderCaption(localizer.getMessage("lblSelectBrawlDeckFor").replace("%s", txtPlayerName.getText()));
lstBrawlDecks.setHeaderCaption(Forge.getLocalizer().getMessage("lblSelectBrawlDeckFor").replace("%s", txtPlayerName.getText()));
Forge.openScreen(lstBrawlDecks);
}
});
@@ -291,7 +288,7 @@ public class PlayerPanel extends FContainer {
btnSchemeDeck.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
lstSchemeDecks.setHeaderCaption(localizer.getMessage("lblSelectSchemeDeckFor").replace("%s", txtPlayerName.getText()));
lstSchemeDecks.setHeaderCaption(Forge.getLocalizer().getMessage("lblSelectSchemeDeckFor").replace("%s", txtPlayerName.getText()));
Forge.openScreen(lstSchemeDecks);
}
});
@@ -299,7 +296,7 @@ public class PlayerPanel extends FContainer {
btnPlanarDeck.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
lstPlanarDecks.setHeaderCaption(localizer.getMessage("lblSelectPlanarDeckFor").replace("%s", txtPlayerName.getText()));
lstPlanarDecks.setHeaderCaption(Forge.getLocalizer().getMessage("lblSelectPlanarDeckFor").replace("%s", txtPlayerName.getText()));
Forge.openScreen(lstPlanarDecks);
}
});
@@ -307,7 +304,7 @@ public class PlayerPanel extends FContainer {
btnVanguardAvatar.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
lstVanguardAvatars.setHeaderCaption(localizer.getMessage("lblSelectVanguardFor").replace("%s", txtPlayerName.getText()));
lstVanguardAvatars.setHeaderCaption(Forge.getLocalizer().getMessage("lblSelectVanguardFor").replace("%s", txtPlayerName.getText()));
Forge.openScreen(lstVanguardAvatars);
}
});
@@ -763,11 +760,11 @@ public class PlayerPanel extends FContainer {
}
private void populateTeamsComboBoxes() {
cbArchenemyTeam.addItem(localizer.getMessage("lblArchenemy"));
cbArchenemyTeam.addItem(localizer.getMessage("lblHeroes"));
cbArchenemyTeam.addItem(Forge.getLocalizer().getMessage("lblArchenemy"));
cbArchenemyTeam.addItem(Forge.getLocalizer().getMessage("lblHeroes"));
for (int i = 1; i <= LobbyScreen.MAX_PLAYERS; i++) {
cbTeam.addItem(localizer.getMessage("lblTeam") + " " + i);
cbTeam.addItem(Forge.getLocalizer().getMessage("lblTeam") + " " + i);
}
cbTeam.setEnabled(mayEdit);
}
@@ -839,7 +836,7 @@ public class PlayerPanel extends FContainer {
if (index == 0) {
name = FModel.getPreferences().getPref(FPref.PLAYER_NAME);
if (name.isEmpty()) {
name = localizer.getMessage("lblHuman");
name = Forge.getLocalizer().getMessage("lblHuman");
}
}
else {
@@ -1073,11 +1070,11 @@ public class PlayerPanel extends FContainer {
return new FLabel.Builder().text(title).font(LABEL_FONT).align(Align.right).build();
}
private static final ImmutableList<String> genderOptions = ImmutableList.of(Localizer.getInstance().getMessage("lblMale"), Localizer.getInstance().getMessage("lblFemale"), Localizer.getInstance().getMessage("lblAny"));
private static final ImmutableList<String> typeOptions = ImmutableList.of(Localizer.getInstance().getMessage("lblFantasy"), Localizer.getInstance().getMessage("lblGeneric"), Localizer.getInstance().getMessage("lblAny"));
private static final ImmutableList<String> genderOptions = ImmutableList.of(Forge.getLocalizer().getInstance().getMessage("lblMale"), Forge.getLocalizer().getInstance().getMessage("lblFemale"), Forge.getLocalizer().getInstance().getMessage("lblAny"));
private static final ImmutableList<String> typeOptions = ImmutableList.of(Forge.getLocalizer().getInstance().getMessage("lblFantasy"), Forge.getLocalizer().getInstance().getMessage("lblGeneric"), Forge.getLocalizer().getInstance().getMessage("lblAny"));
private final void getNewName(final Callback<String> callback) {
final String title = localizer.getMessage("lblGetNewRandomName");
final String message = localizer.getMessage("lbltypeofName");
final String title = Forge.getLocalizer().getMessage("lblGetNewRandomName");
final String message = Forge.getLocalizer().getMessage("lbltypeofName");
final FSkinImage icon = FOptionPane.QUESTION_ICON;
FOptionPane.showOptionDialog(message, title, icon, genderOptions, 2, new Callback<Integer>() {
@@ -1105,8 +1102,8 @@ public class PlayerPanel extends FContainer {
private void generateRandomName(final String gender, final String type, final List<String> usedNames, final String title, final Callback<String> callback) {
final String newName = NameGenerator.getRandomName(gender, type, usedNames);
String confirmMsg = localizer.getMessage("lblconfirmName").replace("%s", newName);
FOptionPane.showConfirmDialog(confirmMsg, title, localizer.getMessage("lblUseThisName"), localizer.getMessage("lblTryAgain"), true, new Callback<Boolean>() {
String confirmMsg = Forge.getLocalizer().getMessage("lblconfirmName").replace("%s", newName);
FOptionPane.showConfirmDialog(confirmMsg, title, Forge.getLocalizer().getMessage("lblUseThisName"), Forge.getLocalizer().getMessage("lblTryAgain"), true, new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {

3
forge-gui-mobile/src/forge/screens/constructed/SleevesSelector.java
View File

@@ -18,7 +18,6 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.Utils;
@@ -64,7 +63,7 @@ public class SleevesSelector extends FScreen {
};
private SleevesSelector(final String playerName, final int currentIndex0, final List<Integer> usedSleeves0, final Callback<Integer> callback0) {
super(Localizer.getInstance().getMessage("lblSelectSleevesFroPlayer", playerName));
super(Forge.getLocalizer().getMessage("lblSelectSleevesFroPlayer", playerName));
currentIndex = currentIndex0;
usedSleeves = usedSleeves0;

24
forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java
View File

@@ -9,6 +9,7 @@ import java.util.List;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
@@ -35,7 +36,6 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
@@ -45,9 +45,9 @@ public class LoadGauntletScreen extends LaunchScreen {
private static final FSkinColor SEL_COLOR = FSkinColor.get(Colors.CLR_ACTIVE);
private final GauntletFileLister lstGauntlets = add(new GauntletFileLister());
private final FButton btnNewGauntlet = add(new FButton(Localizer.getInstance().getMessage("lblNewQuest")));
private final FButton btnRenameGauntlet = add(new FButton(Localizer.getInstance().getMessage("lblRename")));
private final FButton btnDeleteGauntlet = add(new FButton(Localizer.getInstance().getMessage("lblDelete")));
private final FButton btnNewGauntlet = add(new FButton(Forge.getLocalizer().getMessage("lblNewQuest")));
private final FButton btnRenameGauntlet = add(new FButton(Forge.getLocalizer().getMessage("lblRename")));
private final FButton btnDeleteGauntlet = add(new FButton(Forge.getLocalizer().getMessage("lblDelete")));
public LoadGauntletScreen() {
super(null, LoadGameMenu.getMenu());
@@ -117,14 +117,14 @@ public class LoadGauntletScreen extends LaunchScreen {
protected void startMatch() {
final GauntletData gauntlet = lstGauntlets.getSelectedGauntlet();
if (gauntlet == null) {
FOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblYouMustCreateAndSelectGauntlet"));
FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblYouMustCreateAndSelectGauntlet"));
return;
}
FModel.setGauntletData(gauntlet);
Deck userDeck = gauntlet.getUserDeck();
if (userDeck == null) {
//give user a chance to select a deck if none saved with gauntlet
FDeckChooser.promptForDeck(Localizer.getInstance().getMessage("lblSelectGauntletDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectGauntletDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
@Override
public void run(Deck result) {
if (result != null) {
@@ -136,7 +136,7 @@ public class LoadGauntletScreen extends LaunchScreen {
return;
}
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingNewGame"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
final GauntletData gauntlet = FModel.getGauntletData();
@@ -158,14 +158,14 @@ public class LoadGauntletScreen extends LaunchScreen {
String gauntletName;
String oldGauntletName = gauntlet.getName();
while (true) {
gauntletName = SOptionPane.showInputDialog(Localizer.getInstance().getMessage("lblEnterNewGauntletGameName"), Localizer.getInstance().getMessage("lblRenameGauntlet"), null, oldGauntletName);
gauntletName = SOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblEnterNewGauntletGameName"), Forge.getLocalizer().getMessage("lblRenameGauntlet"), null, oldGauntletName);
if (gauntletName == null) { return; }
gauntletName = QuestUtil.cleanString(gauntletName);
if (gauntletName.equals(oldGauntletName)) { return; } //quit if chose same name
if (gauntletName.isEmpty()) {
SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblPleaseSpecifyGauntletName"));
SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblPleaseSpecifyGauntletName"));
continue;
}
@@ -177,7 +177,7 @@ public class LoadGauntletScreen extends LaunchScreen {
}
}
if (exists) {
SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblGauntletNameExistsPleasePickAnotherName"));
SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblGauntletNameExistsPleasePickAnotherName"));
continue;
}
break;
@@ -202,8 +202,8 @@ public class LoadGauntletScreen extends LaunchScreen {
@Override
public void run() {
if (!SOptionPane.showConfirmDialog(
Localizer.getInstance().getMessage("lblAreYouSuerDeleteGauntlet", gauntlet.getName()),
Localizer.getInstance().getMessage("lblDeleteGauntlet"), Localizer.getInstance().getMessage("lblDelete"), Localizer.getInstance().getMessage("lblCancel"))) {
Forge.getLocalizer().getMessage("lblAreYouSuerDeleteGauntlet", gauntlet.getName()),
Forge.getLocalizer().getMessage("lblDeleteGauntlet"), Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblCancel"))) {
return;
}

38
forge-gui-mobile/src/forge/screens/gauntlet/NewGauntletScreen.java
View File

@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import forge.Forge;
import forge.assets.FSkinFont;
import forge.deck.Deck;
import forge.deck.DeckType;
@@ -23,18 +24,15 @@ import forge.toolbox.FTextArea;
import forge.toolbox.GuiChoose;
import forge.toolbox.ListChooser;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
public class NewGauntletScreen extends LaunchScreen {
private static final float PADDING = Utils.scale(10);
private final Localizer localizer = Localizer.getInstance();
private final FTextArea lblDesc = add(new FTextArea(false,
localizer.getMessage("lblGauntletText1") + "\n\n" +
localizer.getMessage("lblGauntletText2") + "\n\n" +
localizer.getMessage("lblGauntletText3")));
Forge.getLocalizer().getMessage("lblGauntletText1") + "\n\n" +
Forge.getLocalizer().getMessage("lblGauntletText2") + "\n\n" +
Forge.getLocalizer().getMessage("lblGauntletText3")));
public NewGauntletScreen() {
super(null, NewGameMenu.getMenu());
@@ -54,18 +52,18 @@ public class NewGauntletScreen extends LaunchScreen {
@Override
protected void startMatch() {
GuiChoose.oneOrNone(localizer.getMessage("lblSelectGauntletType"), new String[] {
localizer.getMessage("lblQuickGauntlet"),
localizer.getMessage("lblCustomGauntlet"),
localizer.getMessage("lblGauntletContest"),
GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectGauntletType"), new String[] {
Forge.getLocalizer().getMessage("lblQuickGauntlet"),
Forge.getLocalizer().getMessage("lblCustomGauntlet"),
Forge.getLocalizer().getMessage("lblGauntletContest"),
}, new Callback<String>() {
@Override
public void run(String result) {
if (result == null) { return; }
if (localizer.getMessage("lblQuickGauntlet").equals(result)) {
if (Forge.getLocalizer().getMessage("lblQuickGauntlet").equals(result)) {
createQuickGauntlet();
} else if(localizer.getMessage("lblCustomGauntlet").equals(result)) {
} else if(Forge.getLocalizer().getMessage("lblCustomGauntlet").equals(result)) {
createCustomGauntlet();
} else {
createGauntletContest();
@@ -75,13 +73,13 @@ public class NewGauntletScreen extends LaunchScreen {
}
private void createQuickGauntlet() {
GuiChoose.getInteger(localizer.getMessage("lblHowManyOpponents"), 3, 50, new Callback<Integer>() {
GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, new Callback<Integer>() {
@Override
public void run(final Integer numOpponents) {
if (numOpponents == null) { return; }
ListChooser<DeckType> chooser = new ListChooser<>(
localizer.getMessage("lblChooseAllowedDeckTypeOpponents"), 0, 11, Arrays.asList(DeckType.CUSTOM_DECK,
Forge.getLocalizer().getMessage("lblChooseAllowedDeckTypeOpponents"), 0, 11, Arrays.asList(DeckType.CUSTOM_DECK,
DeckType.PRECONSTRUCTED_DECK,
DeckType.QUEST_OPPONENT_DECK,
DeckType.COLOR_DECK,
@@ -100,7 +98,7 @@ public class NewGauntletScreen extends LaunchScreen {
return;
}
FDeckChooser.promptForDeck(localizer.getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
@Override
public void run(Deck userDeck) {
if (userDeck == null) {
@@ -119,7 +117,7 @@ public class NewGauntletScreen extends LaunchScreen {
}
private void createCustomGauntlet() {
GuiChoose.getInteger(localizer.getMessage("lblHowManyOpponents"), 3, 50, new Callback<Integer>() {
GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"), 3, 50, new Callback<Integer>() {
@Override
public void run(final Integer numOpponents) {
if (numOpponents == null) { return; }
@@ -133,7 +131,7 @@ public class NewGauntletScreen extends LaunchScreen {
private void promptForAiDeck(final GauntletData gauntlet, final int numOpponents) {
final int opponentNum = gauntlet.getDecks().size() + 1;
FDeckChooser.promptForDeck(localizer.getMessage("lblSelectDeckForOpponent") + " " + opponentNum + " / " + numOpponents, GameType.Gauntlet, true, new Callback<Deck>() {
FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectDeckForOpponent") + " " + opponentNum + " / " + numOpponents, GameType.Gauntlet, true, new Callback<Deck>() {
@Override
public void run(Deck aiDeck) {
if (aiDeck == null) { return; }
@@ -146,7 +144,7 @@ public class NewGauntletScreen extends LaunchScreen {
}
else {
//once all ai decks have been selected, prompt for user deck
FDeckChooser.promptForDeck(localizer.getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
@Override
public void run(Deck userDeck) {
if (userDeck == null) { return; }
@@ -171,12 +169,12 @@ public class NewGauntletScreen extends LaunchScreen {
}
}
GuiChoose.oneOrNone(localizer.getMessage("lblSelectGauntletContest"), contests, new Callback<GauntletData>() {
GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblSelectGauntletContest"), contests, new Callback<GauntletData>() {
@Override
public void run(final GauntletData contest) {
if (contest == null) { return; }
FDeckChooser.promptForDeck(localizer.getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
FDeckChooser.promptForDeck(Forge.getLocalizer().getMessage("lblSelectYourDeck"), GameType.Gauntlet, false, new Callback<Deck>() {
@Override
public void run(final Deck userDeck) {
if (userDeck == null) { return; }

17
forge-gui-mobile/src/forge/screens/home/HomeScreen.java
View File

@@ -25,7 +25,6 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Localizer;
import forge.util.Utils;
public class HomeScreen extends FScreen {
@@ -67,9 +66,7 @@ public class HomeScreen extends FScreen {
private HomeScreen() {
super((Header)null);
final Localizer localizer = Localizer.getInstance();
addButton(localizer.getMessage("lblNewGame"), new FEventHandler() {
addButton(Forge.getLocalizer().getMessage("lblNewGame"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
activeButtonIndex = 0;
@@ -77,7 +74,7 @@ public class HomeScreen extends FScreen {
NewGameMenu.getPreferredScreen().open();
}
});
addButton(localizer.getMessage("lblLoadGame"), new FEventHandler() {
addButton(Forge.getLocalizer().getMessage("lblLoadGame"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
activeButtonIndex = 1;
@@ -85,7 +82,7 @@ public class HomeScreen extends FScreen {
LoadGameMenu.getPreferredScreen().open();
}
});
addButton(localizer.getMessage("lblPlayOnline"), new FEventHandler() {
addButton(Forge.getLocalizer().getMessage("lblPlayOnline"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
activeButtonIndex = 2;
@@ -93,7 +90,7 @@ public class HomeScreen extends FScreen {
OnlineScreen.Lobby.open();
}
});
addButton(localizer.getMessage("lblDeckManager"), new FEventHandler() {
addButton(Forge.getLocalizer().getMessage("lblDeckManager"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
activeButtonIndex = 3;
@@ -108,12 +105,12 @@ public class HomeScreen extends FScreen {
return 0;
}
};
deckManager.setHeaderCaption(localizer.getMessage("lblDeckManager"));
deckManager.setHeaderCaption(Forge.getLocalizer().getMessage("lblDeckManager"));
}
Forge.openScreen(deckManager);
}
});
addButton(localizer.getMessage("lblAchievements"), new FEventHandler() {
addButton(Forge.getLocalizer().getMessage("lblAchievements"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
activeButtonIndex = 4;
@@ -121,7 +118,7 @@ public class HomeScreen extends FScreen {
AchievementsScreen.show();
}
});
addButton(localizer.getMessage("lblSettings"), new FEventHandler() {
addButton(Forge.getLocalizer().getMessage("lblSettings"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
activeButtonIndex = 5;

5
forge-gui-mobile/src/forge/screens/home/LoadGameMenu.java
View File

@@ -16,7 +16,6 @@ import forge.screens.planarconquest.LoadConquestScreen;
import forge.screens.quest.LoadQuestScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
public class LoadGameMenu extends FPopupMenu {
public enum LoadGameScreen {
@@ -32,7 +31,7 @@ public class LoadGameMenu extends FPopupMenu {
LoadGameScreen(final String caption0, final FImage icon0, final Class<? extends FScreen> screenClass0) {
screenClass = screenClass0;
item = new FMenuItem(Localizer.getInstance().getMessage(caption0), icon0, new FEventHandler() {
item = new FMenuItem(Forge.getLocalizer().getMessage(caption0), icon0, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
open(true); //remove current screen from chain
@@ -45,7 +44,7 @@ public class LoadGameMenu extends FPopupMenu {
if (screen == null) { //don't initialize screen until it's opened the first time
try {
screen = screenClass.getConstructor().newInstance();
screen.setHeaderCaption(Localizer.getInstance().getMessage("lblLoadGame") + " - " + item.getText());
screen.setHeaderCaption(Forge.getLocalizer().getMessage("lblLoadGame") + " - " + item.getText());
}
catch (Exception e) {
e.printStackTrace();

18
forge-gui-mobile/src/forge/screens/home/NewGameMenu.java
View File

@@ -18,19 +18,17 @@ import forge.screens.planarconquest.NewConquestScreen;
import forge.screens.quest.NewQuestScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
public class NewGameMenu extends FPopupMenu {
final static Localizer localizer = Localizer.getInstance();
public enum NewGameScreen {
Constructed(localizer.getMessageorUseDefault("lblConstructed", "Constructed"), FSkinImage.MENU_CONSTRUCTED, ConstructedScreen.class),
BoosterDraft(localizer.getMessageorUseDefault("lblBoosterDraft", "Booster Draft"), FSkinImage.MENU_DRAFT, NewDraftScreen.class),
SealedDeck(localizer.getMessageorUseDefault("lblSealedDeck", "Sealed Deck"), FSkinImage.MENU_SEALED, NewSealedScreen.class),
QuestMode(localizer.getMessageorUseDefault("lblQuestMode", "Quest Mode"), FSkinImage.QUEST_ZEP, NewQuestScreen.class),
PuzzleMode(localizer.getMessageorUseDefault("lblPuzzleMode", "Puzzle Mode"), FSkinImage.MENU_PUZZLE, PuzzleScreen.class),
PlanarConquest(localizer.getMessageorUseDefault("lblPlanarConquest", "Planar Conquest"), FSkinImage.MENU_GALAXY, NewConquestScreen.class),
Gauntlet(localizer.getMessageorUseDefault("lblGauntlet", "Gauntlet"), FSkinImage.MENU_GAUNTLET, NewGauntletScreen.class);
Constructed(Forge.getLocalizer().getMessageorUseDefault("lblConstructed", "Constructed"), FSkinImage.MENU_CONSTRUCTED, ConstructedScreen.class),
BoosterDraft(Forge.getLocalizer().getMessageorUseDefault("lblBoosterDraft", "Booster Draft"), FSkinImage.MENU_DRAFT, NewDraftScreen.class),
SealedDeck(Forge.getLocalizer().getMessageorUseDefault("lblSealedDeck", "Sealed Deck"), FSkinImage.MENU_SEALED, NewSealedScreen.class),
QuestMode(Forge.getLocalizer().getMessageorUseDefault("lblQuestMode", "Quest Mode"), FSkinImage.QUEST_ZEP, NewQuestScreen.class),
PuzzleMode(Forge.getLocalizer().getMessageorUseDefault("lblPuzzleMode", "Puzzle Mode"), FSkinImage.MENU_PUZZLE, PuzzleScreen.class),
PlanarConquest(Forge.getLocalizer().getMessageorUseDefault("lblPlanarConquest", "Planar Conquest"), FSkinImage.MENU_GALAXY, NewConquestScreen.class),
Gauntlet(Forge.getLocalizer().getMessageorUseDefault("lblGauntlet", "Gauntlet"), FSkinImage.MENU_GAUNTLET, NewGauntletScreen.class);
private final FMenuItem item;
private final Class<? extends FScreen> screenClass;
@@ -51,7 +49,7 @@ public class NewGameMenu extends FPopupMenu {
if (screen == null) { //don't initialize screen until it's opened the first time
try {
screen = screenClass.getConstructor().newInstance();
screen.setHeaderCaption(localizer.getMessageorUseDefault("lblNewGame", "New Game") + " - " + item.getText());
screen.setHeaderCaption(Forge.getLocalizer().getMessageorUseDefault("lblNewGame", "New Game") + " - " + item.getText());
}
catch (Exception e) {
e.printStackTrace();

12
forge-gui-mobile/src/forge/screens/home/puzzle/PuzzleScreen.java
View File

@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import forge.Forge;
import forge.assets.FSkinFont;
import forge.deck.Deck;
import forge.game.GameRules;
@@ -23,7 +24,6 @@ import forge.toolbox.FOptionPane;
import forge.toolbox.FTextArea;
import forge.toolbox.GuiChoose;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
public class PuzzleScreen extends LaunchScreen {
@@ -31,9 +31,9 @@ public class PuzzleScreen extends LaunchScreen {
private static final float PADDING = Utils.scale(10);
private final FTextArea lblDesc = add(new FTextArea(false,
Localizer.getInstance().getMessage("lblPuzzleText1") + "\n\n" +
Localizer.getInstance().getMessage("lblPuzzleText2") + "\n\n" +
Localizer.getInstance().getMessage("lblPuzzleText3")));
Forge.getLocalizer().getMessage("lblPuzzleText1") + "\n\n" +
Forge.getLocalizer().getMessage("lblPuzzleText2") + "\n\n" +
Forge.getLocalizer().getMessage("lblPuzzleText3")));
public PuzzleScreen() {
super(null, NewGameMenu.getMenu());
@@ -56,11 +56,11 @@ public class PuzzleScreen extends LaunchScreen {
final ArrayList<Puzzle> puzzles = PuzzleIO.loadPuzzles(ForgeConstants.PUZZLE_DIR);
Collections.sort(puzzles);
GuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblChooseAPuzzle"), puzzles, new Callback<Puzzle>() {
GuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblChooseAPuzzle"), puzzles, new Callback<Puzzle>() {
@Override
public void run(final Puzzle chosen) {
if (chosen != null) {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingThePuzzle"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingThePuzzle"), new Runnable() {
@Override
public void run() {
// Load selected puzzle

11
forge-gui-mobile/src/forge/screens/limited/DraftingProcessScreen.java
View File

@@ -1,5 +1,6 @@
package forge.screens.limited;
import forge.Forge;
import org.apache.commons.lang3.StringUtils;
import forge.deck.Deck;
@@ -15,11 +16,9 @@ import forge.screens.FScreen;
import forge.screens.home.LoadGameMenu.LoadGameScreen;
import forge.toolbox.FOptionPane;
import forge.util.Callback;
import forge.util.Localizer;
public class DraftingProcessScreen extends FDeckEditor {
private boolean isDraftSaved;
private final Localizer localizer = Localizer.getInstance();
private final BoosterDraft draft;
private final QuestTournamentController questDraftController;
@@ -50,7 +49,7 @@ public class DraftingProcessScreen extends FDeckEditor {
return;
}
FOptionPane.showInputDialog(localizer.getMessage("lblSaveDraftAs") + "?", new Callback<String>() {
FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblSaveDraftAs") + "?", new Callback<String>() {
@Override
public void run(final String name) {
if (StringUtils.isEmpty(name)) {
@@ -62,8 +61,8 @@ public class DraftingProcessScreen extends FDeckEditor {
for (DeckGroup d : FModel.getDecks().getDraft()) {
if (name.equalsIgnoreCase(d.getName())) {
FOptionPane.showConfirmDialog(
localizer.getMessage("lblAlreadyDeckName") + name + localizer.getMessage("lblOverwriteConfirm"),
localizer.getMessage("lblOverwriteDeck"), false, new Callback<Boolean>() {
Forge.getLocalizer().getMessage("lblAlreadyDeckName") + name + Forge.getLocalizer().getMessage("lblOverwriteConfirm"),
Forge.getLocalizer().getMessage("lblOverwriteDeck"), false, new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -144,7 +143,7 @@ public class DraftingProcessScreen extends FDeckEditor {
return;
}
FOptionPane.showConfirmDialog(localizer.getMessage("lblEndDraftConfirm"), localizer.getMessage("lblLeaveDraft"), localizer.getMessage("lblLeave"), localizer.getMessage("lblCancel"), false, canCloseCallback);
FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblEndDraftConfirm"), Forge.getLocalizer().getMessage("lblLeaveDraft"), Forge.getLocalizer().getMessage("lblLeave"), Forge.getLocalizer().getMessage("lblCancel"), false, canCloseCallback);
}
@Override

24
forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
View File

@@ -34,25 +34,24 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
public class LoadDraftScreen extends LaunchScreen {
private final DeckManager lstDecks = add(new DeckManager(GameType.Draft));
private final FLabel lblTip = add(new FLabel.Builder()
.text(Localizer.getInstance().getMessage("lblDoubleTapToEditDeck"))
.text(Forge.getLocalizer().getMessage("lblDoubleTapToEditDeck"))
.textColor(FLabel.INLINE_LABEL_COLOR)
.align(Align.center).font(FSkinFont.get(12)).build());
private final FSkinFont GAME_MODE_FONT= FSkinFont.get(12);
private final FLabel lblMode = add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblMode")).font(GAME_MODE_FONT).build());
private final FLabel lblMode = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblMode")).font(GAME_MODE_FONT).build());
private final FComboBox<String> cbMode = add(new FComboBox<>());
public LoadDraftScreen() {
super(null, LoadGameMenu.getMenu());
cbMode.setFont(GAME_MODE_FONT);
cbMode.addItem(Localizer.getInstance().getMessage("lblGauntlet"));
cbMode.addItem(Localizer.getInstance().getMessage("lblSingleMatch"));
cbMode.addItem(Forge.getLocalizer().getMessage("lblGauntlet"));
cbMode.addItem(Forge.getLocalizer().getMessage("lblSingleMatch"));
lstDecks.setup(ItemManagerConfig.DRAFT_DECKS);
lstDecks.setItemActivateHandler(new FEventHandler() {
@@ -100,18 +99,17 @@ public class LoadDraftScreen extends LaunchScreen {
FThreads.invokeInBackgroundThread(new Runnable() {
@Override
public void run() {
Localizer localizer = Localizer.getInstance();
final DeckProxy humanDeck = lstDecks.getSelectedItem();
if (humanDeck == null) {
FOptionPane.showErrorDialog(localizer.getMessage("lblYouMustSelectExistingDeck"), localizer.getMessage("lblNoDeck"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblYouMustSelectExistingDeck"), Forge.getLocalizer().getMessage("lblNoDeck"));
return;
}
// TODO: if booster draft tournaments are supported in the future, add the possibility to choose them here
final boolean gauntlet = cbMode.getSelectedItem().equals(localizer.getMessage("lblGauntlet"));
final boolean gauntlet = cbMode.getSelectedItem().equals(Forge.getLocalizer().getMessage("lblGauntlet"));
if (gauntlet) {
final Integer rounds = SGuiChoose.getInteger(localizer.getMessage("lblHowManyOpponents"),
final Integer rounds = SGuiChoose.getInteger(Forge.getLocalizer().getMessage("lblHowManyOpponents"),
1, FModel.getDecks().getDraft().get(humanDeck.getName()).getAiDecks().size());
if (rounds == null) {
return;
@@ -124,7 +122,7 @@ public class LoadDraftScreen extends LaunchScreen {
return;
}
LoadingOverlay.show(localizer.getMessage("lblLoadingNewGame"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
FModel.getGauntletMini().resetGauntletDraft();
@@ -134,7 +132,7 @@ public class LoadDraftScreen extends LaunchScreen {
}
});
} else {
final Integer aiIndex = SGuiChoose.getInteger(localizer.getMessage("lblWhichOpponentWouldYouLikeToFace"),
final Integer aiIndex = SGuiChoose.getInteger(Forge.getLocalizer().getMessage("lblWhichOpponentWouldYouLikeToFace"),
1, FModel.getDecks().getDraft().get(humanDeck.getName()).getAiDecks().size());
if (aiIndex == null) {
return; // Cancel was pressed
@@ -149,7 +147,7 @@ public class LoadDraftScreen extends LaunchScreen {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(localizer.getMessage("lblLoadingNewGame"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
if (!checkDeckLegality(humanDeck)) {
@@ -180,7 +178,7 @@ public class LoadDraftScreen extends LaunchScreen {
if (FModel.getPreferences().getPrefBoolean(FPref.ENFORCE_DECK_LEGALITY)) {
String errorMessage = GameType.Draft.getDeckFormat().getDeckConformanceProblem(humanDeck.getDeck());
if (errorMessage != null) {
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblInvalidDeckDesc").replace("%n", errorMessage), Localizer.getInstance().getMessage("lblInvalidDeck"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblInvalidDeckDesc").replace("%n", errorMessage), Forge.getLocalizer().getMessage("lblInvalidDeck"));
return false;
}
}

21
forge-gui-mobile/src/forge/screens/limited/LoadSealedScreen.java
View File

@@ -34,25 +34,24 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
public class LoadSealedScreen extends LaunchScreen {
private final DeckManager lstDecks = add(new DeckManager(GameType.Draft));
private final FLabel lblTip = add(new FLabel.Builder()
.text(Localizer.getInstance().getMessage("lblDoubleTapToEditDeck"))
.text(Forge.getLocalizer().getMessage("lblDoubleTapToEditDeck"))
.textColor(FLabel.INLINE_LABEL_COLOR)
.align(Align.center).font(FSkinFont.get(12)).build());
private final FSkinFont GAME_MODE_FONT= FSkinFont.get(12);
private final FLabel lblMode = add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblMode")).font(GAME_MODE_FONT).build());
private final FLabel lblMode = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblMode")).font(GAME_MODE_FONT).build());
private final FComboBox<String> cbMode = add(new FComboBox<>());
public LoadSealedScreen() {
super(null, LoadGameMenu.getMenu());
cbMode.setFont(GAME_MODE_FONT);
cbMode.addItem(Localizer.getInstance().getMessage("lblGauntlet"));
cbMode.addItem(Localizer.getInstance().getMessage("lblSingleMatch"));
cbMode.addItem(Forge.getLocalizer().getMessage("lblGauntlet"));
cbMode.addItem(Forge.getLocalizer().getMessage("lblSingleMatch"));
lstDecks.setup(ItemManagerConfig.SEALED_DECKS);
lstDecks.setItemActivateHandler(new FEventHandler() {
@@ -101,11 +100,11 @@ public class LoadSealedScreen extends LaunchScreen {
public void run() {
final DeckProxy humanDeck = lstDecks.getSelectedItem();
if (humanDeck == null) {
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblYouMustSelectExistingSealedPool"), Localizer.getInstance().getMessage("lblNoDeck"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblYouMustSelectExistingSealedPool"), Forge.getLocalizer().getMessage("lblNoDeck"));
return;
}
final boolean gauntlet = cbMode.getSelectedItem().equals(Localizer.getInstance().getMessage("lblGauntlet"));
final boolean gauntlet = cbMode.getSelectedItem().equals(Forge.getLocalizer().getMessage("lblGauntlet"));
if (gauntlet) {
FThreads.invokeInEdtLater(new Runnable() {
@@ -115,7 +114,7 @@ public class LoadSealedScreen extends LaunchScreen {
return;
}
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingNewGame"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
final int matches = FModel.getDecks().getSealed().get(humanDeck.getName()).getAiDecks().size();
@@ -126,7 +125,7 @@ public class LoadSealedScreen extends LaunchScreen {
});
} else {
final Integer aiIndex = SGuiChoose.getInteger(Localizer.getInstance().getMessage("lblWhichOpponentWouldYouLikeToFace"),
final Integer aiIndex = SGuiChoose.getInteger(Forge.getLocalizer().getMessage("lblWhichOpponentWouldYouLikeToFace"),
1, FModel.getDecks().getSealed().get(humanDeck.getName()).getAiDecks().size());
if (aiIndex == null) {
return; // Cancel was pressed
@@ -145,7 +144,7 @@ public class LoadSealedScreen extends LaunchScreen {
return;
}
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingNewGame"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
final List<RegisteredPlayer> starter = new ArrayList<>();
@@ -172,7 +171,7 @@ public class LoadSealedScreen extends LaunchScreen {
if (FModel.getPreferences().getPrefBoolean(FPref.ENFORCE_DECK_LEGALITY)) {
String errorMessage = GameType.Sealed.getDeckFormat().getDeckConformanceProblem(humanDeck.getDeck());
if (errorMessage != null) {
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblInvalidDeckDesc").replace("%n", errorMessage), Localizer.getInstance().getMessage("lblInvalidDeck"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblInvalidDeckDesc").replace("%n", errorMessage), Forge.getLocalizer().getMessage("lblInvalidDeck"));
return false;
}
}

11
forge-gui-mobile/src/forge/screens/limited/NewDraftScreen.java
View File

@@ -12,7 +12,6 @@ import forge.screens.LoadingOverlay;
import forge.screens.home.NewGameMenu;
import forge.toolbox.FLabel;
import forge.toolbox.FTextArea;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
@@ -20,9 +19,9 @@ public class NewDraftScreen extends LaunchScreen {
private static final float PADDING = Utils.scale(10);
private final FTextArea lblDesc = add(new FTextArea(false,
Localizer.getInstance().getMessage("lblDraftText1") + "\n\n" +
Localizer.getInstance().getMessage("lblDraftText2") + "\n\n" +
Localizer.getInstance().getMessage("lblDraftText3")));
Forge.getLocalizer().getMessage("lblDraftText1") + "\n\n" +
Forge.getLocalizer().getMessage("lblDraftText2") + "\n\n" +
Forge.getLocalizer().getMessage("lblDraftText3")));
public NewDraftScreen() {
super(null, NewGameMenu.getMenu());
@@ -45,7 +44,7 @@ public class NewDraftScreen extends LaunchScreen {
ThreadUtil.invokeInGameThread(new Runnable() { //must run in game thread to prevent blocking UI thread
@Override
public void run() {
final LimitedPoolType poolType = SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblChooseDraftFormat"), LimitedPoolType.values());
final LimitedPoolType poolType = SGuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblChooseDraftFormat"), LimitedPoolType.values());
if (poolType == null) { return; }
final BoosterDraft draft = BoosterDraft.createDraft(poolType);
@@ -54,7 +53,7 @@ public class NewDraftScreen extends LaunchScreen {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingNewDraft"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewDraft"), new Runnable() {
@Override
public void run() {
Forge.openScreen(new DraftingProcessScreen(draft, EditorType.Draft, null));

7
forge-gui-mobile/src/forge/screens/limited/NewSealedScreen.java
View File

@@ -12,7 +12,6 @@ import forge.screens.LaunchScreen;
import forge.screens.home.NewGameMenu;
import forge.toolbox.FLabel;
import forge.toolbox.FTextArea;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
@@ -20,9 +19,9 @@ public class NewSealedScreen extends LaunchScreen {
private static final float PADDING = Utils.scale(10);
private final FTextArea lblDesc = add(new FTextArea(false,
Localizer.getInstance().getMessage("lblSealedText2") + "\n\n" +
Localizer.getInstance().getMessage("lblSealedText3") + "\n\n" +
Localizer.getInstance().getMessage("lblSealedText4")));
Forge.getLocalizer().getMessage("lblSealedText2") + "\n\n" +
Forge.getLocalizer().getMessage("lblSealedText3") + "\n\n" +
Forge.getLocalizer().getMessage("lblSealedText4")));
public NewSealedScreen() {
super(null, NewGameMenu.getMenu());

7
forge-gui-mobile/src/forge/screens/match/MatchController.java
View File

@@ -64,7 +64,6 @@ import forge.toolbox.FDisplayObject;
import forge.toolbox.FOptionPane;
import forge.trackable.TrackableCollection;
import forge.util.ITriggerEvent;
import forge.util.Localizer;
import forge.util.MessageUtil;
import forge.util.WaitCallback;
import forge.util.collect.FCollectionView;
@@ -342,7 +341,7 @@ public class MatchController extends AbstractGuiGame {
if (abilities.size() == 1) {
return abilities.get(0);
}
return SGuiChoose.oneOrNone(Localizer.getInstance().getMessage("lblChooseAbilityToPlay"), abilities);
return SGuiChoose.oneOrNone(Forge.getLocalizer().getMessage("lblChooseAbilityToPlay"), abilities);
}
@Override
@@ -625,7 +624,7 @@ public class MatchController extends AbstractGuiGame {
public boolean confirm(final CardView c, final String question, final boolean defaultIsYes, final List<String> options) {
final List<String> optionsToUse;
if (options == null) {
optionsToUse = ImmutableList.of(Localizer.getInstance().getMessage("lblYes"), Localizer.getInstance().getMessage("lblNo"));
optionsToUse = ImmutableList.of(Forge.getLocalizer().getMessage("lblYes"), Forge.getLocalizer().getMessage("lblNo"));
} else {
optionsToUse = options;
}
@@ -681,7 +680,7 @@ public class MatchController extends AbstractGuiGame {
public List<GameEntityView> chooseEntitiesForEffect(String title, List<? extends GameEntityView> optionList, int min, int max, DelayedReveal delayedReveal) {
final int m1 = max >= 0 ? optionList.size() - max : -1;
final int m2 = min >= 0 ? optionList.size() - min : -1;
return SGuiChoose.order(title, Localizer.getInstance().getMessage("lblSelected"), m1, m2, (List<GameEntityView>) optionList, null);
return SGuiChoose.order(title, Forge.getLocalizer().getMessage("lblSelected"), m1, m2, (List<GameEntityView>) optionList, null);
}
@Override

27
forge-gui-mobile/src/forge/screens/match/MatchScreen.java
View File

@@ -66,7 +66,6 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.Localizer;
public class MatchScreen extends FScreen {
public static FSkinColor BORDER_COLOR = FSkinColor.get(Colors.CLR_BORDERS);
@@ -158,18 +157,17 @@ public class MatchScreen extends FScreen {
stack.setDropDownContainer(this);
FMenuBar menuBar = (FMenuBar)getHeader();
final Localizer localizer = Localizer.getInstance();
if (topPlayerPrompt == null) {
menuBar.addTab(localizer.getMessage("lblGame"), gameMenu);
menuBar.addTab(localizer.getMessage("lblPlayers") + " (" + playerPanels.size() + ")", players);
menuBar.addTab(localizer.getMessage("lblLog"), log);
menuBar.addTab(localizer.getMessage("lblDev"), devMenu);
menuBar.addTab( localizer.getMessage("lblStack") + " (0)", stack);
menuBar.addTab(Forge.getLocalizer().getMessage("lblGame"), gameMenu);
menuBar.addTab(Forge.getLocalizer().getMessage("lblPlayers") + " (" + playerPanels.size() + ")", players);
menuBar.addTab(Forge.getLocalizer().getMessage("lblLog"), log);
menuBar.addTab(Forge.getLocalizer().getMessage("lblDev"), devMenu);
menuBar.addTab( Forge.getLocalizer().getMessage("lblStack") + " (0)", stack);
}
else {
menuBar.addTab("\u2022 \u2022 \u2022", new PlayerSpecificMenu(true));
stack.setRotate90(true);
menuBar.addTab(localizer.getMessage("lblStack") + " (0)", stack);
menuBar.addTab(Forge.getLocalizer().getMessage("lblStack") + " (0)", stack);
menuBar.addTab("\u2022 \u2022 \u2022", new PlayerSpecificMenu(false));
//create fake menu tabs for other drop downs so they can be positioned as needed
@@ -246,18 +244,17 @@ public class MatchScreen extends FScreen {
@Override
protected void buildMenu() {
final Localizer localizer = Localizer.getInstance();
if (isTopHumanPlayerActive() == getRotate180()) {
addItem(new MenuItem(localizer.getMessage("lblGame"), gameMenu));
addItem(new MenuItem(localizer.getMessage("lblPlayers") + " (" + playerPanels.size() + ")", players));
addItem(new MenuItem(localizer.getMessage("lblLog"), log));
addItem(new MenuItem(Forge.getLocalizer().getMessage("lblGame"), gameMenu));
addItem(new MenuItem(Forge.getLocalizer().getMessage("lblPlayers") + " (" + playerPanels.size() + ")", players));
addItem(new MenuItem(Forge.getLocalizer().getMessage("lblLog"), log));
if (ForgePreferences.DEV_MODE) {
addItem(new MenuItem(localizer.getMessage("lblDev"), devMenu));
addItem(new MenuItem(Forge.getLocalizer().getMessage("lblDev"), devMenu));
}
}
else { //TODO: Support using menu when player doesn't have priority
FMenuItem item = new FMenuItem(localizer.getMessage("lblMustWaitPriority"), null);
FMenuItem item = new FMenuItem(Forge.getLocalizer().getMessage("lblMustWaitPriority"), null);
item.setEnabled(false);
addItem(item);
}
@@ -543,7 +540,7 @@ public class MatchScreen extends FScreen {
return getActivePrompt().getBtnCancel().trigger(); //trigger Cancel if can't trigger OK
case Keys.ESCAPE:
if (!FModel.getPreferences().getPrefBoolean(FPref.UI_ALLOW_ESC_TO_END_TURN)) {
if (getActivePrompt().getBtnCancel().getText().equals(Localizer.getInstance().getMessage("lblEndTurn"))) {
if (getActivePrompt().getBtnCancel().getText().equals(Forge.getLocalizer().getInstance().getMessage("lblEndTurn"))) {
return false;
}
}

19
forge-gui-mobile/src/forge/screens/match/views/VAssignCombatDamage.java
View File

@@ -48,7 +48,6 @@ import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.CardTranslation;
import forge.util.Localizer;
import forge.util.TextUtil;
import forge.util.Utils;
import forge.util.WaitCallback;
@@ -69,8 +68,8 @@ public class VAssignCombatDamage extends FDialog {
private final GameEntityView defender;
private final FLabel lblTotalDamage = add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblTotalDamageText")).align(Align.center).build());
private final FLabel lblAssignRemaining = add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblAssignRemainingText")).align(Align.center).build());
private final FLabel lblTotalDamage = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblTotalDamageText")).align(Align.center).build());
private final FLabel lblAssignRemaining = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblAssignRemainingText")).align(Align.center).build());
private final AttDefCardPanel pnlAttacker;
private final DefendersPanel pnlDefenders;
@@ -98,7 +97,7 @@ public class VAssignCombatDamage extends FDialog {
* @param overrideOrder override combatant order
*/
public VAssignCombatDamage(final CardView attacker, final List<CardView> blockers, final int damage0, final GameEntityView defender0, boolean overrideOrder, boolean maySkip, final WaitCallback<Map<CardView, Integer>> waitCallback) {
super(Localizer.getInstance().getMessage("lbLAssignDamageDealtBy").replace("%s",CardTranslation.getTranslatedName(attacker.getName())) , 3);
super(Forge.getLocalizer().getMessage("lbLAssignDamageDealtBy").replace("%s",CardTranslation.getTranslatedName(attacker.getName())) , 3);
callback = waitCallback;
totalDamageToAssign = damage0;
@@ -112,7 +111,7 @@ public class VAssignCombatDamage extends FDialog {
pnlAttacker = add(new AttDefCardPanel(attacker));
pnlDefenders = add(new DefendersPanel(blockers));
initButton(0, Localizer.getInstance().getMessage("lblAuto"), new FEventHandler() {
initButton(0, Forge.getLocalizer().getMessage("lblAuto"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
resetAssignedDamage();
@@ -120,13 +119,13 @@ public class VAssignCombatDamage extends FDialog {
finish();
}
});
initButton(1, Localizer.getInstance().getMessage("lblOK"), new FEventHandler() {
initButton(1, Forge.getLocalizer().getMessage("lblOK"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
finish();
}
});
initButton(2, Localizer.getInstance().getMessage("lblReset"), new FEventHandler() {
initButton(2, Forge.getLocalizer().getMessage("lblReset"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
resetAssignedDamage();
@@ -134,7 +133,7 @@ public class VAssignCombatDamage extends FDialog {
}
});
if (maySkip) {
initButton(2, Localizer.getInstance().getMessage("lblSkip"), new FEventHandler() {
initButton(2, Forge.getLocalizer().getMessage("lblSkip"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
skip = true;
@@ -431,7 +430,7 @@ public class VAssignCombatDamage extends FDialog {
StringBuilder sb = new StringBuilder();
sb.append(dmg);
if(overkill >= 0) {
sb.append(" (" + Localizer.getInstance().getMessage("lblLethal"));
sb.append(" (" + Forge.getLocalizer().getMessage("lblLethal"));
if(overkill > 0)
sb.append(" +").append(overkill);
sb.append(")");
@@ -440,7 +439,7 @@ public class VAssignCombatDamage extends FDialog {
dt.label.setText(sb.toString());
}
lblTotalDamage.setText(TextUtil.concatNoSpace(Localizer.getInstance().getMessage("lblAvailableDamagePoints") + ": ",
lblTotalDamage.setText(TextUtil.concatNoSpace(Forge.getLocalizer().getMessage("lblAvailableDamagePoints") + ": ",
String.valueOf(damageLeft), " (of ", String.valueOf(totalDamageToAssign), ")"));
setButtonEnabled(1, damageLeft == 0);
lblAssignRemaining.setVisible(allHaveLethal && damageLeft > 0);

13
forge-gui-mobile/src/forge/screens/match/views/VAssignGenericAmount.java
View File

@@ -47,7 +47,6 @@ import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.CardTranslation;
import forge.util.Localizer;
import forge.util.TextUtil;
import forge.util.Utils;
import forge.util.WaitCallback;
@@ -77,25 +76,25 @@ public class VAssignGenericAmount extends FDialog {
* @param atLeastOne Must assign at least one amount to each target
*/
public VAssignGenericAmount(final CardView effectSource, final Map<Object, Integer> targets, final int amount, final boolean atLeastOne, final String amountLabel, final WaitCallback<Map<Object, Integer>> waitCallback) {
super(Localizer.getInstance().getMessage("lbLAssignAmountForEffect", amountLabel, CardTranslation.getTranslatedName(effectSource.getName())) , 2);
super(Forge.getLocalizer().getMessage("lbLAssignAmountForEffect", amountLabel, CardTranslation.getTranslatedName(effectSource.getName())) , 2);
callback = waitCallback;
totalAmountToAssign = amount;
this.atLeastOne = atLeastOne;
lblAmount = amountLabel;
lblTotalAmount = add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblTotalAmountText", lblAmount)).align(Align.center).build());
lblTotalAmount = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblTotalAmountText", lblAmount)).align(Align.center).build());
pnlSource = add(new EffectSourcePanel(effectSource));
pnlTargets = add(new TargetsPanel(targets));
initButton(0, Localizer.getInstance().getMessage("lblOK"), new FEventHandler() {
initButton(0, Forge.getLocalizer().getMessage("lblOK"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
finish();
}
});
initButton(1, Localizer.getInstance().getMessage("lblReset"), new FEventHandler() {
initButton(1, Forge.getLocalizer().getMessage("lblReset"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
resetAssignedDamage();
@@ -338,12 +337,12 @@ public class VAssignGenericAmount extends FDialog {
StringBuilder sb = new StringBuilder();
sb.append(at.amount);
if (at.max - at.amount == 0) {
sb.append(" (").append(Localizer.getInstance().getMessage("lblMax")).append(")");
sb.append(" (").append(Forge.getLocalizer().getMessage("lblMax")).append(")");
}
at.label.setText(sb.toString());
}
lblTotalAmount.setText(TextUtil.concatNoSpace(Localizer.getInstance().getMessage("lblAvailableAmount", lblAmount) + ": ",
lblTotalAmount.setText(TextUtil.concatNoSpace(Forge.getLocalizer().getMessage("lblAvailableAmount", lblAmount) + ": ",
String.valueOf(amountLeft), " (of ", String.valueOf(totalAmountToAssign), ")"));
setButtonEnabled(0, amountLeft == 0);
}

12
forge-gui-mobile/src/forge/screens/match/views/VAutoYields.java
View File

@@ -3,6 +3,7 @@ package forge.screens.match.views;
import java.util.ArrayList;
import java.util.List;
import forge.Forge;
import forge.screens.match.MatchController;
import forge.toolbox.FCheckBox;
import forge.toolbox.FChoiceList;
@@ -10,7 +11,6 @@ import forge.toolbox.FDialog;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
import forge.util.TextBounds;
public class VAutoYields extends FDialog {
@@ -18,7 +18,7 @@ public class VAutoYields extends FDialog {
private final FCheckBox chkDisableAll;
public VAutoYields() {
super(Localizer.getInstance().getMessage("lblAutoYields"), 2);
super(Forge.getLocalizer().getMessage("lblAutoYields"), 2);
List<String> autoYields = new ArrayList<>();
for (String autoYield : MatchController.instance.getAutoYields()) {
autoYields.add(autoYield);
@@ -34,20 +34,20 @@ public class VAutoYields extends FDialog {
return true;
}
});
chkDisableAll = add(new FCheckBox(Localizer.getInstance().getMessage("lblDisableAllAutoYields"), MatchController.instance.getDisableAutoYields()));
chkDisableAll = add(new FCheckBox(Forge.getLocalizer().getMessage("lblDisableAllAutoYields"), MatchController.instance.getDisableAutoYields()));
chkDisableAll.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
MatchController.instance.setDisableAutoYields(chkDisableAll.isSelected());
}
});
initButton(0, Localizer.getInstance().getMessage("lblOK"), new FEventHandler() {
initButton(0, Forge.getLocalizer().getMessage("lblOK"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
hide();
}
});
initButton(1, Localizer.getInstance().getMessage("lblRemoveYield"), new FEventHandler() {
initButton(1, Forge.getLocalizer().getMessage("lblRemoveYield"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
String selected = lstAutoYields.getSelectedItem();
@@ -69,7 +69,7 @@ public class VAutoYields extends FDialog {
super.show();
}
else {
FOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblNoActiveAutoYield"), Localizer.getInstance().getMessage("lblNoAutoYield"), FOptionPane.INFORMATION_ICON);
FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblNoActiveAutoYield"), Forge.getLocalizer().getMessage("lblNoAutoYield"), FOptionPane.INFORMATION_ICON);
}
}

52
forge-gui-mobile/src/forge/screens/match/views/VDevMenu.java
View File

@@ -1,18 +1,18 @@
package forge.screens.match.views;
import forge.Forge;
import forge.menu.FCheckBoxMenuItem;
import forge.menu.FDropDownMenu;
import forge.menu.FMenuItem;
import forge.screens.match.MatchController;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
import forge.util.ThreadUtil;
public class VDevMenu extends FDropDownMenu {
@Override
protected void buildMenu() {
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblGenerateMana"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblGenerateMana"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() { //must invoke all these in game thread since they may require synchronous user input
@@ -23,7 +23,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblTutor"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblTutor"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -34,7 +34,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblRollbackPhase"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblRollbackPhase"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() { //must invoke all these in game thread since they may require synchronous user input
@@ -45,7 +45,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblCastSpellOrPlayLand"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblCastSpellOrPlayLand"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -56,7 +56,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblCardToHand"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblCardToHand"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -67,7 +67,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblCardToBattlefield"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblCardToBattlefield"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -78,7 +78,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblCardToLibrary"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblCardToLibrary"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -89,7 +89,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblCardToGraveyard"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblCardToGraveyard"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -100,7 +100,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblCardToExile"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblCardToExile"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -111,7 +111,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblRepeatAddCard"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblRepeatAddCard"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -122,7 +122,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblExileFromHand"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblExileFromHand"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -133,7 +133,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblExileFromPlay"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblExileFromPlay"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -144,7 +144,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblRemoveFromGame"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblRemoveFromGame"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -155,7 +155,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblSetLife"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblSetLife"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -166,7 +166,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblWinGame"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblWinGame"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -177,7 +177,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblSetupGame"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblSetupGame"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -188,7 +188,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblDumpGame"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblDumpGame"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -201,7 +201,7 @@ public class VDevMenu extends FDropDownMenu {
}));
final boolean unlimitedLands = MatchController.instance.getGameController().canPlayUnlimitedLands();
addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("lblUnlimitedLands"), unlimitedLands,
addItem(new FCheckBoxMenuItem(Forge.getLocalizer().getMessage("lblUnlimitedLands"), unlimitedLands,
new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
@@ -209,14 +209,14 @@ public class VDevMenu extends FDropDownMenu {
}
}));
final boolean viewAll = MatchController.instance.getGameController().mayLookAtAllCards();
addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("lblViewAll"), viewAll,
addItem(new FCheckBoxMenuItem(Forge.getLocalizer().getMessage("lblViewAll"), viewAll,
new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
MatchController.instance.getGameController().cheat().setViewAllCards(!viewAll);
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblAddCounterPermanent"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblAddCounterPermanent"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -227,7 +227,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblSubCounterPermanent"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblSubCounterPermanent"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -238,7 +238,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblTapPermanent"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblTapPermanent"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -249,7 +249,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblUntapPermanent"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblUntapPermanent"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -260,7 +260,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblRiggedRoll"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblRiggedRoll"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -271,7 +271,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblWalkTo"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblWalkTo"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {

10
forge-gui-mobile/src/forge/screens/match/views/VGameMenu.java
View File

@@ -8,7 +8,6 @@ import forge.screens.match.MatchController;
import forge.screens.settings.SettingsScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
import forge.util.ThreadUtil;
public class VGameMenu extends FDropDownMenu {
@@ -17,7 +16,6 @@ public class VGameMenu extends FDropDownMenu {
@Override
protected void buildMenu() {
final Localizer localizer = Localizer.getInstance();
addItem(new FMenuItem(MatchController.instance.getConcedeCaption(), FSkinImage.CONCEDE, new FEventHandler() {
@Override
@@ -43,7 +41,7 @@ public class VGameMenu extends FDropDownMenu {
GameStateDeserializer.loadGameState(MatchUtil.getGame(), ForgeConstants.USER_GAMES_DIR + "GameSave.txt");
}
}));*/
addItem(new FMenuItem(localizer.getMessage("lblAutoYields"), Forge.hdbuttons ? FSkinImage.HDYIELD : FSkinImage.WARNING, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblAutoYields"), Forge.hdbuttons ? FSkinImage.HDYIELD : FSkinImage.WARNING, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
final boolean autoYieldsDisabled = MatchController.instance.getDisableAutoYields();
@@ -54,6 +52,7 @@ public class VGameMenu extends FDropDownMenu {
if (!b0) {
if (autoYieldsDisabled && !MatchController.instance.getDisableAutoYields()) {
//if re-enabling auto-yields, auto-yield to current ability on stack if applicable
if (MatchController.instance.getGameView().peekStack() != null) {
final String key = MatchController.instance.getGameView().peekStack().getKey();
final boolean autoYield = MatchController.instance.shouldAutoYield(key);
MatchController.instance.setShouldAutoYield(key, !autoYield);
@@ -64,12 +63,13 @@ public class VGameMenu extends FDropDownMenu {
}
}
}
}
};
autoYields.show();
}
}));
if (!Forge.isMobileAdventureMode) {
addItem(new FMenuItem(localizer.getMessage("lblSettings"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblSettings"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
//pause game when spectating AI Match
@@ -80,7 +80,7 @@ public class VGameMenu extends FDropDownMenu {
SettingsScreen.show(false);
}
}));
addItem(new FMenuItem(localizer.getMessage("lblShowWinLoseOverlay"), FSkinImage.ENDTURN, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblShowWinLoseOverlay"), FSkinImage.ENDTURN, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
MatchController.instance.showWinlose();

15
forge-gui-mobile/src/forge/screens/match/views/VStack.java
View File

@@ -39,7 +39,6 @@ import forge.toolbox.FDisplayObject;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.util.Localizer;
import forge.util.TextUtil;
import forge.util.Utils;
import forge.util.collect.FCollectionView;
@@ -99,7 +98,7 @@ public class VStack extends FDropDown {
final FCollectionView<StackItemView> stack = MatchController.instance.getGameView().getStack();
if(stack!=null) {
if (isVisible() && stack.isEmpty()) { //visible stack but empty already
getMenuTab().setText(Localizer.getInstance().getMessage("lblStack") + " (" + 0 + ")");
getMenuTab().setText(Forge.getLocalizer().getMessage("lblStack") + " (" + 0 + ")");
MatchController.getView().getStack().hide();
}
}
@@ -115,7 +114,7 @@ public class VStack extends FDropDown {
if (stackSize != stack.size()) {
int oldStackSize = stackSize;
stackSize = stack.size();
getMenuTab().setText(Localizer.getInstance().getMessage("lblStack") + " (" + stackSize + ")");
getMenuTab().setText(Forge.getLocalizer().getMessage("lblStack") + " (" + stackSize + ")");
if (stackSize > 0) {
if (!isVisible()) {
@@ -150,7 +149,7 @@ public class VStack extends FDropDown {
final FCollectionView<StackItemView> stack = MatchController.instance.getGameView().getStack();
if (stack.isEmpty()) { //show label if stack empty
FLabel label = add(new FLabel.Builder().text("[" + Localizer.getInstance().getMessage("lblEmpty") + "]").font(FONT).align(Align.center).build());
FLabel label = add(new FLabel.Builder().text("[" + Forge.getLocalizer().getMessage("lblEmpty") + "]").font(FONT).align(Align.center).build());
float height = Math.round(label.getAutoSizeBounds().height) + 2 * PADDING;
label.setBounds(x, y, width, height);
@@ -288,7 +287,7 @@ public class VStack extends FDropDown {
protected void buildMenu() {
final String key = stackInstance.getKey();
final boolean autoYield = gui.shouldAutoYield(key);
addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("cbpAutoYieldMode"), autoYield,
addItem(new FCheckBoxMenuItem(Forge.getLocalizer().getMessage("cbpAutoYieldMode"), autoYield,
new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
@@ -301,7 +300,7 @@ public class VStack extends FDropDown {
}));
if (stackInstance.isOptionalTrigger() && stackInstance.getActivatingPlayer().equals(player)) {
final int triggerID = stackInstance.getSourceTrigger();
addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("lblAlwaysYes"),
addItem(new FCheckBoxMenuItem(Forge.getLocalizer().getMessage("lblAlwaysYes"),
gui.shouldAlwaysAcceptTrigger(triggerID),
new FEventHandler() {
@Override
@@ -318,7 +317,7 @@ public class VStack extends FDropDown {
}
}
}));
addItem(new FCheckBoxMenuItem(Localizer.getInstance().getMessage("lblAlwaysNo"),
addItem(new FCheckBoxMenuItem(Forge.getLocalizer().getMessage("lblAlwaysNo"),
gui.shouldAlwaysDeclineTrigger(triggerID),
new FEventHandler() {
@Override
@@ -336,7 +335,7 @@ public class VStack extends FDropDown {
}
}));
}
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblZoomOrDetails"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblZoomOrDetails"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
CardZoom.show(stackInstance.getSourceCard());

4
forge-gui-mobile/src/forge/screens/match/winlose/GauntletWinLose.java
View File

@@ -2,12 +2,12 @@ package forge.screens.match.winlose;
import java.util.List;
import forge.Forge;
import forge.game.GameView;
import forge.gamemodes.gauntlet.GauntletWinLoseController;
import forge.gui.FThreads;
import forge.gui.util.SOptionPane;
import forge.localinstance.skin.FSkinProp;
import forge.util.Localizer;
/**
* The Win/Lose handler for 'gauntlet' type tournament
@@ -54,7 +54,7 @@ public class GauntletWinLose extends ControlWinLose {
}
}
SOptionPane.showMessageDialog(sb.toString(), Localizer.getInstance().getMessage("lblGauntletProgress"), icon);
SOptionPane.showMessageDialog(sb.toString(), Forge.getLocalizer().getMessage("lblGauntletProgress"), icon);
}
});
}

21
forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java
View File

@@ -30,7 +30,6 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FOverlay;
import forge.toolbox.FTextArea;
import forge.util.Localizer;
import forge.util.Utils;
public class ViewWinLose extends FOverlay implements IWinLoseView<FButton> {
@@ -88,16 +87,15 @@ public class ViewWinLose extends FOverlay implements IWinLoseView<FButton> {
control = new ControlWinLose(this, game0);
}
final Localizer localizer = Localizer.getInstance();
btnContinue.setText(localizer.getMessage("btnNextGame"));
btnContinue.setText(Forge.getLocalizer().getMessage("btnNextGame"));
btnContinue.setFont(FSkinFont.get(22));
btnRestart.setText(localizer.getMessage("btnStartNewMatch"));
btnRestart.setText(Forge.getLocalizer().getMessage("btnStartNewMatch"));
btnRestart.setFont(btnContinue.getFont());
btnQuit.setText(localizer.getMessage("btnQuitMatch"));
btnQuit.setText(Forge.getLocalizer().getMessage("btnQuitMatch"));
btnQuit.setFont(btnContinue.getFont());
btnContinue.setEnabled(!game0.isMatchOver());
lblLog = add(new FLabel.Builder().text(localizer.getMessage("lblGameLog")).align(Align.center).font(FSkinFont.get(18)).build());
lblLog = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblGameLog")).align(Align.center).font(FSkinFont.get(18)).build());
txtLog = add(new FTextArea(true, StringUtils.join(game.getGameLog().getLogEntries(null), "\r\n").replace("[COMPUTER]", "[AI]")) {
@Override
public boolean tap(float x, float y, int count) {
@@ -109,14 +107,14 @@ public class ViewWinLose extends FOverlay implements IWinLoseView<FButton> {
});
txtLog.setFont(FSkinFont.get(12));
btnCopyLog = add(new FLabel.ButtonBuilder().text(localizer.getMessage("btnCopyToClipboard")).selectable().command(new FEventHandler() {
btnCopyLog = add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("btnCopyToClipboard")).selectable().command(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
Forge.getClipboard().setContents(txtLog.getText());
}
}).build());
btnShowBattlefield = add(new FLabel.ButtonBuilder().text(localizer.getMessage("lblShowBattlefield")).font(FSkinFont.get(12)).selectable().command(new FEventHandler() {
btnShowBattlefield = add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblShowBattlefield")).font(FSkinFont.get(12)).selectable().command(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
hide();
@@ -132,13 +130,12 @@ public class ViewWinLose extends FOverlay implements IWinLoseView<FButton> {
private String composeTitle(final GameView game) {
final String winner = game.getWinningPlayerName();
final int winningTeam = game.getWinningTeam();
final Localizer localizer = Localizer.getInstance();
if (winner == null) {
return localizer.getMessage("lblItsADraw");
return Forge.getLocalizer().getMessage("lblItsADraw");
} else if (winningTeam != -1) {
return localizer.getMessage("lblTeamWon").replace("%s", String.valueOf(winningTeam));
return Forge.getLocalizer().getMessage("lblTeamWon").replace("%s", String.valueOf(winningTeam));
} else {
return localizer.getMessage("lblWinnerWon").replace("%s", winner);
return Forge.getLocalizer().getMessage("lblWinnerWon").replace("%s", winner);
}
}

4
forge-gui-mobile/src/forge/screens/online/OnlineChatScreen.java
View File

@@ -3,6 +3,7 @@ package forge.screens.online;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.Graphics;
import forge.assets.FSkinColor;
import forge.assets.FSkinColor.Colors;
@@ -21,7 +22,6 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.util.Localizer;
import forge.util.Utils;
public class OnlineChatScreen extends FScreen implements IOnlineChatInterface {
@@ -35,7 +35,7 @@ public class OnlineChatScreen extends FScreen implements IOnlineChatInterface {
public OnlineChatScreen() {
super(null, OnlineMenu.getMenu());
txtSendMessage.setGhostText(Localizer.getInstance().getMessage("lblEnterMessageToSend"));
txtSendMessage.setGhostText(Forge.getLocalizer().getMessage("lblEnterMessageToSend"));
txtSendMessage.setChangedHandler(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {

7
forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java
View File

@@ -20,7 +20,6 @@ import forge.localinstance.skin.FSkinProp;
import forge.screens.LoadingOverlay;
import forge.screens.constructed.LobbyScreen;
import forge.screens.online.OnlineMenu.OnlineScreen;
import forge.util.Localizer;
public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
public OnlineLobbyScreen() {
@@ -60,7 +59,7 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
FThreads.invokeInBackgroundThread(new Runnable() {
@Override
public void run() {
final boolean callBackAlwaysTrue = SOptionPane.showOptionDialog(msg, Localizer.getInstance().getMessage("lblError"), FSkinProp.ICO_WARNING, ImmutableList.of(Localizer.getInstance().getMessage("lblOk")), 1) == 0;
final boolean callBackAlwaysTrue = SOptionPane.showOptionDialog(msg, Forge.getLocalizer().getMessage("lblError"), FSkinProp.ICO_WARNING, ImmutableList.of(Forge.getLocalizer().getMessage("lblOk")), 1) == 0;
if (callBackAlwaysTrue) { //to activate online menu popup when player press play online
GuiBase.setInterrupted(false);
@@ -107,7 +106,7 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
}
final boolean joinServer = url.length() > 0;
final String caption = joinServer ? Localizer.getInstance().getMessage("lblConnectingToServer") : Localizer.getInstance().getMessage("lblStartingServer");
final String caption = joinServer ? Forge.getLocalizer().getMessage("lblConnectingToServer") : Forge.getLocalizer().getMessage("lblStartingServer");
LoadingOverlay.show(caption, new Runnable() {
@Override
public void run() {
@@ -116,7 +115,7 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby {
if (joinServer) {
result = NetConnectUtil.join(url, OnlineLobbyScreen.this, chatInterface);
if (result.getMessage() == ForgeConstants.CLOSE_CONN_COMMAND) { //this message is returned via netconnectutil on exception
closeConn(Localizer.getInstance().getMessage("lblDetectedInvalidHostAddress", url));
closeConn(Forge.getLocalizer().getMessage("lblDetectedInvalidHostAddress", url));
return;
}
}

9
forge-gui-mobile/src/forge/screens/online/OnlineMenu.java
View File

@@ -16,7 +16,6 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FOptionPane;
import forge.util.Callback;
import forge.util.Localizer;
public class OnlineMenu extends FPopupMenu {
public enum OnlineScreen {
@@ -30,13 +29,13 @@ public class OnlineMenu extends FPopupMenu {
OnlineScreen(final String caption0, final FImage icon0, final Class<? extends FScreen> screenClass0) {
screenClass = screenClass0;
item = new FMenuItem(Localizer.getInstance().getMessage(caption0), icon0, new FEventHandler() {
item = new FMenuItem(Forge.getLocalizer().getMessage(caption0), icon0, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
if(screenClass == null) {
FOptionPane.showConfirmDialog(
Localizer.getInstance().getMessage("lblLeaveLobbyDescription"),
Localizer.getInstance().getMessage("lblDisconnect"), new Callback<Boolean>() {
Forge.getLocalizer().getMessage("lblLeaveLobbyDescription"),
Forge.getLocalizer().getMessage("lblDisconnect"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -68,7 +67,7 @@ public class OnlineMenu extends FPopupMenu {
if (screen == null) { //don't initialize screen until it's opened the first time
try {
screen = screenClass.getConstructor().newInstance();
screen.setHeaderCaption(Localizer.getInstance().getMessage("lblPlayOnline") + " - " + item.getText());
screen.setHeaderCaption(Forge.getLocalizer().getMessage("lblPlayOnline") + " - " + item.getText());
}
catch (Exception e) {
e.printStackTrace();

16
forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java
View File

@@ -12,6 +12,7 @@ import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import forge.Forge;
import forge.Graphics;
import forge.animation.ForgeAnimation;
import forge.assets.FSkin;
@@ -43,7 +44,6 @@ import forge.toolbox.FLabel;
import forge.toolbox.GuiChoose;
import forge.util.Aggregates;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.MyRandom;
import forge.util.Utils;
@@ -60,10 +60,10 @@ public class ConquestAEtherScreen extends FScreen {
private final Set<PaperCard> filteredPool = new HashSet<>();
private final Set<PaperCard> strictPool = new HashSet<>();
private final FilterButton btnColorFilter = add(new FilterButton(Localizer.getInstance().getMessage("lblColor"), ConquestUtil.COLOR_FILTERS));
private final FilterButton btnTypeFilter = add(new FilterButton(Localizer.getInstance().getMessage("lblType"), ConquestUtil.TYPE_FILTERS));
private final FilterButton btnRarityFilter = add(new FilterButton(Localizer.getInstance().getMessage("lblRarity"), ConquestUtil.RARITY_FILTERS));
private final FilterButton btnCMCFilter = add(new FilterButton(Localizer.getInstance().getMessage("lblCMC"), ConquestUtil.CMC_FILTERS));
private final FilterButton btnColorFilter = add(new FilterButton(Forge.getLocalizer().getMessage("lblColor"), ConquestUtil.COLOR_FILTERS));
private final FilterButton btnTypeFilter = add(new FilterButton(Forge.getLocalizer().getMessage("lblType"), ConquestUtil.TYPE_FILTERS));
private final FilterButton btnRarityFilter = add(new FilterButton(Forge.getLocalizer().getMessage("lblRarity"), ConquestUtil.RARITY_FILTERS));
private final FilterButton btnCMCFilter = add(new FilterButton(Forge.getLocalizer().getMessage("lblCMC"), ConquestUtil.CMC_FILTERS));
private final FLabel lblShards = add(new FLabel.Builder().font(LABEL_FONT).align(Align.center).parseSymbols().build());
@@ -128,7 +128,7 @@ public class ConquestAEtherScreen extends FScreen {
private void updateAvailableShards() {
int availableShards = FModel.getConquest().getModel().getAEtherShards();
lblShards.setText(Localizer.getInstance().getMessage("lblShardsAE", "{AE}") + availableShards);
lblShards.setText(Forge.getLocalizer().getMessage("lblShardsAE", "{AE}") + availableShards);
}
private void updateShardCost() {
@@ -219,7 +219,7 @@ public class ConquestAEtherScreen extends FScreen {
private String message;
private void updateMessage() {
message = Localizer.getInstance().getMessage("lblTapToPullFromAE", "{AE}");
message = Forge.getLocalizer().getMessage("lblTapToPullFromAE", "{AE}");
if (shardCost == 0) {
message += "--";
@@ -369,7 +369,7 @@ public class ConquestAEtherScreen extends FScreen {
setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
GuiChoose.getChoices(Localizer.getInstance().getMessage("lblSelectCaptionFilter", caption), 0, 1, options, selectedOption, null, new Callback<List<AEtherFilter>>() {
GuiChoose.getChoices(Forge.getLocalizer().getMessage("lblSelectCaptionFilter", caption), 0, 1, options, selectedOption, null, new Callback<List<AEtherFilter>>() {
@Override
public void run(List<AEtherFilter> result) {
if (!result.isEmpty()) {

23
forge-gui-mobile/src/forge/screens/planarconquest/ConquestCollectionScreen.java
View File

@@ -33,7 +33,6 @@ import forge.screens.TabPageScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.util.Localizer;
public class ConquestCollectionScreen extends TabPageScreen<ConquestCollectionScreen> {
private final FLabel lblShards = add(new FLabel.Builder().font(ConquestAEtherScreen.LABEL_FONT).parseSymbols().build());
@@ -42,8 +41,8 @@ public class ConquestCollectionScreen extends TabPageScreen<ConquestCollectionSc
public ConquestCollectionScreen() {
super("", ConquestMenu.getMenu(), new CollectionTab[] {
new CollectionTab(Localizer.getInstance().getMessage("lblCollection"), FSkinImage.SPELLBOOK),
new CollectionTab(Localizer.getInstance().getMessage("lblExile"), FSkinImage.EXILE)
new CollectionTab(Forge.getLocalizer().getMessage("lblCollection"), FSkinImage.SPELLBOOK),
new CollectionTab(Forge.getLocalizer().getMessage("lblExile"), FSkinImage.EXILE)
}, true);
btnExileRetrieveMultiple.setVisible(false); //hide unless in multi-select mode
btnExileRetrieveMultiple.setCommand(new FEventHandler() {
@@ -111,7 +110,7 @@ public class ConquestCollectionScreen extends TabPageScreen<ConquestCollectionSc
private void updateShards() {
int availableShards = FModel.getConquest().getModel().getAEtherShards();
lblShards.setText(Localizer.getInstance().getMessage("lblHaveNAEShards", String.valueOf(availableShards) ,"{AE}"));
lblShards.setText(Forge.getLocalizer().getMessage("lblHaveNAEShards", String.valueOf(availableShards) ,"{AE}"));
}
private void updateInfo() {
@@ -120,7 +119,7 @@ public class ConquestCollectionScreen extends TabPageScreen<ConquestCollectionSc
double exileValue = prefs.getPrefInt(CQPref.AETHER_BASE_EXILE_VALUE);
double retrieveCost = prefs.getPrefInt(CQPref.AETHER_BASE_RETRIEVE_COST);
lblInfo.setText(Localizer.getInstance().getMessage("lblExileRetrieveProportion", Math.round(100 * exileValue / baseValue), Math.round(100 * retrieveCost / baseValue)));
lblInfo.setText(Forge.getLocalizer().getMessage("lblExileRetrieveProportion", Math.round(100 * exileValue / baseValue), Math.round(100 * retrieveCost / baseValue)));
}
private void refreshCards() {
@@ -145,23 +144,23 @@ public class ConquestCollectionScreen extends TabPageScreen<ConquestCollectionSc
CQPref baseValuePref;
Collection<PaperCard> cards;
if (getSelectedPage() == tabPages[0]) {
caption = Localizer.getInstance().getMessage("lblExile");
caption = Forge.getLocalizer().getMessage("lblExile");
baseValuePref = CQPref.AETHER_BASE_EXILE_VALUE;
cards = getCollectionTab().list.getSelectedItems();
}
else {
caption = Localizer.getInstance().getMessage("lblRetrieve");
caption = Forge.getLocalizer().getMessage("lblRetrieve");
baseValuePref = CQPref.AETHER_BASE_RETRIEVE_COST;
cards = getExileTab().list.getSelectedItems();
}
int count = cards.size();
if (count == 0) {
caption = Localizer.getInstance().getMessage("lblCancel");
caption = Forge.getLocalizer().getMessage("lblCancel");
}
else {
if (count > 1) {
caption += " " + count + " " + Localizer.getInstance().getMessage("lblCards");
caption += " " + count + " " + Forge.getLocalizer().getMessage("lblCards");
}
int total = 0;
for (PaperCard card : cards) {
@@ -237,7 +236,7 @@ public class ConquestCollectionScreen extends TabPageScreen<ConquestCollectionSc
final ConquestData model = FModel.getConquest().getModel();
if (model.isInExile(card)) {
final int cost = ConquestUtil.getShardValue(card, CQPref.AETHER_BASE_RETRIEVE_COST);
item = new FMenuItem(Localizer.getInstance().getMessage("lblRetrieveForNAE", String.valueOf(cost), "{AE}"), Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, new FEventHandler() {
item = new FMenuItem(Forge.getLocalizer().getMessage("lblRetrieveForNAE", String.valueOf(cost), "{AE}"), Forge.hdbuttons ? FSkinImage.HDPLUS : FSkinImage.PLUS, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
FThreads.invokeInBackgroundThread(new Runnable() {
@@ -261,7 +260,7 @@ public class ConquestCollectionScreen extends TabPageScreen<ConquestCollectionSc
}
else {
final int value = ConquestUtil.getShardValue(card, CQPref.AETHER_BASE_EXILE_VALUE);
item = new FMenuItem(Localizer.getInstance().getMessage("lblExileForNAE", String.valueOf(value), "{AE}"), FSkinImage.EXILE, new FEventHandler() {
item = new FMenuItem(Forge.getLocalizer().getMessage("lblExileForNAE", String.valueOf(value), "{AE}"), FSkinImage.EXILE, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
FThreads.invokeInBackgroundThread(new Runnable() {
@@ -325,7 +324,7 @@ public class ConquestCollectionScreen extends TabPageScreen<ConquestCollectionSc
private static class CardOriginFilter extends ComboBoxFilter<PaperCard, ConquestPlane> {
public CardOriginFilter(ItemManager<? super PaperCard> itemManager0) {
super(Localizer.getInstance().getMessage("lblAllPlanes"), FModel.getPlanes(), itemManager0);
super(Forge.getLocalizer().getMessage("lblAllPlanes"), FModel.getPlanes(), itemManager0);
}
@Override

13
forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java
View File

@@ -41,19 +41,18 @@ import forge.toolbox.FList.CompactModeHandler;
import forge.toolbox.FOptionPane;
import forge.toolbox.FTextField;
import forge.util.Callback;
import forge.util.Localizer;
public class ConquestCommandersScreen extends FScreen {
private static final float PADDING = FDeckChooser.PADDING;
private final CommanderManager lstCommanders = add(new CommanderManager());
private final FButton btnViewDeck = add(new FButton(Localizer.getInstance().getMessage("lblViewDeck")));
private final FButton btnEditDeck = add(new FButton(Localizer.getInstance().getMessage("btnEditDeck")));
private final FButton btnViewDeck = add(new FButton(Forge.getLocalizer().getMessage("lblViewDeck")));
private final FButton btnEditDeck = add(new FButton(Forge.getLocalizer().getMessage("btnEditDeck")));
private boolean preventRefreshOnActivate;
public ConquestCommandersScreen() {
super(Localizer.getInstance().getMessage("lblSelectCommander"), ConquestMenu.getMenu());
super(Forge.getLocalizer().getMessage("lblSelectCommander"), ConquestMenu.getMenu());
lstCommanders.setup(ItemManagerConfig.CONQUEST_COMMANDERS);
lstCommanders.setItemActivateHandler(new FEventHandler() {
@@ -109,7 +108,7 @@ public class ConquestCommandersScreen extends FScreen {
String problem = DeckFormat.PlanarConquest.getDeckConformanceProblem(commander.getDeck());
if (problem != null) {
//prevent selecting a commander with an invalid deck
FOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblCantSelectDeckBecause", commander.getName(), problem), Localizer.getInstance().getMessage("lblInvalidDeck"), FOptionPane.INFORMATION_ICON, new Callback<Integer>() {
FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblCantSelectDeckBecause", commander.getName(), problem), Forge.getLocalizer().getMessage("lblInvalidDeck"), FOptionPane.INFORMATION_ICON, new Callback<Integer>() {
@Override
public void run(Integer result) {
canCloseCallback.run(false);
@@ -159,7 +158,7 @@ public class ConquestCommandersScreen extends FScreen {
private static class CommanderManager extends ItemManager<ConquestCommander> {
private CommanderManager() {
super(ConquestCommander.class, true);
setCaption(Localizer.getInstance().getMessage("lblCommanders"));
setCaption(Forge.getLocalizer().getMessage("lblCommanders"));
}
@Override
@@ -289,7 +288,7 @@ public class ConquestCommandersScreen extends FScreen {
private static class CommanderOriginFilter extends ComboBoxFilter<ConquestCommander, ConquestPlane> {
public CommanderOriginFilter(ItemManager<? super ConquestCommander> itemManager0) {
super(Localizer.getInstance().getMessage("lblAllPlanes"), FModel.getPlanes(), itemManager0);
super(Forge.getLocalizer().getMessage("lblAllPlanes"), FModel.getPlanes(), itemManager0);
}
@Override

4
forge-gui-mobile/src/forge/screens/planarconquest/ConquestDeckEditor.java
View File

@@ -2,6 +2,7 @@ package forge.screens.planarconquest;
import java.util.Map;
import forge.Forge;
import forge.deck.DeckProxy;
import forge.deck.FDeckEditor;
import forge.game.GameType;
@@ -13,11 +14,10 @@ import forge.itemmanager.ItemManagerConfig;
import forge.model.FModel;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
public class ConquestDeckEditor extends FDeckEditor {
public ConquestDeckEditor(final ConquestCommander commander) {
super(EditorType.PlanarConquest, new DeckProxy(commander.getDeck(), Localizer.getInstance().getMessage("lblConquestCommander"),
super(EditorType.PlanarConquest, new DeckProxy(commander.getDeck(), Forge.getLocalizer().getMessage("lblConquestCommander"),
GameType.PlanarConquest, FModel.getConquest().getDecks()), true);
setSaveHandler(new FEventHandler() {

21
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMenu.java
View File

@@ -14,7 +14,6 @@ import forge.screens.home.HomeScreen;
import forge.screens.home.LoadGameMenu.LoadGameScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
public class ConquestMenu extends FPopupMenu {
private static final ConquestMenu conquestMenu = new ConquestMenu();
@@ -27,49 +26,49 @@ public class ConquestMenu extends FPopupMenu {
private static final ConquestStatsScreen statsScreen = new ConquestStatsScreen();
private static final ConquestPrefsScreen prefsScreen = new ConquestPrefsScreen();
private static final FMenuItem multiverseItem = new FMenuItem(Localizer.getInstance().getMessage("lblTheMultiverse"), FSkinImage.MULTIVERSE, new FEventHandler() {
private static final FMenuItem multiverseItem = new FMenuItem(Forge.getLocalizer().getMessage("lblTheMultiverse"), FSkinImage.MULTIVERSE, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(multiverseScreen);
}
});
private static final FMenuItem aetherItem = new FMenuItem(Localizer.getInstance().getMessage("lblTheAether"), FSkinImage.AETHER_SHARD, new FEventHandler() {
private static final FMenuItem aetherItem = new FMenuItem(Forge.getLocalizer().getMessage("lblTheAether"), FSkinImage.AETHER_SHARD, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(aetherScreen);
}
});
private static final FMenuItem commandersItem = new FMenuItem(Localizer.getInstance().getMessage("lblCommanders"), FSkinImage.COMMANDER, new FEventHandler() {
private static final FMenuItem commandersItem = new FMenuItem(Forge.getLocalizer().getMessage("lblCommanders"), FSkinImage.COMMANDER, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(commandersScreen);
}
});
private static final FMenuItem planeswalkersItem = new FMenuItem(Localizer.getInstance().getMessage("lblPlaneswalkers"), FSkinImage.PLANESWALKER, new FEventHandler() {
private static final FMenuItem planeswalkersItem = new FMenuItem(Forge.getLocalizer().getMessage("lblPlaneswalkers"), FSkinImage.PLANESWALKER, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(planeswalkersScreen);
}
});
private static final FMenuItem collectionItem = new FMenuItem(Localizer.getInstance().getMessage("lblCollection"), FSkinImage.SPELLBOOK, new FEventHandler() {
private static final FMenuItem collectionItem = new FMenuItem(Forge.getLocalizer().getMessage("lblCollection"), FSkinImage.SPELLBOOK, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(collectionScreen);
}
});
private static final FMenuItem statsItem = new FMenuItem(Localizer.getInstance().getMessage("lblStatistics"), FSkinImage.MENU_STATS, new FEventHandler() {
private static final FMenuItem statsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblStatistics"), FSkinImage.MENU_STATS, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(statsScreen);
}
});
private static final FMenuItem planeswalkItem = new FMenuItem(Localizer.getInstance().getMessage("lblPlaneswalk"), FSkinImage.PW_BADGE_COMMON, new FEventHandler() {
private static final FMenuItem planeswalkItem = new FMenuItem(Forge.getLocalizer().getMessage("lblPlaneswalk"), FSkinImage.PW_BADGE_COMMON, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(planeswalkScreen);
}
});
private static final FMenuItem prefsItem = new FMenuItem(Localizer.getInstance().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
private static final FMenuItem prefsItem = new FMenuItem(Forge.getLocalizer().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(prefsScreen);
@@ -85,7 +84,7 @@ public class ConquestMenu extends FPopupMenu {
static {
//the first time planarconquest mode is launched, add button for it if in Landscape mode
if (Forge.isLandscapeMode()) {
HomeScreen.instance.addButtonForMode("-"+Localizer.getInstance().getMessage("lblPlanarConquest"), new FEventHandler() {
HomeScreen.instance.addButtonForMode("-"+Forge.getLocalizer().getMessage("lblPlanarConquest"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
launchPlanarConquest(LaunchReason.StartPlanarConquest);
@@ -109,7 +108,7 @@ public class ConquestMenu extends FPopupMenu {
public static void launchPlanarConquest(final LaunchReason reason) {
Forge.lastButtonIndex = 7;
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingCurrentConquest"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingCurrentConquest"), new Runnable() {
@Override
@SuppressWarnings("unchecked")
public void run() {

19
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
View File

@@ -53,7 +53,6 @@ import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
import forge.util.collect.FCollectionView;
@@ -151,7 +150,7 @@ public class ConquestMultiverseScreen extends FScreen {
break;
case PLANESWALK:
if (model.getUnlockedPlaneCount() == model.getAccessiblePlaneCount()) {
FOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblAllPlanesUnlockedNotify"), Localizer.getInstance().getMessage("lblAllPlanesUnlocked"), EMBLEM_IMAGE, new Callback<Integer>() {
FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblAllPlanesUnlockedNotify"), Forge.getLocalizer().getMessage("lblAllPlanesUnlocked"), EMBLEM_IMAGE, new Callback<Integer>() {
@Override
public void run(Integer result) {
launchChaosBattle();
@@ -199,9 +198,9 @@ public class ConquestMultiverseScreen extends FScreen {
return;
}
String title = Localizer.getInstance().getMessage("lblReceivedBoosterPack");
String title = Forge.getLocalizer().getMessage("lblReceivedBoosterPack");
if (totalCount > 1) {
title = Localizer.getInstance().getMessage("lblReceivedBoosterPackNOfTotal", String.valueOf(number), String.valueOf(totalCount));
title = Forge.getLocalizer().getMessage("lblReceivedBoosterPackNOfTotal", String.valueOf(number), String.valueOf(totalCount));
}
number++;
List<ConquestReward> rewards = FModel.getConquest().awardBooster(pool);
@@ -226,9 +225,9 @@ public class ConquestMultiverseScreen extends FScreen {
};
private void awardShards(int shards, boolean fromDuplicateCards) {
String message = Localizer.getInstance().getMessage("lblReceivedAetherShards");
String message = Forge.getLocalizer().getMessage("lblReceivedAetherShards");
if (fromDuplicateCards) { //if from duplicate cards, shards already added to model
message = Localizer.getInstance().getMessage("lblReceivedAetherShardsForDuplicateCards");
message = Forge.getLocalizer().getMessage("lblReceivedAetherShardsForDuplicateCards");
}
else {
model.rewardAEtherShards(shards);
@@ -254,14 +253,14 @@ public class ConquestMultiverseScreen extends FScreen {
};
private void awardBonusPlaneswalkEmblems(int emblems) {
String message = Localizer.getInstance().getMessage("lblReceivedBonusPlaneswalkEmblems");
String message = Forge.getLocalizer().getMessage("lblReceivedBonusPlaneswalkEmblems");
model.rewardPlaneswalkEmblems(emblems);
model.saveData();
FOptionPane.showMessageDialog(String.valueOf(emblems), FSkinFont.get(32), message, EMBLEM_IMAGE);
}
private void launchEvent() {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblStartingBattle"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblStartingBattle"), new Runnable() {
@Override
public void run() {
ConquestLocation loc = model.getCurrentLocation();
@@ -275,7 +274,7 @@ public class ConquestMultiverseScreen extends FScreen {
FThreads.invokeInEdtNowOrLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblChaosApproaching"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblChaosApproaching"), new Runnable() {
@Override
public void run() {
activeBattle = new ConquestChaosBattle();
@@ -679,7 +678,7 @@ public class ConquestMultiverseScreen extends FScreen {
private BattleBar() {
playerAvatar = add(new AvatarDisplay(false));
opponentAvatar = add(new AvatarDisplay(true));
btnBattle = add(new FButton(Localizer.getInstance().getMessage("lblBattle"), new FEventHandler() {
btnBattle = add(new FButton(Forge.getLocalizer().getMessage("lblBattle"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
launchEvent();

3
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java
View File

@@ -24,7 +24,6 @@ import forge.toolbox.FDisplayObject;
import forge.toolbox.FOptionPane;
import forge.toolbox.FTimer;
import forge.toolbox.GuiDialog;
import forge.util.Localizer;
import forge.util.Utils;
import forge.util.collect.FCollectionView;
@@ -135,7 +134,7 @@ public class ConquestPlaneSelector extends FDisplayObject {
if (!desc.isEmpty()) {
GuiDialog.message(plane.getDescription().replace("\\n", "\n"), plane.getName().replace("_", " "));
} else {
GuiDialog.message(Localizer.getInstance().getMessage("lblThisPlaneHasNoDesc"), plane.getName());
GuiDialog.message(Forge.getLocalizer().getMessage("lblThisPlaneHasNoDesc"), plane.getName());
}
return true;
}

54
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java
View File

@@ -1,5 +1,6 @@
package forge.screens.planarconquest;
import forge.Forge;
import forge.assets.FImage;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
@@ -16,7 +17,6 @@ import forge.toolbox.FNumericTextField;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.util.Localizer;
import forge.util.Utils;
public class ConquestPrefsScreen extends FScreen {
@@ -50,35 +50,35 @@ public class ConquestPrefsScreen extends FScreen {
});
public ConquestPrefsScreen() {
super(Localizer.getInstance().getMessage("lblConquestPreference"), ConquestMenu.getMenu());
super(Forge.getLocalizer().getMessage("lblConquestPreference"), ConquestMenu.getMenu());
scroller.add(new PrefsHeader(Localizer.getInstance().getMessage("lblAetherShards"), FSkinImage.AETHER_SHARD, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblBaseDuplicateValue"), CQPref.AETHER_BASE_DUPLICATE_VALUE, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblBaseExileValue"), CQPref.AETHER_BASE_EXILE_VALUE, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblBaseRetrieveCost"), CQPref.AETHER_BASE_RETRIEVE_COST, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblBasePullCost"), CQPref.AETHER_BASE_PULL_COST, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblUncommonMultiplier"), CQPref.AETHER_UNCOMMON_MULTIPLIER, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblRareMultiplier"), CQPref.AETHER_RARE_MULTIPLIER, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblMythicMultiplier"), CQPref.AETHER_MYTHIC_MULTIPLIER, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblStartingShards"), CQPref.AETHER_START_SHARDS, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblChaosWheelShardValue"), CQPref.AETHER_WHEEL_SHARDS, PrefsGroup.AETHER));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblAetherShards"), FSkinImage.AETHER_SHARD, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblBaseDuplicateValue"), CQPref.AETHER_BASE_DUPLICATE_VALUE, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblBaseExileValue"), CQPref.AETHER_BASE_EXILE_VALUE, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblBaseRetrieveCost"), CQPref.AETHER_BASE_RETRIEVE_COST, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblBasePullCost"), CQPref.AETHER_BASE_PULL_COST, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblUncommonMultiplier"), CQPref.AETHER_UNCOMMON_MULTIPLIER, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblRareMultiplier"), CQPref.AETHER_RARE_MULTIPLIER, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblMythicMultiplier"), CQPref.AETHER_MYTHIC_MULTIPLIER, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingShards"), CQPref.AETHER_START_SHARDS, PrefsGroup.AETHER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblChaosWheelShardValue"), CQPref.AETHER_WHEEL_SHARDS, PrefsGroup.AETHER));
scroller.add(new PrefsHeader(Localizer.getInstance().getMessage("lblBoosterPacks"), FSkinImage.PACK, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblCommons"), CQPref.BOOSTER_COMMONS, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblUncommons"), CQPref.BOOSTER_UNCOMMONS, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblRares"), CQPref.BOOSTER_RARES, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblBoostersPerMythic"), CQPref.BOOSTERS_PER_MYTHIC, PrefsGroup.BOOSTER));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblBoosterPacks"), FSkinImage.PACK, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblCommons"), CQPref.BOOSTER_COMMONS, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblUncommons"), CQPref.BOOSTER_UNCOMMONS, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblRares"), CQPref.BOOSTER_RARES, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblBoostersPerMythic"), CQPref.BOOSTERS_PER_MYTHIC, PrefsGroup.BOOSTER));
scroller.add(new PrefsHeader(Localizer.getInstance().getMessage("lblPlaneswalkEmblems"), FSkinImage.PW_BADGE_COMMON, PrefsGroup.PLANESWALK));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblBaseConquerReward"), CQPref.PLANESWALK_CONQUER_EMBLEMS, PrefsGroup.PLANESWALK));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblChaosWheelBonus"), CQPref.PLANESWALK_WHEEL_EMBLEMS, PrefsGroup.PLANESWALK));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblFirstPlaneUnlockCost"), CQPref.PLANESWALK_FIRST_UNLOCK, PrefsGroup.PLANESWALK));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblCostIncreasePerUnlock"), CQPref.PLANESWALK_UNLOCK_INCREASE, PrefsGroup.PLANESWALK));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblPlaneswalkEmblems"), FSkinImage.PW_BADGE_COMMON, PrefsGroup.PLANESWALK));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblBaseConquerReward"), CQPref.PLANESWALK_CONQUER_EMBLEMS, PrefsGroup.PLANESWALK));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblChaosWheelBonus"), CQPref.PLANESWALK_WHEEL_EMBLEMS, PrefsGroup.PLANESWALK));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblFirstPlaneUnlockCost"), CQPref.PLANESWALK_FIRST_UNLOCK, PrefsGroup.PLANESWALK));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblCostIncreasePerUnlock"), CQPref.PLANESWALK_UNLOCK_INCREASE, PrefsGroup.PLANESWALK));
scroller.add(new PrefsHeader(Localizer.getInstance().getMessage("lblChaosBattles"), FSkinImage.CHAOS, PrefsGroup.CHAOS));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblWinsforMediumAI"), CQPref.CHAOS_BATTLE_WINS_MEDIUMAI, PrefsGroup.CHAOS));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblWinsforHardAI"), CQPref.CHAOS_BATTLE_WINS_HARDAI, PrefsGroup.CHAOS));
scroller.add(new PrefsOption(Localizer.getInstance().getMessage("lblWinsforExpertAI"), CQPref.CHAOS_BATTLE_WINS_EXPERTAI, PrefsGroup.CHAOS));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblChaosBattles"), FSkinImage.CHAOS, PrefsGroup.CHAOS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsforMediumAI"), CQPref.CHAOS_BATTLE_WINS_MEDIUMAI, PrefsGroup.CHAOS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsforHardAI"), CQPref.CHAOS_BATTLE_WINS_HARDAI, PrefsGroup.CHAOS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsforExpertAI"), CQPref.CHAOS_BATTLE_WINS_EXPERTAI, PrefsGroup.CHAOS));
}
@Override
@@ -148,7 +148,7 @@ public class ConquestPrefsScreen extends FScreen {
default:
prefType = "";
}
FOptionPane.showErrorDialog(validationError, Localizer.getInstance().getMessage("lblSaveFailed") + prefType);
FOptionPane.showErrorDialog(validationError, Forge.getLocalizer().getMessage("lblSaveFailed") + prefType);
return false;
}

5
forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java
View File

@@ -24,7 +24,6 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Localizer;
import forge.util.Utils;
public class ConquestRewardDialog extends FScrollPane {
@@ -184,7 +183,7 @@ public class ConquestRewardDialog extends FScrollPane {
add(ConquestRewardDialog.this);
initButton(0, Localizer.getInstance().getMessage("lblOK"), new FEventHandler() {
initButton(0, Forge.getLocalizer().getMessage("lblOK"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
hide();
@@ -193,7 +192,7 @@ public class ConquestRewardDialog extends FScrollPane {
}
}
});
initButton(1, Localizer.getInstance().getMessage("lblSkip"), new FEventHandler() {
initButton(1, Forge.getLocalizer().getMessage("lblSkip"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
animation.skip();

4
forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java
View File

@@ -2,6 +2,7 @@ package forge.screens.planarconquest;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.assets.FImage;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
@@ -17,7 +18,6 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FScrollPane;
import forge.util.Localizer;
import forge.util.Utils;
public class ConquestStatsScreen extends FScreen implements IVConquestStats {
@@ -52,7 +52,7 @@ public class ConquestStatsScreen extends FScreen implements IVConquestStats {
public ConquestStatsScreen() {
super(null, ConquestMenu.getMenu());
cbPlanes.addItem(Localizer.getInstance().getMessage("lblAllPlanes"));
cbPlanes.addItem(Forge.getLocalizer().getMessage("lblAllPlanes"));
for (ConquestPlane plane : FModel.getPlanes()) {
if (!plane.isUnreachable() || FModel.getConquest().getModel().getCurrentPlane().equals(plane)) {
cbPlanes.addItem(plane);

23
forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
View File

@@ -37,7 +37,6 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList;
import forge.toolbox.FTextArea;
import forge.util.FileUtil;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
@@ -47,11 +46,11 @@ public class LoadConquestScreen extends LaunchScreen {
private static final FSkinColor OLD_CONQUESTS_BACK_COLOR = FSkinColor.get(Colors.CLR_INACTIVE).getContrastColor(20);
private static final FSkinColor SEL_COLOR = FSkinColor.get(Colors.CLR_ACTIVE);
private final FTextArea lblOldConquests = add(new FTextArea(false, Localizer.getInstance().getMessage("lblLoadingExistingConquests")));
private final FTextArea lblOldConquests = add(new FTextArea(false, Forge.getLocalizer().getMessage("lblLoadingExistingConquests")));
private final ConquestFileLister lstConquests = add(new ConquestFileLister());
private final FButton btnNewConquest = add(new FButton(Localizer.getInstance().getMessage("lblNewQuest")));
private final FButton btnRenameConquest = add(new FButton(Localizer.getInstance().getMessage("lblRename")));
private final FButton btnDeleteConquest = add(new FButton(Localizer.getInstance().getMessage("lblDelete")));
private final FButton btnNewConquest = add(new FButton(Forge.getLocalizer().getMessage("lblNewQuest")));
private final FButton btnRenameConquest = add(new FButton(Forge.getLocalizer().getMessage("lblRename")));
private final FButton btnDeleteConquest = add(new FButton(Forge.getLocalizer().getMessage("lblDelete")));
public LoadConquestScreen() {
super(null, LoadGameMenu.getMenu());
@@ -84,7 +83,7 @@ public class LoadConquestScreen extends LaunchScreen {
@Override
public void onActivate() {
lblOldConquests.setText(Localizer.getInstance().getMessage("lblLoadingExistingConquests"));
lblOldConquests.setText(Forge.getLocalizer().getMessage("lblLoadingExistingConquests"));
lstConquests.clear();
updateEnabledButtons();
revalidate();
@@ -130,7 +129,7 @@ public class LoadConquestScreen extends LaunchScreen {
Gdx.app.postRunnable(new Runnable() {
@Override
public void run() {
lblOldConquests.setText(Localizer.getInstance().getMessage("lblOldConquestDataPutIntoDirAndRestartForge", ForgeConstants.CONQUEST_SAVE_DIR));
lblOldConquests.setText(Forge.getLocalizer().getMessage("lblOldConquestDataPutIntoDirAndRestartForge", ForgeConstants.CONQUEST_SAVE_DIR));
updateEnabledButtons();
revalidate();
lstConquests.scrollIntoView(lstConquests.selectedIndex);
@@ -199,14 +198,14 @@ public class LoadConquestScreen extends LaunchScreen {
String questName;
String oldConquestName = conquest.getName();
while (true) {
questName = SOptionPane.showInputDialog(Localizer.getInstance().getMessage("lblEnterNewConquestName"), Localizer.getInstance().getMessage("lblRenameConquest"), null, oldConquestName);
questName = SOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblEnterNewConquestName"), Forge.getLocalizer().getMessage("lblRenameConquest"), null, oldConquestName);
if (questName == null) { return; }
questName = QuestUtil.cleanString(questName);
if (questName.equals(oldConquestName)) { return; } //quit if chose same name
if (questName.isEmpty()) {
SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblPleaseSpecifyConquestName"));
SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblPleaseSpecifyConquestName"));
continue;
}
@@ -218,7 +217,7 @@ public class LoadConquestScreen extends LaunchScreen {
}
}
if (exists) {
SOptionPane.showMessageDialog(Localizer.getInstance().getMessage("lblConquestNameExistsPleasePickAnotherName"));
SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblConquestNameExistsPleasePickAnotherName"));
continue;
}
break;
@@ -243,8 +242,8 @@ public class LoadConquestScreen extends LaunchScreen {
@Override
public void run() {
if (!SOptionPane.showConfirmDialog(
Localizer.getInstance().getMessage("lblAreYouSuerDeleteConquest", conquest.getName()),
Localizer.getInstance().getMessage("lblDeleteConquest"), Localizer.getInstance().getMessage("lblDelete"), Localizer.getInstance().getMessage("lblCancel"))) {
Forge.getLocalizer().getMessage("lblAreYouSuerDeleteConquest", conquest.getName()),
Forge.getLocalizer().getMessage("lblDeleteConquest"), Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblCancel"))) {
return;
}

10
forge-gui-mobile/src/forge/screens/planarconquest/NewConquestScreen.java
View File

@@ -2,6 +2,7 @@ package forge.screens.planarconquest;
import com.google.common.collect.Iterables;
import forge.Forge;
import forge.assets.FImage;
import forge.card.CardImage;
import forge.card.CardListPreview;
@@ -19,7 +20,6 @@ import forge.screens.home.NewGameMenu;
import forge.screens.planarconquest.ConquestMenu.LaunchReason;
import forge.toolbox.FChoiceList;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
import forge.util.ThreadUtil;
public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenModel> {
@@ -55,7 +55,7 @@ public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenMo
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblStartingNewConquest"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblStartingNewConquest"), new Runnable() {
@Override
public void run() {
ConquestController qc = FModel.getConquest();
@@ -78,7 +78,7 @@ public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenMo
private final ConquestPlaneSelector planeSelector = add(new ConquestPlaneSelector());
protected SelectStartingPlaneStep() {
super(Localizer.getInstance().getMessage("lblSelectStartingPlane"));
super(Forge.getLocalizer().getMessage("lblSelectStartingPlane"));
}
@Override
@@ -123,7 +123,7 @@ public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenMo
private final CardListPreview cardDisplay = add(new CardListPreview(lstCommanders));
protected SelectStartingCommanderStep() {
super(Localizer.getInstance().getMessage("lblSelectStartingCommander"));
super(Forge.getLocalizer().getMessage("lblSelectStartingCommander"));
}
@Override
@@ -182,7 +182,7 @@ public class NewConquestScreen extends MultiStepWizardScreen<NewConquestScreenMo
private final CardListPreview tokenDisplay = add(new CardListPreview(lstPlaneswalkers));
protected SelectStartingPlaneswalkerStep() {
super(Localizer.getInstance().getMessage("lblSelectStartingPlaneswalker"));
super(Forge.getLocalizer().getMessage("lblSelectStartingPlaneswalker"));
}
@Override

24
forge-gui-mobile/src/forge/screens/quest/LoadQuestScreen.java
View File

@@ -39,7 +39,6 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FList;
import forge.toolbox.FTextArea;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
@@ -49,12 +48,11 @@ public class LoadQuestScreen extends LaunchScreen {
private static final FSkinColor OLD_QUESTS_BACK_COLOR = FSkinColor.get(Colors.CLR_INACTIVE).getContrastColor(20);
private static final FSkinColor SEL_COLOR = FSkinColor.get(Colors.CLR_ACTIVE);
private final Localizer localizer = Localizer.getInstance();
private final FTextArea lblOldQuests = add(new FTextArea(false, Localizer.getInstance().getMessage("lblLoadingExistingQuests")));
private final FTextArea lblOldQuests = add(new FTextArea(false, Forge.getLocalizer().getInstance().getMessage("lblLoadingExistingQuests")));
private final QuestFileLister lstQuests = add(new QuestFileLister());
private final FButton btnNewQuest = add(new FButton(Localizer.getInstance().getMessage("lblNewQuest")));
private final FButton btnRenameQuest = add(new FButton(Localizer.getInstance().getMessage("lblRename")));
private final FButton btnDeleteQuest = add(new FButton(Localizer.getInstance().getMessage("lblDelete")));
private final FButton btnNewQuest = add(new FButton(Forge.getLocalizer().getInstance().getMessage("lblNewQuest")));
private final FButton btnRenameQuest = add(new FButton(Forge.getLocalizer().getInstance().getMessage("lblRename")));
private final FButton btnDeleteQuest = add(new FButton(Forge.getLocalizer().getInstance().getMessage("lblDelete")));
public LoadQuestScreen() {
super(null, LoadGameMenu.getMenu());
@@ -87,7 +85,7 @@ public class LoadQuestScreen extends LaunchScreen {
@Override
public void onActivate() {
lblOldQuests.setText(localizer.getMessage("lblLoadingExistingQuests"));
lblOldQuests.setText(Forge.getLocalizer().getMessage("lblLoadingExistingQuests"));
lstQuests.clear();
updateEnabledButtons();
revalidate();
@@ -142,7 +140,7 @@ public class LoadQuestScreen extends LaunchScreen {
@Override
public void run() {
final String str= ForgeConstants.QUEST_SAVE_DIR.replace('\\', '/');
lblOldQuests.setText(localizer.getMessage("lblOldQuestData").replace("%s",str));
lblOldQuests.setText(Forge.getLocalizer().getMessage("lblOldQuestData").replace("%s",str));
updateEnabledButtons();
revalidate();
lstQuests.scrollIntoView(lstQuests.selectedIndex);
@@ -210,14 +208,14 @@ public class LoadQuestScreen extends LaunchScreen {
String questName;
String oldQuestName = quest.getName();
while (true) {
questName = SOptionPane.showInputDialog(localizer.getMessage("lblEnterNewQuestName"), localizer.getMessage("lblRenameQuest"), null, oldQuestName);
questName = SOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblEnterNewQuestName"), Forge.getLocalizer().getMessage("lblRenameQuest"), null, oldQuestName);
if (questName == null) { return; }
questName = QuestUtil.cleanString(questName);
if (questName.equals(oldQuestName)) { return; } //quit if chose same name
if (questName.isEmpty()) {
SOptionPane.showMessageDialog(localizer.getMessage("lblQuestNameEmpty"));
SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblQuestNameEmpty"));
continue;
}
@@ -229,7 +227,7 @@ public class LoadQuestScreen extends LaunchScreen {
}
}
if (exists) {
SOptionPane.showMessageDialog(localizer.getMessage("lblQuestExists"));
SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblQuestExists"));
continue;
}
break;
@@ -247,8 +245,8 @@ public class LoadQuestScreen extends LaunchScreen {
@Override
public void run() {
if (!SOptionPane.showConfirmDialog(
localizer.getMessage("lblConfirmDelete") + " '" + quest.getName() + "'?",
localizer.getMessage("lblDeleteQuest"), localizer.getMessage("lblDelete"), localizer.getMessage("lblCancel"))) {
Forge.getLocalizer().getMessage("lblConfirmDelete") + " '" + quest.getName() + "'?",
Forge.getLocalizer().getMessage("lblDeleteQuest"), Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblCancel"))) {
return;
}

88
forge-gui-mobile/src/forge/screens/quest/NewQuestScreen.java
View File

@@ -51,7 +51,6 @@ import forge.toolbox.FRadioButton;
import forge.toolbox.FRadioButton.RadioButtonGroup;
import forge.toolbox.FScrollPane;
import forge.util.FileUtil;
import forge.util.Localizer;
import forge.util.ThreadUtil;
import forge.util.Utils;
@@ -62,7 +61,6 @@ public class NewQuestScreen extends FScreen {
private final List<String> customFormatCodes = new ArrayList<>();
private final List<String> customPrizeFormatCodes = new ArrayList<>();
private final Localizer localizer = Localizer.getInstance();
private final class FColorCheckBox extends FCheckBox {
private FColorCheckBox(final String text0) {
@@ -125,70 +123,70 @@ public class NewQuestScreen extends FScreen {
});
@SuppressWarnings("unused")
private final FLabel lblStartingWorld = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblStartingWorld") + ":").build());
private final FLabel lblStartingWorld = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblStartingWorld") + ":").build());
private final FComboBox<QuestWorld> cbxStartingWorld = scroller.add(new FComboBox<>());
@SuppressWarnings("unused")
private final FLabel lblDifficulty = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblDifficulty") + ":").build());
private final FLabel lblDifficulty = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblDifficulty") + ":").build());
private final FComboBox<String> cbxDifficulty = scroller.add(new FComboBox<>(new String[]{
Localizer.getInstance().getMessage("questDifficultyEasy"), Localizer.getInstance().getMessage("questDifficultyMedium"),
Localizer.getInstance().getMessage("questDifficultyHard"), Localizer.getInstance().getMessage("questDifficultyExpert")
Forge.getLocalizer().getMessage("questDifficultyEasy"), Forge.getLocalizer().getMessage("questDifficultyMedium"),
Forge.getLocalizer().getMessage("questDifficultyHard"), Forge.getLocalizer().getMessage("questDifficultyExpert")
}));
@SuppressWarnings("unused")
private final FLabel lblStartingPool = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblStartingPool") + ":").build());
private final FLabel lblStartingPool = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblStartingPool") + ":").build());
private final FComboBox<StartingPoolType> cbxStartingPool = scroller.add(new FComboBox<>());
private final FLabel lblUnrestricted = scroller.add(new FLabel.Builder().align(Align.right).font(FSkinFont.get(12)).text(Localizer.getInstance().getMessage("lblAllCardsAvailable")).build());
private final FLabel lblUnrestricted = scroller.add(new FLabel.Builder().align(Align.right).font(FSkinFont.get(12)).text(Forge.getLocalizer().getMessage("lblAllCardsAvailable")).build());
private final FLabel lblPreconDeck = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblStarterEventdeck") + ":").build());
private final FLabel lblPreconDeck = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblStarterEventdeck") + ":").build());
private final FComboBox<String> cbxPreconDeck = scroller.add(new FComboBox<>());
private final FLabel lblFormat = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblSelectFormat") + ":").build());
private final FLabel lblFormat = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblSelectFormat") + ":").build());
private final FComboBox<GameFormat> cbxFormat = scroller.add(new FComboBox<>());
private final FLabel lblCustomDeck = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblCustomdeck") + ":").build());
private final FLabel lblCustomDeck = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblCustomdeck") + ":").build());
private final FComboBox<Deck> cbxCustomDeck = scroller.add(new FComboBox<>());
private final FLabel btnSelectFormat = scroller.add(new FLabel.ButtonBuilder().text(Localizer.getInstance().getMessage("lblChooseFormats")).build());
private final FLabel btnSelectFormat = scroller.add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblChooseFormats")).build());
private final FLabel lblPoolDistribution = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblStartingPoolDistribution") + ":").build());
private final FRadioButton radBalanced = scroller.add(new FRadioButton(Localizer.getInstance().getMessage("lblBalanced")));
private final FRadioButton radSurpriseMe = scroller.add(new FRadioButton(Localizer.getInstance().getMessage("lblSurpriseMe")));
private final FRadioButton radRandom = scroller.add(new FRadioButton(Localizer.getInstance().getMessage("lblRandom")));
private final FRadioButton radBoosters = scroller.add(new FRadioButton(Localizer.getInstance().getMessage("lblBoosters")));
private final FLabel lblPoolDistribution = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblStartingPoolDistribution") + ":").build());
private final FRadioButton radBalanced = scroller.add(new FRadioButton(Forge.getLocalizer().getMessage("lblBalanced")));
private final FRadioButton radSurpriseMe = scroller.add(new FRadioButton(Forge.getLocalizer().getMessage("lblSurpriseMe")));
private final FRadioButton radRandom = scroller.add(new FRadioButton(Forge.getLocalizer().getMessage("lblRandom")));
private final FRadioButton radBoosters = scroller.add(new FRadioButton(Forge.getLocalizer().getMessage("lblBoosters")));
private final FNumericTextField numberOfBoostersField = scroller.add(new FNumericTextField(10));
private final FLabel lblPreferredColor = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblStartingPoolColors") + ":").build());
private final FColorCheckBox cbBlack = scroller.add(new FColorCheckBox(Localizer.getInstance().getMessage("lblBlack")));
private final FColorCheckBox cbBlue = scroller.add(new FColorCheckBox(Localizer.getInstance().getMessage("lblBlue")));
private final FColorCheckBox cbGreen = scroller.add(new FColorCheckBox(Localizer.getInstance().getMessage("lblGreen")));
private final FColorCheckBox cbRed = scroller.add(new FColorCheckBox(Localizer.getInstance().getMessage("lblRed")));
private final FColorCheckBox cbWhite = scroller.add(new FColorCheckBox(Localizer.getInstance().getMessage("lblWhite")));
private final FColorCheckBox cbColorless = scroller.add(new FColorCheckBox(Localizer.getInstance().getMessage("lblColorless")));
private final FLabel lblPreferredColor = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblStartingPoolColors") + ":").build());
private final FColorCheckBox cbBlack = scroller.add(new FColorCheckBox(Forge.getLocalizer().getMessage("lblBlack")));
private final FColorCheckBox cbBlue = scroller.add(new FColorCheckBox(Forge.getLocalizer().getMessage("lblBlue")));
private final FColorCheckBox cbGreen = scroller.add(new FColorCheckBox(Forge.getLocalizer().getMessage("lblGreen")));
private final FColorCheckBox cbRed = scroller.add(new FColorCheckBox(Forge.getLocalizer().getMessage("lblRed")));
private final FColorCheckBox cbWhite = scroller.add(new FColorCheckBox(Forge.getLocalizer().getMessage("lblWhite")));
private final FColorCheckBox cbColorless = scroller.add(new FColorCheckBox(Forge.getLocalizer().getMessage("lblColorless")));
private final FLabel lblPoolOptions = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblStartingPoolOptions") + ":").build());
private final FCheckBox cbCompleteSet = scroller.add(new FCheckBox(Localizer.getInstance().getMessage("lblStartWithAllCards")));
private final FCheckBox cbDuplicateCards = scroller.add(new FCheckBox(Localizer.getInstance().getMessage("lblAllowDuplicatesStartingPool")));
private final FCheckBox cbIncludeArtifacts = scroller.add(new FCheckBox(Localizer.getInstance().getMessage("lblIncludeArtifactsStartingPool")));
private final FLabel lblPoolOptions = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblStartingPoolOptions") + ":").build());
private final FCheckBox cbCompleteSet = scroller.add(new FCheckBox(Forge.getLocalizer().getMessage("lblStartWithAllCards")));
private final FCheckBox cbDuplicateCards = scroller.add(new FCheckBox(Forge.getLocalizer().getMessage("lblAllowDuplicatesStartingPool")));
private final FCheckBox cbIncludeArtifacts = scroller.add(new FCheckBox(Forge.getLocalizer().getMessage("lblIncludeArtifactsStartingPool")));
@SuppressWarnings("unused")
private final FLabel lblPrizedCards = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblPrizedCards") + ":").build());
private final FLabel lblPrizedCards = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblPrizedCards") + ":").build());
private final FComboBox<Object> cbxPrizedCards = scroller.add(new FComboBox<>());
private final FLabel lblPrizeFormat = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblDefinedFormat") + ":").build());
private final FLabel lblPrizeFormat = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblDefinedFormat") + ":").build());
private final FComboBox<GameFormat> cbxPrizeFormat = scroller.add(new FComboBox<>());
private final FLabel lblPrizeUnrestricted = scroller.add(new FLabel.Builder().align(Align.right).font(FSkinFont.get(12)).text(Localizer.getInstance().getMessage("lblAllCardsAvailableWin")).build());
private final FLabel lblPrizeSameAsStarting = scroller.add(new FLabel.Builder().align(Align.right).font(FSkinFont.get(12)).text(Localizer.getInstance().getMessage("lblOnlyInStartingPoolAvailable")).build());
private final FLabel btnPrizeSelectFormat = scroller.add(new FLabel.ButtonBuilder().text(Localizer.getInstance().getMessage("lblChooseFormats")).build());
private final FLabel lblPrizeUnrestricted = scroller.add(new FLabel.Builder().align(Align.right).font(FSkinFont.get(12)).text(Forge.getLocalizer().getMessage("lblAllCardsAvailableWin")).build());
private final FLabel lblPrizeSameAsStarting = scroller.add(new FLabel.Builder().align(Align.right).font(FSkinFont.get(12)).text(Forge.getLocalizer().getMessage("lblOnlyInStartingPoolAvailable")).build());
private final FLabel btnPrizeSelectFormat = scroller.add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblChooseFormats")).build());
private final FCheckBox cbAllowUnlocks = scroller.add(new FCheckBox(Localizer.getInstance().getMessage("lblAllowUnlockAdEd")));
private final FCheckBox cbFantasy = scroller.add(new FCheckBox(Localizer.getInstance().getMessage("rbFantasyMode")));
private final FCheckBox cbCommander = scroller.add(new FCheckBox(Localizer.getInstance().getMessage("rbCommanderSubformat")));
private final FCheckBox cbAllowUnlocks = scroller.add(new FCheckBox(Forge.getLocalizer().getMessage("lblAllowUnlockAdEd")));
private final FCheckBox cbFantasy = scroller.add(new FCheckBox(Forge.getLocalizer().getMessage("rbFantasyMode")));
private final FCheckBox cbCommander = scroller.add(new FCheckBox(Forge.getLocalizer().getMessage("rbCommanderSubformat")));
private final FLabel btnEmbark = add(new FLabel.ButtonBuilder()
.font(FSkinFont.get(22)).text(Localizer.getInstance().getMessage("lblEmbark")).icon(FSkinImage.QUEST_ZEP).command(new FEventHandler() {
.font(FSkinFont.get(22)).text(Forge.getLocalizer().getMessage("lblEmbark")).icon(FSkinImage.QUEST_ZEP).command(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
//create new quest in game thread so option panes can wait for input
@@ -219,7 +217,7 @@ public class NewQuestScreen extends FScreen {
}
});
cbxPrizedCards.addItem(localizer.getMessage("lblSameAsStartingPool"));
cbxPrizedCards.addItem(Forge.getLocalizer().getMessage("lblSameAsStartingPool"));
cbxPrizedCards.addItem(StartingPoolType.Complete);
cbxPrizedCards.addItem(StartingPoolType.Sanctioned);
cbxPrizedCards.addItem(StartingPoolType.Casual);
@@ -549,7 +547,7 @@ public class NewQuestScreen extends FScreen {
case CustomFormat:
if (customFormatCodes.isEmpty()) {
if (!SOptionPane.showConfirmDialog(
localizer.getMessage("lblCustomFormatWithoutRestrictionGame"))) {
Forge.getLocalizer().getMessage("lblCustomFormatWithoutRestrictionGame"))) {
return;
}
}
@@ -562,7 +560,7 @@ public class NewQuestScreen extends FScreen {
dckStartPool = getSelectedDeck();
if (dckStartPool == null) {
SOptionPane.showMessageDialog(
localizer.getMessage("lbldckStartPool"), localizer.getMessage("lblCannotStartaQuest"), SOptionPane.ERROR_ICON);
Forge.getLocalizer().getMessage("lbldckStartPool"), Forge.getLocalizer().getMessage("lblCannotStartaQuest"), SOptionPane.ERROR_ICON);
return;
}
break;
@@ -610,7 +608,7 @@ public class NewQuestScreen extends FScreen {
case CustomFormat:
if (customPrizeFormatCodes.isEmpty()) {
if (!SOptionPane.showConfirmDialog(
localizer.getMessage("lblCustomFormatWithoutRestrictionPrized"))) {
Forge.getLocalizer().getMessage("lblCustomFormatWithoutRestrictionPrized"))) {
return;
}
}
@@ -626,17 +624,17 @@ public class NewQuestScreen extends FScreen {
String questName;
while (true) {
questName = SOptionPane.showInputDialog(localizer.getMessage("MsgQuestNewName") + ":", localizer.getMessage("TitQuestNewName"));
questName = SOptionPane.showInputDialog(Forge.getLocalizer().getMessage("MsgQuestNewName") + ":", Forge.getLocalizer().getMessage("TitQuestNewName"));
if (questName == null) { return; }
questName = QuestUtil.cleanString(questName);
if (questName.isEmpty()) {
SOptionPane.showMessageDialog(localizer.getMessage("lblQuestNameEmpty"));
SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblQuestNameEmpty"));
continue;
}
if (FileUtil.doesFileExist(ForgeConstants.QUEST_SAVE_DIR + questName + ".dat")) {
SOptionPane.showMessageDialog(localizer.getMessage("lblQuestExists"));
SOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblQuestExists"));
continue;
}
break;
@@ -649,7 +647,7 @@ public class NewQuestScreen extends FScreen {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(localizer.getMessage("lblCreatingNewQuest"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblCreatingNewQuest"), new Runnable() {
@Override
public void run() {
final QuestMode mode = isFantasy() ? QuestMode.Fantasy : QuestMode.Classic;

10
forge-gui-mobile/src/forge/screens/quest/QuestBazaarScreen.java
View File

@@ -28,11 +28,9 @@ import forge.toolbox.FLabel;
import forge.toolbox.FList;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextArea;
import forge.util.Localizer;
import forge.util.Utils;
public class QuestBazaarScreen extends TabPageScreen<QuestBazaarScreen> {
private static final Localizer localizer = Localizer.getInstance();
public QuestBazaarScreen() {
super(getPages());
@@ -61,7 +59,7 @@ public class QuestBazaarScreen extends TabPageScreen<QuestBazaarScreen> {
private final QuestStallDefinition stallDef;
private final FLabel lblStallName = add(new FLabel.Builder().text("").align(Align.center).build());
private final FLabel lblEmpty = add(new FLabel.Builder().font(FSkinFont.get(12))
.text(localizer.getMessage("lblMerchantDoesHaveCommodity"))
.text(Forge.getLocalizer().getMessage("lblMerchantDoesHaveCommodity"))
.align(Align.center).build());
private final FLabel lblCredits = add(new FLabel.Builder().font(FSkinFont.get(15)).icon(FSkinImage.QUEST_COINSTACK).iconScaleFactor(1f).build());
private final FLabel lblLife = add(new FLabel.Builder().font(lblCredits.getFont()).icon(FSkinImage.QUEST_LIFE).iconScaleFactor(1f).align(Align.right).build());
@@ -108,8 +106,8 @@ public class QuestBazaarScreen extends TabPageScreen<QuestBazaarScreen> {
}
final QuestAssets qS = qData.getAssets();
lblCredits.setText(localizer.getMessage("lblCredits") + ": " + QuestUtil.formatCredits(qS.getCredits()));
lblLife.setText(localizer.getMessage("lblLife") + ": " + qS.getLife(qData.getMode()));
lblCredits.setText(Forge.getLocalizer().getMessage("lblCredits") + ": " + QuestUtil.formatCredits(qS.getCredits()));
lblLife.setText(Forge.getLocalizer().getMessage("lblLife") + ": " + qS.getLife(qData.getMode()));
final List<IQuestBazaarItem> items = qData.getBazaar().getItems(qData, stallDef.getName());
@@ -154,7 +152,7 @@ public class QuestBazaarScreen extends TabPageScreen<QuestBazaarScreen> {
private final FTextArea lblDesc = add(new FTextArea(false));
private final FLabel lblIcon = add(new FLabel.Builder().iconInBackground().iconScaleFactor(1f).insets(Vector2.Zero).build());
private final FLabel lblCost = add(new FLabel.Builder().text("0").icon(FSkinImage.QUEST_COINSTACK).iconScaleFactor(1f).build());
private final FLabel btnBuy = add(new FLabel.ButtonBuilder().text(localizer.getMessage("lblBuy")).font(FSkinFont.get(20)).build());
private final FLabel btnBuy = add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("lblBuy")).font(FSkinFont.get(20)).build());
private final IQuestBazaarItem item;

8
forge-gui-mobile/src/forge/screens/quest/QuestChallengesScreen.java
View File

@@ -3,22 +3,22 @@ package forge.screens.quest;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.assets.FSkinFont;
import forge.gui.interfaces.IButton;
import forge.model.FModel;
import forge.toolbox.FLabel;
import forge.util.Localizer;
public class QuestChallengesScreen extends QuestLaunchScreen {
private final FLabel lblInfo = add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblWhichChallenge"))
private final FLabel lblInfo = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblWhichChallenge"))
.align(Align.center).font(FSkinFont.get(16)).build());
private final FLabel lblCurrentDeck = add(new FLabel.Builder()
.text(Localizer.getInstance().getMessage("lblNoDuelDeck")).align(Align.center).insets(Vector2.Zero)
.text(Forge.getLocalizer().getMessage("lblNoDuelDeck")).align(Align.center).insets(Vector2.Zero)
.font(FSkinFont.get(12)).build());
private final FLabel lblNextChallengeInWins = add(new FLabel.Builder()
.text(Localizer.getInstance().getMessage("lblNextChallengeNotYet")).align(Align.center).insets(Vector2.Zero)
.text(Forge.getLocalizer().getMessage("lblNextChallengeNotYet")).align(Align.center).insets(Vector2.Zero)
.font(FSkinFont.get(12)).build());
private final QuestEventPanel.Container pnlChallenges = add(new QuestEventPanel.Container());

14
forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java
View File

@@ -23,21 +23,20 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FTextField;
import forge.util.Localizer;
import forge.util.ThreadUtil;
public class QuestDecksScreen extends FScreen {
private static final float PADDING = FDeckChooser.PADDING;
private final DeckManager lstDecks = add(new DeckManager(GameType.Quest));
private final FButton btnNewDeck = add(new FButton(Localizer.getInstance().getMessage("lblNewDeck")));
private final FButton btnEditDeck = add(new FButton(Localizer.getInstance().getMessage("btnEditDeck")));
private final FButton btnViewDeck = add(new FButton(Localizer.getInstance().getMessage("lblViewDeck")));
private final FButton btnRandom = add(new FButton(Localizer.getInstance().getMessage("lblRandomDeck")));
private final FButton btnNewDeck = add(new FButton(Forge.getLocalizer().getMessage("lblNewDeck")));
private final FButton btnEditDeck = add(new FButton(Forge.getLocalizer().getMessage("btnEditDeck")));
private final FButton btnViewDeck = add(new FButton(Forge.getLocalizer().getMessage("lblViewDeck")));
private final FButton btnRandom = add(new FButton(Forge.getLocalizer().getMessage("lblRandomDeck")));
private final FLabel lblInfo = add(new FLabel.Builder()
.align(Align.center).font(FSkinFont.get(16))
.text(Localizer.getInstance().getMessage("lblBuildorselectadeck")).build());
.text(Forge.getLocalizer().getMessage("lblBuildorselectadeck")).build());
private final FEventHandler onDeckSelectionChanged = new FEventHandler() {
@Override
@@ -73,8 +72,7 @@ public class QuestDecksScreen extends FScreen {
ThreadUtil.invokeInGameThread(new Runnable() { //must run in game thread to prevent blocking UI thread
@Override
public void run() {
final Localizer localizer = Localizer.getInstance();
if (!QuestUtil.checkActiveQuest(localizer.getMessage("lblCreateaDeck"))) {
if (!QuestUtil.checkActiveQuest(Forge.getLocalizer().getMessage("lblCreateaDeck"))) {
return;
}
FThreads.invokeInEdtLater(new Runnable() {

33
forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java
View File

@@ -5,6 +5,7 @@ import java.util.List;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.assets.FSkinFont;
import forge.gamemodes.quest.QuestEventDuel;
import forge.gui.FThreads;
@@ -15,19 +16,18 @@ import forge.screens.home.HomeScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.util.Localizer;
public class QuestDuelsScreen extends QuestLaunchScreen {
private final FLabel lblInfo = add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblSelectNextDuel"))
private final FLabel lblInfo = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblSelectNextDuel"))
.align(Align.center).font(FSkinFont.get(16)).build());
private final FLabel lblCurrentDeck = add(new FLabel.Builder()
.text(Localizer.getInstance().getMessage("lblNoDuelDeck")).align(Align.center).insets(Vector2.Zero)
.text(Forge.getLocalizer().getMessage("lblNoDuelDeck")).align(Align.center).insets(Vector2.Zero)
.font(FSkinFont.get(12)).build());
private final FLabel lblNextChallengeInWins = add(new FLabel.Builder()
.text(Localizer.getInstance().getMessage("lblNextChallengeNotYet")).align(Align.center).insets(Vector2.Zero)
.text(Forge.getLocalizer().getMessage("lblNextChallengeNotYet")).align(Align.center).insets(Vector2.Zero)
.font(FSkinFont.get(12)).build());
private final QuestEventPanel.Container pnlDuels = add(new QuestEventPanel.Container());
@@ -71,25 +71,16 @@ public class QuestDuelsScreen extends QuestLaunchScreen {
@Override
public void onUpdate() {
//add loading overlay for generated decks...
if (HomeScreen.instance.getQuestWorld().contains("Random")) {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingCurrentQuest"), new Runnable() {
@Override
public void run() {
generateDuels();
}
});
}
});
} else {
generateDuels();
}
}
private void generateDuels() {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingCurrentQuest"), new Runnable() {
@Override
public void run() {
pnlDuels.clear();
List<QuestEventDuel> duels = FModel.getQuest().getDuelsManager().generateDuels();
if (duels != null) {
@@ -99,4 +90,8 @@ public class QuestDuelsScreen extends QuestLaunchScreen {
}
pnlDuels.revalidate();
}
});
}
});
}
}

4
forge-gui-mobile/src/forge/screens/quest/QuestLaunchScreen.java
View File

@@ -1,12 +1,12 @@
package forge.screens.quest;
import forge.Forge;
import forge.gamemodes.quest.QuestUtil;
import forge.gui.FThreads;
import forge.model.FModel;
import forge.screens.LaunchScreen;
import forge.screens.LoadingOverlay;
import forge.toolbox.FOptionPane;
import forge.util.Localizer;
public abstract class QuestLaunchScreen extends LaunchScreen {
protected static final float PADDING = FOptionPane.PADDING;
@@ -29,7 +29,7 @@ public abstract class QuestLaunchScreen extends LaunchScreen {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingNewGame"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingNewGame"), new Runnable() {
@Override
public void run() {
QuestUtil.finishStartingGame();

25
forge-gui-mobile/src/forge/screens/quest/QuestMenu.java
View File

@@ -28,7 +28,6 @@ import forge.screens.home.LoadGameMenu.LoadGameScreen;
import forge.screens.home.NewGameMenu.NewGameScreen;
import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Localizer;
import forge.util.ThreadUtil;
public class QuestMenu extends FPopupMenu implements IVQuestStats {
@@ -43,49 +42,49 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
private static final QuestStatsScreen statsScreen = new QuestStatsScreen();
private static final QuestTournamentsScreen tournamentsScreen = new QuestTournamentsScreen();
private static final FMenuItem duelsItem = new FMenuItem(Localizer.getInstance().getMessage("lblDuels"), FSkinImage.QUEST_BIG_SWORD, new FEventHandler() {
private static final FMenuItem duelsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblDuels"), FSkinImage.QUEST_BIG_SWORD, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(duelsScreen);
}
});
private static final FMenuItem challengesItem = new FMenuItem(Localizer.getInstance().getMessage("lblChallenges"), FSkinImage.QUEST_HEART, new FEventHandler() {
private static final FMenuItem challengesItem = new FMenuItem(Forge.getLocalizer().getMessage("lblChallenges"), FSkinImage.QUEST_HEART, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(challengesScreen);
}
});
private static final FMenuItem tournamentsItem = new FMenuItem(Localizer.getInstance().getMessage("lblTournaments"), FSkinImage.QUEST_BIG_SHIELD, new FEventHandler() {
private static final FMenuItem tournamentsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblTournaments"), FSkinImage.QUEST_BIG_SHIELD, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(tournamentsScreen);
}
});
private static final FMenuItem decksItem = new FMenuItem(Localizer.getInstance().getMessage("lblQuestDecks"), FSkinImage.QUEST_BIG_BAG, new FEventHandler() {
private static final FMenuItem decksItem = new FMenuItem(Forge.getLocalizer().getMessage("lblQuestDecks"), FSkinImage.QUEST_BIG_BAG, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(decksScreen);
}
});
private static final FMenuItem spellShopItem = new FMenuItem(Localizer.getInstance().getMessage("lblSpellShop"), FSkinImage.QUEST_BOOK, new FEventHandler() {
private static final FMenuItem spellShopItem = new FMenuItem(Forge.getLocalizer().getMessage("lblSpellShop"), FSkinImage.QUEST_BOOK, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(spellShopScreen);
}
});
private static final FMenuItem bazaarItem = new FMenuItem(Localizer.getInstance().getMessage("lblBazaar"), FSkinImage.QUEST_BOTTLES, new FEventHandler() {
private static final FMenuItem bazaarItem = new FMenuItem(Forge.getLocalizer().getMessage("lblBazaar"), FSkinImage.QUEST_BOTTLES, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(bazaarScreen);
}
});
private static final FMenuItem statsItem = new FMenuItem(Localizer.getInstance().getMessage("lblStatistics"), FSkinImage.MENU_STATS, new FEventHandler() {
private static final FMenuItem statsItem = new FMenuItem(Forge.getLocalizer().getMessage("lblStatistics"), FSkinImage.MENU_STATS, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(statsScreen);
}
});
private static final FMenuItem unlockSetsItem = new FMenuItem(Localizer.getInstance().getMessage("btnUnlockSets"), FSkinImage.QUEST_MAP, new FEventHandler() {
private static final FMenuItem unlockSetsItem = new FMenuItem(Forge.getLocalizer().getMessage("btnUnlockSets"), FSkinImage.QUEST_MAP, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() { //invoke in background thread so prompts can work
@@ -102,7 +101,7 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
});
}
});
private static final FMenuItem travelItem = new FMenuItem(Localizer.getInstance().getMessage("btnTravel"), FSkinImage.QUEST_MAP, new FEventHandler() {
private static final FMenuItem travelItem = new FMenuItem(Forge.getLocalizer().getMessage("btnTravel"), FSkinImage.QUEST_MAP, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() { //invoke in background thread so prompts can work
@@ -119,7 +118,7 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
});
}
});
private static final FMenuItem prefsItem = new FMenuItem(Localizer.getInstance().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
private static final FMenuItem prefsItem = new FMenuItem(Forge.getLocalizer().getMessage("Preferences"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
setCurrentScreen(prefsScreen);
@@ -160,7 +159,7 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
static {
//the first time quest mode is launched, add button for it if in Landscape mode
if (Forge.isLandscapeMode()) {
HomeScreen.instance.addButtonForMode("-"+Localizer.getInstance().getMessage("lblQuestMode"), new FEventHandler() {
HomeScreen.instance.addButtonForMode("-"+Forge.getLocalizer().getMessage("lblQuestMode"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
launchQuestMode(LaunchReason.StartQuestMode, HomeScreen.instance.getQuestCommanderMode());
@@ -191,7 +190,7 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats {
final String questname = FModel.getQuestPreferences().getPref(QPref.CURRENT_QUEST);
final File data = new File(dirQuests.getPath(), questname);
if (data.exists()) {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingCurrentQuest"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getMessage("lblLoadingCurrentQuest"), new Runnable() {
@Override
@SuppressWarnings("unchecked")
public void run() {

171
forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java
View File

@@ -1,5 +1,6 @@
package forge.screens.quest;
import forge.Forge;
import forge.assets.FImage;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
@@ -16,12 +17,10 @@ import forge.toolbox.FNumericTextField;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.toolbox.FTextField;
import forge.util.Localizer;
import forge.util.Utils;
public class QuestPrefsScreen extends FScreen {
private static final float PADDING = Utils.scale(5);
private static final Localizer localizer = Localizer.getInstance();
private enum PrefsGroup {
REWARDS,
@@ -56,44 +55,44 @@ public class QuestPrefsScreen extends FScreen {
});
public QuestPrefsScreen() {
super(localizer.getMessage("lblQuestPreferences"), QuestMenu.getMenu());
super(Forge.getLocalizer().getMessage("lblQuestPreferences"), QuestMenu.getMenu());
//Rewards
scroller.add(new PrefsHeader(localizer.getMessage("lblRewards"), FSkinImage.QUEST_COIN, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblBaseWinnings"), QPref.REWARDS_BASE, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblNoLosses"), QPref.REWARDS_UNDEFEATED, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblPoisonWin"), QPref.REWARDS_POISON, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblMillingWin"), QPref.REWARDS_MILLED, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblMulligan0Win"), QPref.REWARDS_MULLIGAN0, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblAlternativeWin"), QPref.REWARDS_ALTERNATIVE, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblWinbyTurn15"), QPref.REWARDS_TURN15, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblWinbyTurn10"), QPref.REWARDS_TURN10, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblWinbyTurn5"), QPref.REWARDS_TURN5, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblFirstTurnWin"), QPref.REWARDS_TURN1, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(localizer.getMessage("lblExcludePromosFromRewardPool"), QPref.EXCLUDE_PROMOS_FROM_POOL, PrefsGroup.REWARDS));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblRewards"), FSkinImage.QUEST_COIN, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblBaseWinnings"), QPref.REWARDS_BASE, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblNoLosses"), QPref.REWARDS_UNDEFEATED, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblPoisonWin"), QPref.REWARDS_POISON, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblMillingWin"), QPref.REWARDS_MILLED, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblMulligan0Win"), QPref.REWARDS_MULLIGAN0, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblAlternativeWin"), QPref.REWARDS_ALTERNATIVE, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinbyTurn15"), QPref.REWARDS_TURN15, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinbyTurn10"), QPref.REWARDS_TURN10, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinbyTurn5"), QPref.REWARDS_TURN5, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblFirstTurnWin"), QPref.REWARDS_TURN1, PrefsGroup.REWARDS));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblExcludePromosFromRewardPool"), QPref.EXCLUDE_PROMOS_FROM_POOL, PrefsGroup.REWARDS));
//Booster Pack Ratios
scroller.add(new PrefsHeader(localizer.getMessage("lblBoosterPackRatios"), FSkinImage.QUEST_BOOK, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(localizer.getMessage("lblCommon"), QPref.BOOSTER_COMMONS, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(localizer.getMessage("lblUncommon"), QPref.BOOSTER_UNCOMMONS, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(localizer.getMessage("lblRare"), QPref.BOOSTER_RARES, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(localizer.getMessage("lblSpecialBoosters"), QPref.SPECIAL_BOOSTERS, PrefsGroup.BOOSTER));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblBoosterPackRatios"), FSkinImage.QUEST_BOOK, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblCommon"), QPref.BOOSTER_COMMONS, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblUncommon"), QPref.BOOSTER_UNCOMMONS, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblRare"), QPref.BOOSTER_RARES, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblSpecialBoosters"), QPref.SPECIAL_BOOSTERS, PrefsGroup.BOOSTER));
//Shop Preferences
scroller.add(new PrefsHeader(localizer.getMessage("lblShopPreferences"), FSkinImage.QUEST_COIN, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblMaximumPacks"), QPref.SHOP_MAX_PACKS, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingPacks"), QPref.SHOP_STARTING_PACKS, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsforPack"), QPref.SHOP_WINS_FOR_ADDITIONAL_PACK, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsperSetUnlock"), QPref.WINS_UNLOCK_SET, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblCommonSingles"), QPref.SHOP_SINGLES_COMMON, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblUncommonSingles"), QPref.SHOP_SINGLES_UNCOMMON, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblRareSingles"), QPref.SHOP_SINGLES_RARE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblSellingPercentageBase"), QPref.SHOP_SELLING_PERCENTAGE_BASE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblSellingPercentageMax"), QPref.SHOP_SELLING_PERCENTAGE_MAX, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblSellingPriceMax"), QPref.SHOP_MAX_SELLING_PRICE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblPlaysetSize"), QPref.PLAYSET_SIZE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblPlaysetSizeBasicLand"), QPref.PLAYSET_BASIC_LAND_SIZE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(localizer.getMessage("lblPlaysetSizeAnyNumber"), QPref.PLAYSET_ANY_NUMBER_SIZE, PrefsGroup.SHOP));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblShopPreferences"), FSkinImage.QUEST_COIN, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblMaximumPacks"), QPref.SHOP_MAX_PACKS, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingPacks"), QPref.SHOP_STARTING_PACKS, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsforPack"), QPref.SHOP_WINS_FOR_ADDITIONAL_PACK, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsperSetUnlock"), QPref.WINS_UNLOCK_SET, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblCommonSingles"), QPref.SHOP_SINGLES_COMMON, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblUncommonSingles"), QPref.SHOP_SINGLES_UNCOMMON, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblRareSingles"), QPref.SHOP_SINGLES_RARE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblSellingPercentageBase"), QPref.SHOP_SELLING_PERCENTAGE_BASE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblSellingPercentageMax"), QPref.SHOP_SELLING_PERCENTAGE_MAX, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblSellingPriceMax"), QPref.SHOP_MAX_SELLING_PRICE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblPlaysetSize"), QPref.PLAYSET_SIZE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblPlaysetSizeBasicLand"), QPref.PLAYSET_BASIC_LAND_SIZE, PrefsGroup.SHOP));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblPlaysetSizeAnyNumber"), QPref.PLAYSET_ANY_NUMBER_SIZE, PrefsGroup.SHOP));
//Quest Draft Tournament Preferences
//NOTE: -- currently this setting is ignored since only the AI vs. AI Simulation mode can be used on mobile without hanging the game.
@@ -101,63 +100,63 @@ public class QuestPrefsScreen extends FScreen {
//scroller.add(new PrefsOption("Simulate AI vs. AI Results", QPref.SIMULATE_AI_VS_AI_RESULTS, PrefsGroup.DRAFT_TOURNAMENTS));
//Difficulty Adjustments (All)
scroller.add(new PrefsHeader(localizer.getMessage("lblDifficultyAdjustmentsAll"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_ALL));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblDifficultyAdjustmentsAll"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_ALL));
//scroller.add(new PrefsOption("Starting basic lands", QPref.STARTING_BASIC_LANDS, PrefsGroup.DIFFICULTY_ALL)); // Add Basic Lands is used instead
scroller.add(new PrefsOption(localizer.getMessage("lblStartingSnowLands"), QPref.STARTING_SNOW_LANDS, PrefsGroup.DIFFICULTY_ALL));
scroller.add(new PrefsOption(localizer.getMessage("lblColorBias"), QPref.STARTING_POOL_COLOR_BIAS, PrefsGroup.DIFFICULTY_ALL));
scroller.add(new PrefsOption(localizer.getMessage("lblPenaltyforLoss"), QPref.PENALTY_LOSS, PrefsGroup.DIFFICULTY_ALL));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingSnowLands"), QPref.STARTING_SNOW_LANDS, PrefsGroup.DIFFICULTY_ALL));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblColorBias"), QPref.STARTING_POOL_COLOR_BIAS, PrefsGroup.DIFFICULTY_ALL));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblPenaltyforLoss"), QPref.PENALTY_LOSS, PrefsGroup.DIFFICULTY_ALL));
//wild opponents addon
scroller.add(new PrefsOption(localizer.getMessage("lblWildOpponentMultiplier"), QPref.WILD_OPPONENTS_MULTIPLIER, PrefsGroup.DIFFICULTY_ALL));
scroller.add(new PrefsOption(localizer.getMessage("lblWildOpponentNumber"), QPref.WILD_OPPONENTS_NUMBER, PrefsGroup.DIFFICULTY_ALL));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWildOpponentMultiplier"), QPref.WILD_OPPONENTS_MULTIPLIER, PrefsGroup.DIFFICULTY_ALL));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWildOpponentNumber"), QPref.WILD_OPPONENTS_NUMBER, PrefsGroup.DIFFICULTY_ALL));
//Difficulty Adjustments (Easy)
scroller.add(new PrefsHeader(localizer.getMessage("lblDifficultyAdjustmentsEasy"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForBooster"), QPref.WINS_BOOSTER_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForRankIncrease"), QPref.WINS_RANKUP_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForMediumAI"), QPref.WINS_MEDIUMAI_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForHardAI"), QPref.WINS_HARDAI_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForExpertAI"), QPref.WINS_EXPERTAI_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingCommons"), QPref.STARTING_COMMONS_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingUncommons"), QPref.STARTING_UNCOMMONS_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingRares"), QPref.STARTING_RARES_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingCredits"), QPref.STARTING_CREDITS_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblDifficultyAdjustmentsEasy"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForBooster"), QPref.WINS_BOOSTER_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForRankIncrease"), QPref.WINS_RANKUP_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForMediumAI"), QPref.WINS_MEDIUMAI_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForHardAI"), QPref.WINS_HARDAI_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForExpertAI"), QPref.WINS_EXPERTAI_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingCommons"), QPref.STARTING_COMMONS_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingUncommons"), QPref.STARTING_UNCOMMONS_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingRares"), QPref.STARTING_RARES_EASY, PrefsGroup.DIFFICULTY_EASY));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingCredits"), QPref.STARTING_CREDITS_EASY, PrefsGroup.DIFFICULTY_EASY));
//Difficulty Adjustments (Medium)
scroller.add(new PrefsHeader(localizer.getMessage("lblDifficultyAdjustmentsMedium"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForBooster"), QPref.WINS_BOOSTER_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForRankIncrease"), QPref.WINS_RANKUP_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForMediumAI"), QPref.WINS_MEDIUMAI_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForHardAI"), QPref.WINS_HARDAI_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForExpertAI"), QPref.WINS_EXPERTAI_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingCommons"), QPref.STARTING_COMMONS_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingUncommons"), QPref.STARTING_UNCOMMONS_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingRares"), QPref.STARTING_RARES_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingCredits"), QPref.STARTING_CREDITS_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblDifficultyAdjustmentsMedium"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForBooster"), QPref.WINS_BOOSTER_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForRankIncrease"), QPref.WINS_RANKUP_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForMediumAI"), QPref.WINS_MEDIUMAI_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForHardAI"), QPref.WINS_HARDAI_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForExpertAI"), QPref.WINS_EXPERTAI_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingCommons"), QPref.STARTING_COMMONS_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingUncommons"), QPref.STARTING_UNCOMMONS_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingRares"), QPref.STARTING_RARES_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingCredits"), QPref.STARTING_CREDITS_MEDIUM, PrefsGroup.DIFFICULTY_MEDIUM));
//Difficulty Adjustments (Hard)
scroller.add(new PrefsHeader(localizer.getMessage("lblDifficultyAdjustmentsHard"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForBooster"), QPref.WINS_BOOSTER_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForRankIncrease"), QPref.WINS_RANKUP_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForMediumAI"), QPref.WINS_MEDIUMAI_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForHardAI"), QPref.WINS_HARDAI_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForExpertAI"), QPref.WINS_EXPERTAI_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingCommons"), QPref.STARTING_COMMONS_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingUncommons"), QPref.STARTING_UNCOMMONS_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingRares"), QPref.STARTING_RARES_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingCredits"), QPref.STARTING_CREDITS_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblDifficultyAdjustmentsHard"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForBooster"), QPref.WINS_BOOSTER_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForRankIncrease"), QPref.WINS_RANKUP_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForMediumAI"), QPref.WINS_MEDIUMAI_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForHardAI"), QPref.WINS_HARDAI_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForExpertAI"), QPref.WINS_EXPERTAI_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingCommons"), QPref.STARTING_COMMONS_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingUncommons"), QPref.STARTING_UNCOMMONS_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingRares"), QPref.STARTING_RARES_HARD, PrefsGroup.DIFFICULTY_HARD));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingCredits"), QPref.STARTING_CREDITS_HARD, PrefsGroup.DIFFICULTY_HARD));
//Difficulty Adjustments (Expert)
scroller.add(new PrefsHeader(localizer.getMessage("lblDifficultyAdjustmentsExpert"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForBooster"), QPref.WINS_BOOSTER_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForRankIncrease"), QPref.WINS_RANKUP_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForMediumAI"), QPref.WINS_MEDIUMAI_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForHardAI"), QPref.WINS_HARDAI_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(localizer.getMessage("lblWinsForExpertAI"), QPref.WINS_EXPERTAI_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingCommons"), QPref.STARTING_COMMONS_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingUncommons"), QPref.STARTING_UNCOMMONS_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingRares"), QPref.STARTING_RARES_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(localizer.getMessage("lblStartingCredits"), QPref.STARTING_CREDITS_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsHeader(Forge.getLocalizer().getMessage("lblDifficultyAdjustmentsExpert"), FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForBooster"), QPref.WINS_BOOSTER_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForRankIncrease"), QPref.WINS_RANKUP_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForMediumAI"), QPref.WINS_MEDIUMAI_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForHardAI"), QPref.WINS_HARDAI_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblWinsForExpertAI"), QPref.WINS_EXPERTAI_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingCommons"), QPref.STARTING_COMMONS_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingUncommons"), QPref.STARTING_UNCOMMONS_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingRares"), QPref.STARTING_RARES_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
scroller.add(new PrefsOption(Forge.getLocalizer().getMessage("lblStartingCredits"), QPref.STARTING_CREDITS_EXPERT, PrefsGroup.DIFFICULTY_EXPERT));
}
@Override
@@ -222,22 +221,22 @@ public class QuestPrefsScreen extends FScreen {
String prefType;
switch (group) {
case REWARDS:
prefType = localizer.getMessage("lblRewards");
prefType = Forge.getLocalizer().getMessage("lblRewards");
break;
case BOOSTER:
prefType = localizer.getMessage("lblBoosterPackRatios");
prefType = Forge.getLocalizer().getMessage("lblBoosterPackRatios");
break;
case SHOP:
prefType = localizer.getMessage("lblShopPreferences");
prefType = Forge.getLocalizer().getMessage("lblShopPreferences");
break;
case DRAFT_TOURNAMENTS:
prefType = localizer.getMessage("lblDraftTournaments");
prefType = Forge.getLocalizer().getMessage("lblDraftTournaments");
break;
default:
prefType = localizer.getMessage("lblDifficultyAdjustments");
prefType = Forge.getLocalizer().getMessage("lblDifficultyAdjustments");
break;
}
FOptionPane.showErrorDialog(validationError, localizer.getMessage("lblSaveFailed") + prefType);
FOptionPane.showErrorDialog(validationError, Forge.getLocalizer().getMessage("lblSaveFailed") + prefType);
return false;
}

34
forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java
View File

@@ -36,14 +36,12 @@ import forge.toolbox.FTextArea;
import forge.toolbox.GuiChoose;
import forge.util.Callback;
import forge.util.ItemPool;
import forge.util.Localizer;
import forge.util.Utils;
public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
private final SpellShopPage spellShopPage;
private final InventoryPage inventoryPage;
private final FLabel btnBuySellMultiple = add(new FLabel.ButtonBuilder().font(FSkinFont.get(16)).parseSymbols().build());
private static final Localizer localizer = Localizer.getInstance();
public QuestSpellShopScreen() {
super("", QuestMenu.getMenu(), new SpellShopBasePage[] { new SpellShopPage(), new InventoryPage() }, true);
@@ -102,7 +100,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
public void update() {
QuestUtil.updateQuestView(QuestMenu.getMenu());
setHeaderCaption(FModel.getQuest().getName() + " - " + localizer.getMessage("lblSpellShop") + "\n(" + FModel.getQuest().getRank() + ")");
setHeaderCaption(FModel.getQuest().getName() + " - " + Forge.getLocalizer().getMessage("lblSpellShop") + "\n(" + FModel.getQuest().getRank() + ")");
QuestSpellShop.updateDecksForEachCard();
double multiplier = QuestSpellShop.updateMultiplier();
@@ -116,14 +114,14 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
final int maxSellPrice = FModel.getQuest().getCards().getSellPriceLimit();
if (maxSellPrice < Integer.MAX_VALUE) {
maxSellingPrice = String.format(localizer.getMessage("lblMaximumSellingCredits"), maxSellPrice);
maxSellingPrice = String.format(Forge.getLocalizer().getMessage("lblMaximumSellingCredits"), maxSellPrice);
}
spellShopPage.lblSellPercentage.setText(localizer.getMessage("lblSellCardsAt") + formatter.format(multiPercent)
+ localizer.getMessage("lblTheirValue") + maxSellingPrice);
spellShopPage.lblSellPercentage.setText(Forge.getLocalizer().getMessage("lblSellCardsAt") + formatter.format(multiPercent)
+ Forge.getLocalizer().getMessage("lblTheirValue") + maxSellingPrice);
}
public void updateCreditsLabel() {
String credits = localizer.getMessage("lblCredits") + ": " + QuestUtil.formatCredits(FModel.getQuest().getAssets().getCredits());
String credits = Forge.getLocalizer().getMessage("lblCredits") + ": " + QuestUtil.formatCredits(FModel.getQuest().getAssets().getCredits());
spellShopPage.lblCredits.setText(credits);
inventoryPage.lblCredits.setText(credits);
}
@@ -133,26 +131,26 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
ItemPool<InventoryItem> items;
long total;
if (getSelectedPage() == spellShopPage) {
caption = localizer.getMessage("lblBuy");
caption = Forge.getLocalizer().getMessage("lblBuy");
items = spellShopPage.itemManager.getSelectedItemPool();
total = QuestSpellShop.getTotalBuyCost(items);
}
else {
caption = localizer.getMessage("lblSell");
caption = Forge.getLocalizer().getMessage("lblSell");
items = inventoryPage.itemManager.getSelectedItemPool();
total = QuestSpellShop.getTotalSellValue(items);
}
int count = items.countAll();
if (count == 0) {
caption = localizer.getMessage("lblCancel");
caption = Forge.getLocalizer().getMessage("lblCancel");
}
else {
if (count > 1) {
String itemType = localizer.getMessage("lblCard");
String itemType = Forge.getLocalizer().getMessage("lblCard");
for (Entry<InventoryItem, Integer> item : items) {
if (!(item.getKey() instanceof PaperCard)) {
itemType = localizer.getMessage("lblItem");
itemType = Forge.getLocalizer().getMessage("lblItem");
break;
}
}
@@ -257,7 +255,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
callback.run(max);
}
else {
GuiChoose.getInteger(item + " - " + getVerb() + " " + localizer.getMessage("lblHowMany"), 1, max, 20, callback);
GuiChoose.getInteger(item + " - " + getVerb() + " " + Forge.getLocalizer().getMessage("lblHowMany"), 1, max, 20, callback);
}
}
@@ -286,7 +284,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
private FTextArea lblSellPercentage = add(new FTextArea(false));
private SpellShopPage() {
super(localizer.getMessage("lblCardsForSale"), FSkinImage.QUEST_BOOK, true);
super(Forge.getLocalizer().getMessage("lblCardsForSale"), FSkinImage.QUEST_BOOK, true);
lblSellPercentage.setFont(FSkinFont.get(11));
}
@@ -295,7 +293,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoading"), new Runnable() {
LoadingOverlay.show(Forge.getLocalizer().getInstance().getMessage("lblLoading"), new Runnable() {
@Override
public void run() {
Map<ColumnDef, ItemColumn> colOverrides = new HashMap<>();
@@ -337,7 +335,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
}
private static class InventoryPage extends SpellShopBasePage {
protected FLabel lblSellExtras = add(new FLabel.Builder().text(localizer.getMessage("lblSellAllExtras"))
protected FLabel lblSellExtras = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblSellAllExtras"))
.icon(Forge.hdbuttons ? FSkinImage.HDMINUS : FSkinImage.MINUS).iconScaleFactor(1f).align(Align.right).font(FSkinFont.get(16))
.command(new FEventHandler() {
@Override
@@ -358,7 +356,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
}
}).build());
protected FLabel lblSelectAll = add(new FLabel.Builder().text(localizer.getMessage("lblSelectAllCards"))
protected FLabel lblSelectAll = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblSelectAllCards"))
.icon(Forge.hdbuttons ? FSkinImage.HDSTAR_FILLED : FSkinImage.STAR_FILLED).iconScaleFactor(1f).align(Align.right).font(FSkinFont.get(16))
.command(new FEventHandler() {
@Override
@@ -383,7 +381,7 @@ public class QuestSpellShopScreen extends TabPageScreen<QuestSpellShopScreen> {
}).build());
private InventoryPage() {
super(localizer.getMessage("lblYourCards"), FSkinImage.QUEST_BOX, false);
super(Forge.getLocalizer().getMessage("lblYourCards"), FSkinImage.QUEST_BOX, false);
}
@Override

17
forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java
View File

@@ -2,6 +2,7 @@ package forge.screens.quest;
import java.util.List;
import forge.Forge;
import forge.assets.FImage;
import forge.assets.FSkinFont;
import forge.assets.FSkinImage;
@@ -21,12 +22,10 @@ import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FOptionPane;
import forge.toolbox.FScrollPane;
import forge.util.Localizer;
import forge.util.Utils;
public class QuestStatsScreen extends FScreen {
private static final float PADDING = FOptionPane.PADDING;
private static final Localizer localizer = Localizer.getInstance();
private final FScrollPane scroller = add(new FScrollPane() {
@Override
@@ -52,8 +51,8 @@ public class QuestStatsScreen extends FScreen {
private final FLabel lblWorld = scroller.add(new StatLabel(FSkinImage.QUEST_MAP));
private final FComboBox<String> cbxPet = scroller.add(new FComboBox<>());
private final FComboBox<String> cbxMatchLength = scroller.add(new FComboBox<>());
private final FCheckBox cbPlant = scroller.add(new FCheckBox(Localizer.getInstance().getMessage("cbSummonPlant")));
private final FLabel lblZep = scroller.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("cbLaunchZeppelin")).icon(FSkinImage.QUEST_ZEP).font(FSkinFont.get(16)).opaque().build());
private final FCheckBox cbPlant = scroller.add(new FCheckBox(Forge.getLocalizer().getMessage("cbSummonPlant")));
private final FLabel lblZep = scroller.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("cbLaunchZeppelin")).icon(FSkinImage.QUEST_ZEP).font(FSkinFont.get(16)).opaque().build());
public FLabel getLblWins() {
return lblWins;
@@ -87,7 +86,7 @@ public class QuestStatsScreen extends FScreen {
}
public QuestStatsScreen() {
super(localizer.getMessage("lblQuestStatistics"), QuestMenu.getMenu());
super(Forge.getLocalizer().getMessage("lblQuestStatistics"), QuestMenu.getMenu());
lblZep.setHeight(Utils.scale(60));
cbxPet.setDropDownChangeHandler(new FEventHandler() {
@@ -116,14 +115,14 @@ public class QuestStatsScreen extends FScreen {
cbPlant.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
FModel.getQuest().selectPet(0, cbPlant.isSelected() ? localizer.getMessage("lblPlant") : null);
FModel.getQuest().selectPet(0, cbPlant.isSelected() ? Forge.getLocalizer().getMessage("lblPlant") : null);
FModel.getQuest().save();
}
});
lblZep.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
if (!QuestUtil.checkActiveQuest(localizer.getMessage("lblLaunchaZeppelin"))) {
if (!QuestUtil.checkActiveQuest(Forge.getLocalizer().getMessage("lblLaunchaZeppelin"))) {
return;
}
FModel.getQuest().getAchievements().setCurrentChallenges(null);
@@ -134,7 +133,7 @@ public class QuestStatsScreen extends FScreen {
}
void addTournamentResultsLabels(QuestTournamentsScreen tournamentsScreen) {
scroller.add(new FLabel.Builder().font(FSkinFont.get(16)).text(localizer.getMessage("lblTournamentResults")).build());
scroller.add(new FLabel.Builder().font(FSkinFont.get(16)).text(Forge.getLocalizer().getMessage("lblTournamentResults")).build());
scroller.add(tournamentsScreen.getLblFirst());
scroller.add(tournamentsScreen.getLblSecond());
scroller.add(tournamentsScreen.getLblThird());
@@ -148,7 +147,7 @@ public class QuestStatsScreen extends FScreen {
public void update() {
QuestUtil.updateQuestView(QuestMenu.getMenu());
setHeaderCaption(FModel.getQuest().getName() + " - " + localizer.getMessage("lblStatistics") + "\n(" + FModel.getQuest().getRank() + ")");
setHeaderCaption(FModel.getQuest().getName() + " - " + Forge.getLocalizer().getMessage("lblStatistics") + "\n(" + FModel.getQuest().getRank() + ")");
scroller.revalidate(); //revalidate to account for changes in label visibility
}

34
forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
View File

@@ -38,24 +38,22 @@ import forge.toolbox.FEvent;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FLabel;
import forge.toolbox.FTextField;
import forge.util.Localizer;
import forge.util.Utils;
public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestTournamentView {
//Select Tournament panel
private final SelectTournamentPanel pnlSelectTournament = add(new SelectTournamentPanel());
private final Localizer localizer = Localizer.getInstance();
private final FLabel lblCredits = pnlSelectTournament.add(new FLabel.Builder().icon(FSkinImage.QUEST_COINSTACK)
.iconScaleFactor(0.75f).font(FSkinFont.get(16)).build());
private final FLabel btnSpendToken = pnlSelectTournament.add(new FLabel.ButtonBuilder().text(Localizer.getInstance().getMessage("btnSpendToken") + " (0)").build());
private final FLabel btnSpendToken = pnlSelectTournament.add(new FLabel.ButtonBuilder().text(Forge.getLocalizer().getMessage("btnSpendToken") + " (0)").build());
private final FLabel lblInfo = pnlSelectTournament.add(new FLabel.Builder().text(Localizer.getInstance().getMessage("lblSelectaTournament") + ":")
private final FLabel lblInfo = pnlSelectTournament.add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblSelectaTournament") + ":")
.align(Align.center).font(FSkinFont.get(16)).build());
private final FLabel lblNoTournaments = pnlSelectTournament.add(new FLabel.Builder()
.align(Align.center).text(Localizer.getInstance().getMessage("lblNoTournaments")).insets(Vector2.Zero)
.align(Align.center).text(Forge.getLocalizer().getMessage("lblNoTournaments")).insets(Vector2.Zero)
.font(FSkinFont.get(12)).build());
private final QuestEventPanel.Container pnlTournaments = pnlSelectTournament.add(new QuestEventPanel.Container());
@@ -63,14 +61,14 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
//Prepare Deck panel
private final PrepareDeckPanel pnlPrepareDeck = add(new PrepareDeckPanel());
private final FButton btnEditDeck = add(new FButton(Localizer.getInstance().getMessage("btnEditDeck")));
private final FButton btnLeaveTournament = add(new FButton(Localizer.getInstance().getMessage("btnLeaveTournament")));
private final FButton btnEditDeck = add(new FButton(Forge.getLocalizer().getMessage("btnEditDeck")));
private final FButton btnLeaveTournament = add(new FButton(Forge.getLocalizer().getMessage("btnLeaveTournament")));
private final CardManager deckViewer = pnlPrepareDeck.add(new CardManager(false));
//Tournament Active panel
private final TournamentActivePanel pnlTournamentActive = add(new TournamentActivePanel());
private final FButton btnEditDeckInTourn = add(new FButton(Localizer.getInstance().getMessage("btnEditDeck")));
private final FButton btnLeaveTournamentInTourn = add(new FButton(Localizer.getInstance().getMessage("btnLeaveTournament")));
private final FButton btnEditDeckInTourn = add(new FButton(Forge.getLocalizer().getMessage("btnEditDeck")));
private final FButton btnLeaveTournamentInTourn = add(new FButton(Forge.getLocalizer().getMessage("btnLeaveTournament")));
//Results labels
private static final FSkinFont RESULTS_FONT = FSkinFont.get(15);
@@ -140,7 +138,7 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
pnlTournamentActive.add(btnEditDeckInTourn);
pnlTournamentActive.add(btnLeaveTournamentInTourn);
deckViewer.setCaption(localizer.getMessage("ttMain"));
deckViewer.setCaption(Forge.getLocalizer().getMessage("ttMain"));
deckViewer.setup(ItemManagerConfig.QUEST_DRAFT_DECK_VIEWER);
setMode(Mode.SELECT_TOURNAMENT);
}
@@ -175,7 +173,7 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
@Override
protected void updateHeaderCaption() {
if (mode == Mode.PREPARE_DECK) {
setHeaderCaption(FModel.getQuest().getName() + " - " + getGameType() + "\n" + localizer.getMessage("lblDraft") + " - " + FModel.getQuest().getAchievements().getCurrentDraft().getTitle());
setHeaderCaption(FModel.getQuest().getName() + " - " + getGameType() + "\n" + Forge.getLocalizer().getMessage("lblDraft") + " - " + FModel.getQuest().getAchievements().getCurrentDraft().getTitle());
}
else {
super.updateHeaderCaption();
@@ -391,7 +389,7 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
int[] iconIDs = new int[16];
String draftTitle = qd.getFullTitle();
FLabel lblStandings = add(new FLabel.Builder().text(localizer.getMessage("lblDraft") + ": " + draftTitle).align(Align.center).font(FSkinFont.get(20)).build());
FLabel lblStandings = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblDraft") + ": " + draftTitle).align(Align.center).font(FSkinFont.get(20)).build());
lblStandings.setBounds(x, y, w, lblStandings.getAutoSizeBounds().height);
y += lblStandings.getHeight() + PADDING;
@@ -404,12 +402,12 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
String sid = qd.getStandings()[qd.getStandings().length - 1];
String winnersName = sid.equals(QuestEventDraft.HUMAN) ? FModel.getPreferences().getPref(FPref.PLAYER_NAME) :
sid.equals(QuestEventDraft.UNDETERMINED) ? "---" : qd.getAINames()[Integer.parseInt(sid) - 1];
FLabel lblWinner = add(new FLabel.Builder().text(localizer.getMessage("lblWinner") + ": " + winnersName).align(Align.center).font(FSkinFont.get(20)).build());
FLabel lblWinner = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblWinner") + ": " + winnersName).align(Align.center).font(FSkinFont.get(20)).build());
lblWinner.setBounds(x, y, w, lblStandings.getAutoSizeBounds().height);
y += lblWinner.getHeight() + PADDING;
getBtnLeaveTournamentInTourn().setText(localizer.getMessage("lblCollectPrizes"));
getBtnLeaveTournamentInTourn().setText(Forge.getLocalizer().getMessage("lblCollectPrizes"));
} else {
getBtnLeaveTournamentInTourn().setText(localizer.getMessage("btnLeaveTournament"));
getBtnLeaveTournamentInTourn().setText(Forge.getLocalizer().getMessage("btnLeaveTournament"));
String sid1, sid2, pairedPlayer1 = "NONE", pairedPlayer2 = "NONE";
int pos = Arrays.asList(qd.getStandings()).indexOf(QuestEventDraft.UNDETERMINED);
@@ -446,17 +444,17 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
for (int j = 0; j < 13; j += 2) {
switch (j) {
case 0:
FLabel qfinals = add(new FLabel.Builder().text(localizer.getMessage("lblQuarterfinals")).align(Align.center).font(FSkinFont.get(16)).build());
FLabel qfinals = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblQuarterfinals")).align(Align.center).font(FSkinFont.get(16)).build());
qfinals.setBounds(x, y, w, qfinals.getAutoSizeBounds().height);
y += qfinals.getHeight() + PADDING;
break;
case 8:
FLabel sfinals = add(new FLabel.Builder().text(localizer.getMessage("lblSemifinals")).align(Align.center).font(FSkinFont.get(16)).build());
FLabel sfinals = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblSemifinals")).align(Align.center).font(FSkinFont.get(16)).build());
sfinals.setBounds(x, y, w, sfinals.getAutoSizeBounds().height);
y += sfinals.getHeight() + PADDING;
break;
case 12:
FLabel finals = add(new FLabel.Builder().text(localizer.getMessage("lblFinalMatch")).align(Align.center).font(FSkinFont.get(16)).build());
FLabel finals = add(new FLabel.Builder().text(Forge.getLocalizer().getMessage("lblFinalMatch")).align(Align.center).font(FSkinFont.get(16)).build());
finals.setBounds(x, y, w, finals.getAutoSizeBounds().height);
y += finals.getHeight() + PADDING;
break;

50
forge-gui-mobile/src/forge/screens/settings/FilesPage.java
View File

@@ -34,59 +34,57 @@ import forge.toolbox.FOptionPane;
import forge.toolbox.GuiChoose;
import forge.util.Callback;
import forge.util.FileUtil;
import forge.util.Localizer;
public class FilesPage extends TabPage<SettingsScreen> {
private final FGroupList<FilesItem> lstItems = add(new FGroupList<>());
private final Localizer localizer = Localizer.getInstance();
protected FilesPage() {
super(Localizer.getInstance().getMessage("lblFiles"), Forge.hdbuttons ? FSkinImage.HDOPEN : FSkinImage.OPEN);
super(Forge.getLocalizer().getMessage("lblFiles"), Forge.hdbuttons ? FSkinImage.HDOPEN : FSkinImage.OPEN);
lstItems.setListItemRenderer(new FilesItemRenderer());
lstItems.addGroup(localizer.getMessage("ContentDownloaders"));
lstItems.addGroup(localizer.getMessage("lblStorageLocations"));
lstItems.addGroup(Forge.getLocalizer().getMessage("ContentDownloaders"));
lstItems.addGroup(Forge.getLocalizer().getMessage("lblStorageLocations"));
//lstItems.addGroup("Data Import");
//content downloaders
lstItems.addItem(new ContentDownloader(localizer.getMessage("btnDownloadPics"),
localizer.getMessage("lblDownloadPics")) {
lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadPics"),
Forge.getLocalizer().getMessage("lblDownloadPics")) {
@Override
protected GuiDownloadService createService() {
return new GuiDownloadPicturesLQ();
}
}, 0);
lstItems.addItem(new ContentDownloader(localizer.getMessage("btnDownloadSetPics"),
localizer.getMessage("lblDownloadSetPics")) {
lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadSetPics"),
Forge.getLocalizer().getMessage("lblDownloadSetPics")) {
@Override
protected GuiDownloadService createService() {
return new GuiDownloadSetPicturesLQ();
}
}, 0);
lstItems.addItem(new ContentDownloader(localizer.getMessage("btnDownloadQuestImages"),
localizer.getMessage("lblDownloadQuestImages")) {
lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadQuestImages"),
Forge.getLocalizer().getMessage("lblDownloadQuestImages")) {
@Override
protected GuiDownloadService createService() {
return new GuiDownloadQuestImages();
}
}, 0);
lstItems.addItem(new ContentDownloader(localizer.getMessage("btnDownloadAchievementImages"),
localizer.getMessage("lblDownloadAchievementImages")) {
lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadAchievementImages"),
Forge.getLocalizer().getMessage("lblDownloadAchievementImages")) {
@Override
protected GuiDownloadService createService() {
return new GuiDownloadAchievementImages();
}
}, 0);
lstItems.addItem(new ContentDownloader(localizer.getMessage("btnDownloadPrices"),
localizer.getMessage("lblDownloadPrices")) {
lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadPrices"),
Forge.getLocalizer().getMessage("lblDownloadPrices")) {
@Override
protected GuiDownloadService createService() {
return new GuiDownloadPrices();
}
}, 0);
lstItems.addItem(new ContentDownloader(localizer.getMessage("btnDownloadSkins"),
localizer.getMessage("lblDownloadSkins")) {
lstItems.addItem(new ContentDownloader(Forge.getLocalizer().getMessage("btnDownloadSkins"),
Forge.getLocalizer().getMessage("lblDownloadSkins")) {
@Override
protected GuiDownloadService createService() {
return new GuiDownloadSkins();
@@ -96,9 +94,9 @@ public class FilesPage extends TabPage<SettingsScreen> {
SettingsScreen.getSettingsScreen().getSettingsPage().refreshSkinsList();
}
}, 0);
lstItems.addItem(new OptionContentDownloader(localizer.getMessage("btnDownloadCJKFonts"),
localizer.getMessage("lblDownloadCJKFonts"),
localizer.getMessage("lblDownloadCJKFontPrompt")) {
lstItems.addItem(new OptionContentDownloader(Forge.getLocalizer().getMessage("btnDownloadCJKFonts"),
Forge.getLocalizer().getMessage("lblDownloadCJKFonts"),
Forge.getLocalizer().getMessage("lblDownloadCJKFontPrompt")) {
@Override
protected Map<String, String> getCategories() {
// read CJK font list
@@ -122,20 +120,20 @@ public class FilesPage extends TabPage<SettingsScreen> {
}
}, 0);
//storage locations
final StorageOption cardPicsOption = new StorageOption(localizer.getMessage("lblCardPicsLocation"), ForgeProfileProperties.getCardPicsDir()) {
final StorageOption cardPicsOption = new StorageOption(Forge.getLocalizer().getMessage("lblCardPicsLocation"), ForgeProfileProperties.getCardPicsDir()) {
@Override
protected void onDirectoryChanged(String newDir) {
ForgeProfileProperties.setCardPicsDir(newDir);
}
};
final StorageOption decksOption = new StorageOption(localizer.getMessage("lblDecksLocation"), ForgeProfileProperties.getDecksDir()) {
final StorageOption decksOption = new StorageOption(Forge.getLocalizer().getMessage("lblDecksLocation"), ForgeProfileProperties.getDecksDir()) {
@Override
protected void onDirectoryChanged(String newDir) {
ForgeProfileProperties.setDecksDir(newDir);
}
};
if (!GuiBase.isUsingAppDirectory()) {
lstItems.addItem(new StorageOption(localizer.getMessage("lblDataLocation"), ForgeProfileProperties.getUserDir()) {
lstItems.addItem(new StorageOption(Forge.getLocalizer().getMessage("lblDataLocation"), ForgeProfileProperties.getUserDir()) {
@Override
protected void onDirectoryChanged(String newDir) {
ForgeProfileProperties.setUserDir(newDir);
@@ -144,7 +142,7 @@ public class FilesPage extends TabPage<SettingsScreen> {
decksOption.updateDir(ForgeProfileProperties.getDecksDir());
}
}, 1);
lstItems.addItem(new StorageOption(localizer.getMessage("lblImageCacheLocation"), ForgeProfileProperties.getCacheDir()) {
lstItems.addItem(new StorageOption(Forge.getLocalizer().getMessage("lblImageCacheLocation"), ForgeProfileProperties.getCacheDir()) {
@Override
protected void onDirectoryChanged(String newDir) {
ForgeProfileProperties.setCacheDir(newDir);
@@ -270,13 +268,13 @@ public class FilesPage extends TabPage<SettingsScreen> {
@Override
public void select() {
FFileChooser.show(localizer.getMessage("lblSelect").replace("%s", label), ChoiceType.GetDirectory, description, new Callback<String>() {
FFileChooser.show(Forge.getLocalizer().getMessage("lblSelect").replace("%s", label), ChoiceType.GetDirectory, description, new Callback<String>() {
@Override
public void run(String result) {
if (StringUtils.isEmpty(result) || description.equals(result)) { return; }
updateDir(result);
onDirectoryChanged(result);
FOptionPane.showMessageDialog(localizer.getMessage("lblRestartForgeMoveFilesNewLocation"), localizer.getMessage("lblRestartRequired"), FOptionPane.INFORMATION_ICON);
FOptionPane.showMessageDialog(Forge.getLocalizer().getMessage("lblRestartForgeMoveFilesNewLocation"), Forge.getLocalizer().getMessage("lblRestartRequired"), FOptionPane.INFORMATION_ICON);
}
});
}

399
forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
View File

@@ -26,7 +26,6 @@ import forge.toolbox.FGroupList;
import forge.toolbox.FList;
import forge.toolbox.FOptionPane;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
import java.util.ArrayList;
@@ -39,24 +38,22 @@ public class SettingsPage extends TabPage<SettingsScreen> {
private final CustomSelectSetting settingCJKFonts;
public SettingsPage() {
super(Localizer.getInstance().getMessage("lblSettings"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS);
final Localizer localizer = Localizer.getInstance();
super(Forge.getLocalizer().getMessage("lblSettings"), Forge.hdbuttons ? FSkinImage.HDPREFERENCE : FSkinImage.SETTINGS);
lstSettings.setListItemRenderer(new SettingRenderer());
lstSettings.addGroup(localizer.getMessage("lblGeneralSettings"));
lstSettings.addGroup(localizer.getMessage("lblGameplayOptions"));
lstSettings.addGroup(localizer.getMessage("RandomDeckGeneration"));
lstSettings.addGroup(localizer.getMessage("AdvancedSettings"));
lstSettings.addGroup(localizer.getMessage("GraphicOptions"));
lstSettings.addGroup(localizer.getMessage("lblCardOverlays"));
lstSettings.addGroup(localizer.getMessage("lblVibrationOptions"));
lstSettings.addGroup(localizer.getMessage("SoundOptions"));
lstSettings.addGroup(Forge.getLocalizer().getMessage("lblGeneralSettings"));
lstSettings.addGroup(Forge.getLocalizer().getMessage("lblGameplayOptions"));
lstSettings.addGroup(Forge.getLocalizer().getMessage("RandomDeckGeneration"));
lstSettings.addGroup(Forge.getLocalizer().getMessage("AdvancedSettings"));
lstSettings.addGroup(Forge.getLocalizer().getMessage("GraphicOptions"));
lstSettings.addGroup(Forge.getLocalizer().getMessage("lblCardOverlays"));
lstSettings.addGroup(Forge.getLocalizer().getMessage("lblVibrationOptions"));
lstSettings.addGroup(Forge.getLocalizer().getMessage("SoundOptions"));
//General Settings
lstSettings.addItem(new CustomSelectSetting(FPref.UI_LANGUAGE, localizer.getMessage("cbpSelectLanguage"),
localizer.getMessage("nlSelectLanguage"),
lstSettings.addItem(new CustomSelectSetting(FPref.UI_LANGUAGE, Forge.getLocalizer().getMessage("cbpSelectLanguage"),
Forge.getLocalizer().getMessage("nlSelectLanguage"),
FLanguage.getAllLanguages()) {
@Override
public void valueChanged(String newValue) {
@@ -77,7 +74,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
FLanguage.changeLanguage(newValue);
FOptionPane.showConfirmDialog(localizer.getMessage("lblRestartForgeDescription"), localizer.getMessage("lblRestartForge"), localizer.getMessage("lblRestart"), localizer.getMessage("lblLater"), new Callback<Boolean>() {
FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblRestartForgeDescription"), Forge.getLocalizer().getMessage("lblRestartForge"), Forge.getLocalizer().getMessage("lblRestart"), Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -87,8 +84,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
});
}
}, 0);
settingSkins = new CustomSelectSetting(FPref.UI_SKIN, localizer.getMessage("lblTheme"),
localizer.getMessage("nlTheme"),
settingSkins = new CustomSelectSetting(FPref.UI_SKIN, Forge.getLocalizer().getMessage("lblTheme"),
Forge.getLocalizer().getMessage("nlTheme"),
FSkin.getAllSkins()) {
@Override
public void valueChanged(String newValue) {
@@ -96,8 +93,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
};
lstSettings.addItem(settingSkins, 0);
settingCJKFonts = new CustomSelectSetting(FPref.UI_CJK_FONT, localizer.getMessage("lblCJKFont"),
localizer.getMessage("nlCJKFont"),
settingCJKFonts = new CustomSelectSetting(FPref.UI_CJK_FONT, Forge.getLocalizer().getMessage("lblCJKFont"),
Forge.getLocalizer().getMessage("nlCJKFont"),
FSkinFont.getAllCJKFonts()) {
@Override
public void valueChanged(String newValue) {
@@ -119,15 +116,15 @@ public class SettingsPage extends TabPage<SettingsScreen> {
lstSettings.addItem(settingCJKFonts, 0);
if (GuiBase.isAndroid()) {
lstSettings.addItem(new BooleanSetting(FPref.UI_LANDSCAPE_MODE,
localizer.getMessage("lblLandscapeMode"),
localizer.getMessage("nlLandscapeMode")) {
Forge.getLocalizer().getMessage("lblLandscapeMode"),
Forge.getLocalizer().getMessage("nlLandscapeMode")) {
@Override
public void select() {
super.select();
boolean landscapeMode = FModel.getPreferences().getPrefBoolean(FPref.UI_LANDSCAPE_MODE);
Forge.getDeviceAdapter().setLandscapeMode(landscapeMode); //ensure device able to save off ini file so landscape change takes effect
if (Forge.isLandscapeMode() != landscapeMode) {
FOptionPane.showConfirmDialog(localizer.getMessage("lblRestartForgeDescription"), localizer.getMessage("lblRestartForge"), localizer.getMessage("lblRestart"), localizer.getMessage("lblLater"), new Callback<Boolean>() {
FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblRestartForgeDescription"), Forge.getLocalizer().getMessage("lblRestartForge"), Forge.getLocalizer().getMessage("lblRestart"), Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -139,14 +136,14 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
}, 0);
lstSettings.addItem(new BooleanSetting(FPref.UI_ANDROID_MINIMIZE_ON_SCRLOCK,
localizer.getMessage("lblMinimizeScreenLock"),
localizer.getMessage("nlMinimizeScreenLock")),
Forge.getLocalizer().getMessage("lblMinimizeScreenLock"),
Forge.getLocalizer().getMessage("nlMinimizeScreenLock")),
0);
} else {
//fullscreen
lstSettings.addItem(new BooleanSetting(FPref.UI_FULLSCREEN_MODE,
localizer.getMessage("lblFullScreenMode"),
localizer.getMessage("nlFullScreenMode")){
Forge.getLocalizer().getMessage("lblFullScreenMode"),
Forge.getLocalizer().getMessage("nlFullScreenMode")){
@Override
public void select() {
super.select();
@@ -155,8 +152,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
},0);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_VIDEO_MODE,
localizer.getMessage("lblVideoMode"),
localizer.getMessage("nlVideoMode"),
Forge.getLocalizer().getMessage("lblVideoMode"),
Forge.getLocalizer().getMessage("nlVideoMode"),
new String[]{"720p", "768p", "900p", "1080p"}) {
@Override
public void valueChanged(String newValue) {
@@ -183,13 +180,13 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}, 0);
}
lstSettings.addItem(new BooleanSetting(FPref.USE_SENTRY,
localizer.getMessage("lblAutomaticBugReports"),
localizer.getMessage("nlAutomaticBugReports")),
Forge.getLocalizer().getMessage("lblAutomaticBugReports"),
Forge.getLocalizer().getMessage("nlAutomaticBugReports")),
0);
//Gameplay Options
lstSettings.addItem(new CustomSelectSetting(FPref.MULLIGAN_RULE, localizer.getMessage("cbpMulliganRule"),
localizer.getMessage("nlpMulliganRule"),
lstSettings.addItem(new CustomSelectSetting(FPref.MULLIGAN_RULE, Forge.getLocalizer().getMessage("cbpMulliganRule"),
Forge.getLocalizer().getMessage("nlpMulliganRule"),
MulliganDefs.getMulliganRuleNames()) {
@Override
public void valueChanged(String newValue) {
@@ -198,93 +195,93 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
}, 1);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_CURRENT_AI_PROFILE,
localizer.getMessage("cbpAiProfiles"),
localizer.getMessage("nlpAiProfiles"),
Forge.getLocalizer().getMessage("cbpAiProfiles"),
Forge.getLocalizer().getMessage("nlpAiProfiles"),
AiProfileUtil.getProfilesArray()),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_ANTE,
localizer.getMessage("cbAnte"),
localizer.getMessage("nlAnte")),
Forge.getLocalizer().getMessage("cbAnte"),
Forge.getLocalizer().getMessage("nlAnte")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_ANTE_MATCH_RARITY,
localizer.getMessage("cbAnteMatchRarity"),
localizer.getMessage("nlAnteMatchRarity")),
Forge.getLocalizer().getMessage("cbAnteMatchRarity"),
Forge.getLocalizer().getMessage("nlAnteMatchRarity")),
1);
lstSettings.addItem(new BooleanSetting(FPref.MATCH_HOT_SEAT_MODE,
localizer.getMessage("lblHotSeatMode"),
localizer.getMessage("nlHotSeatMode")),
Forge.getLocalizer().getMessage("lblHotSeatMode"),
Forge.getLocalizer().getMessage("nlHotSeatMode")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_AI_CHEATS,
localizer.getMessage("cbEnableAICheats"),
localizer.getMessage("nlEnableAICheats")),
Forge.getLocalizer().getMessage("cbEnableAICheats"),
Forge.getLocalizer().getMessage("nlEnableAICheats")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_MANABURN,
localizer.getMessage("cbManaBurn"),
localizer.getMessage("nlManaBurn")),
Forge.getLocalizer().getMessage("cbManaBurn"),
Forge.getLocalizer().getMessage("nlManaBurn")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_MANA_LOST_PROMPT,
localizer.getMessage("cbManaLostPrompt"),
localizer.getMessage("nlManaLostPrompt")),
Forge.getLocalizer().getMessage("cbManaLostPrompt"),
Forge.getLocalizer().getMessage("nlManaLostPrompt")),
1);
lstSettings.addItem(new BooleanSetting(FPref.ENFORCE_DECK_LEGALITY,
localizer.getMessage("cbEnforceDeckLegality"),
localizer.getMessage("nlEnforceDeckLegality")),
Forge.getLocalizer().getMessage("cbEnforceDeckLegality"),
Forge.getLocalizer().getMessage("nlEnforceDeckLegality")),
1);
lstSettings.addItem(new BooleanSetting(FPref.PERFORMANCE_MODE,
localizer.getMessage("cbPerformanceMode"),
localizer.getMessage("nlPerformanceMode")),
Forge.getLocalizer().getMessage("cbPerformanceMode"),
Forge.getLocalizer().getMessage("nlPerformanceMode")),
1);
lstSettings.addItem(new BooleanSetting(FPref.MATCH_SIDEBOARD_FOR_AI,
localizer.getMessage("cbSideboardForAI"),
localizer.getMessage("nlSideboardForAI")),
Forge.getLocalizer().getMessage("cbSideboardForAI"),
Forge.getLocalizer().getMessage("nlSideboardForAI")),
1);
lstSettings.addItem(new BooleanSetting(FPref.FILTERED_HANDS,
localizer.getMessage("cbFilteredHands"),
localizer.getMessage("nlFilteredHands")),
Forge.getLocalizer().getMessage("cbFilteredHands"),
Forge.getLocalizer().getMessage("nlFilteredHands")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_CLONE_MODE_SOURCE,
localizer.getMessage("cbCloneImgSource"),
localizer.getMessage("nlCloneImgSource")),
Forge.getLocalizer().getMessage("cbCloneImgSource"),
Forge.getLocalizer().getMessage("nlCloneImgSource")),
1);
lstSettings.addItem(new BooleanSetting(FPref.MATCHPREF_PROMPT_FREE_BLOCKS,
localizer.getMessage("cbPromptFreeBlocks"),
localizer.getMessage("nlPromptFreeBlocks")),
Forge.getLocalizer().getMessage("cbPromptFreeBlocks"),
Forge.getLocalizer().getMessage("nlPromptFreeBlocks")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_DETAILED_SPELLDESC_IN_PROMPT,
localizer.getMessage("cbDetailedPaymentDesc"),
localizer.getMessage("nlDetailedPaymentDesc")),
Forge.getLocalizer().getMessage("cbDetailedPaymentDesc"),
Forge.getLocalizer().getMessage("nlDetailedPaymentDesc")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_GRAY_INACTIVE_TEXT,
localizer.getMessage("cbGrayText"),
localizer.getMessage("nlGrayText")),
Forge.getLocalizer().getMessage("cbGrayText"),
Forge.getLocalizer().getMessage("nlGrayText")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_SHOW_STORM_COUNT_IN_PROMPT,
localizer.getMessage("cbShowStormCount"),
localizer.getMessage("nlShowStormCount")),
Forge.getLocalizer().getMessage("cbShowStormCount"),
Forge.getLocalizer().getMessage("nlShowStormCount")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_PRESELECT_PREVIOUS_ABILITY_ORDER,
localizer.getMessage("cbPreselectPrevAbOrder"),
localizer.getMessage("nlPreselectPrevAbOrder")),
Forge.getLocalizer().getMessage("cbPreselectPrevAbOrder"),
Forge.getLocalizer().getMessage("nlPreselectPrevAbOrder")),
1);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_ALLOW_ORDER_GRAVEYARD_WHEN_NEEDED,
localizer.getMessage("lblOrderGraveyard"),
localizer.getMessage("nlOrderGraveyard"),
Forge.getLocalizer().getMessage("lblOrderGraveyard"),
Forge.getLocalizer().getMessage("nlOrderGraveyard"),
new String[]{
ForgeConstants.GRAVEYARD_ORDERING_NEVER, ForgeConstants.GRAVEYARD_ORDERING_OWN_CARDS,
ForgeConstants.GRAVEYARD_ORDERING_ALWAYS}),
1);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_AUTO_YIELD_MODE,
localizer.getMessage("lblAutoYields"),
localizer.getMessage("nlpAutoYieldMode"),
Forge.getLocalizer().getMessage("lblAutoYields"),
Forge.getLocalizer().getMessage("nlpAutoYieldMode"),
new String[]{ForgeConstants.AUTO_YIELD_PER_ABILITY, ForgeConstants.AUTO_YIELD_PER_CARD}),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_ALLOW_ESC_TO_END_TURN,
localizer.getMessage("cbEscapeEndsTurn"),
localizer.getMessage("nlEscapeEndsTurn")),
Forge.getLocalizer().getMessage("cbEscapeEndsTurn"),
Forge.getLocalizer().getMessage("nlEscapeEndsTurn")),
1);
lstSettings.addItem(new BooleanSetting(FPref.UI_ALT_PLAYERINFOLAYOUT,
localizer.getMessage("lblAltLifeDisplay"),
localizer.getMessage("nlAltLifeDisplay")){
Forge.getLocalizer().getMessage("lblAltLifeDisplay"),
Forge.getLocalizer().getMessage("nlAltLifeDisplay")){
@Override
public void select() {
super.select();
@@ -295,8 +292,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
},1);
lstSettings.addItem(new BooleanSetting(FPref.UI_ALT_PLAYERZONETABS,
localizer.getMessage("lblAltZoneTabs"),
localizer.getMessage("nlAltZoneTabs")){
Forge.getLocalizer().getMessage("lblAltZoneTabs"),
Forge.getLocalizer().getMessage("nlAltZoneTabs")){
@Override
public void select() {
super.select();
@@ -307,8 +304,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
},1);
lstSettings.addItem(new BooleanSetting(FPref.UI_ANIMATED_CARD_TAPUNTAP,
localizer.getMessage("lblAnimatedCardTapUntap"),
localizer.getMessage("nlAnimatedCardTapUntap")){
Forge.getLocalizer().getMessage("lblAnimatedCardTapUntap"),
Forge.getLocalizer().getMessage("nlAnimatedCardTapUntap")){
@Override
public void select() {
super.select();
@@ -319,26 +316,26 @@ public class SettingsPage extends TabPage<SettingsScreen> {
//Random Deck Generation
lstSettings.addItem(new BooleanSetting(FPref.DECKGEN_NOSMALL,
localizer.getMessage("cbRemoveSmall"),
localizer.getMessage("nlRemoveSmall")),
Forge.getLocalizer().getMessage("cbRemoveSmall"),
Forge.getLocalizer().getMessage("nlRemoveSmall")),
2);
lstSettings.addItem(new BooleanSetting(FPref.DECKGEN_CARDBASED,
localizer.getMessage("cbCardBased"),
localizer.getMessage("nlCardBased")),
Forge.getLocalizer().getMessage("cbCardBased"),
Forge.getLocalizer().getMessage("nlCardBased")),
2);
lstSettings.addItem(new BooleanSetting(FPref.DECKGEN_SINGLETONS,
localizer.getMessage("cbSingletons"),
localizer.getMessage("nlSingletons")),
Forge.getLocalizer().getMessage("cbSingletons"),
Forge.getLocalizer().getMessage("nlSingletons")),
2);
lstSettings.addItem(new BooleanSetting(FPref.DECKGEN_ARTIFACTS,
localizer.getMessage("cbRemoveArtifacts"),
localizer.getMessage("nlRemoveArtifacts")),
Forge.getLocalizer().getMessage("cbRemoveArtifacts"),
Forge.getLocalizer().getMessage("nlRemoveArtifacts")),
2);
//Advanced Settings
lstSettings.addItem(new BooleanSetting(FPref.DEV_MODE_ENABLED,
localizer.getMessage("cbDevMode"),
localizer.getMessage("nlDevMode")) {
Forge.getLocalizer().getMessage("cbDevMode"),
Forge.getLocalizer().getMessage("nlDevMode")) {
@Override
public void select() {
super.select();
@@ -347,29 +344,29 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
}, 3);
lstSettings.addItem(new CustomSelectSetting(FPref.DEV_LOG_ENTRY_TYPE,
localizer.getMessage("cbpGameLogEntryType"),
localizer.getMessage("nlGameLogEntryType"),
Forge.getLocalizer().getMessage("cbpGameLogEntryType"),
Forge.getLocalizer().getMessage("nlGameLogEntryType"),
GameLogEntryType.class),
3);
lstSettings.addItem(new BooleanSetting(FPref.LOAD_CARD_SCRIPTS_LAZILY,
localizer.getMessage("cbLoadCardsLazily"),
localizer.getMessage("nlLoadCardsLazily")),
Forge.getLocalizer().getMessage("cbLoadCardsLazily"),
Forge.getLocalizer().getMessage("nlLoadCardsLazily")),
3);
lstSettings.addItem(new BooleanSetting(FPref.LOAD_HISTORIC_FORMATS,
localizer.getMessage("cbLoadHistoricFormats"),
localizer.getMessage("nlLoadHistoricFormats")),
Forge.getLocalizer().getMessage("cbLoadHistoricFormats"),
Forge.getLocalizer().getMessage("nlLoadHistoricFormats")),
3);
lstSettings.addItem(new BooleanSetting(FPref.UI_LOAD_UNKNOWN_CARDS,
localizer.getMessage("lblEnableUnknownCards"),
localizer.getMessage("nlEnableUnknownCards")) {
Forge.getLocalizer().getMessage("lblEnableUnknownCards"),
Forge.getLocalizer().getMessage("nlEnableUnknownCards")) {
@Override
public void select() {
super.select();
FOptionPane.showConfirmDialog(
localizer.getMessage("lblRestartForgeDescription"),
localizer.getMessage("lblRestartForge"),
localizer.getMessage("lblRestart"),
localizer.getMessage("lblLater"), new Callback<Boolean>() {
Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
Forge.getLocalizer().getMessage("lblRestartForge"),
Forge.getLocalizer().getMessage("lblRestart"),
Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -382,16 +379,16 @@ public class SettingsPage extends TabPage<SettingsScreen> {
},
3);
lstSettings.addItem(new BooleanSetting(FPref.UI_LOAD_NONLEGAL_CARDS,
localizer.getMessage("lblEnableNonLegalCards"),
localizer.getMessage("nlEnableNonLegalCards")) {
Forge.getLocalizer().getMessage("lblEnableNonLegalCards"),
Forge.getLocalizer().getMessage("nlEnableNonLegalCards")) {
@Override
public void select() {
super.select();
FOptionPane.showConfirmDialog(
localizer.getMessage("lblRestartForgeDescription"),
localizer.getMessage("lblRestartForge"),
localizer.getMessage("lblRestart"),
localizer.getMessage("lblLater"), new Callback<Boolean>() {
Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
Forge.getLocalizer().getMessage("lblRestartForge"),
Forge.getLocalizer().getMessage("lblRestart"),
Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -404,16 +401,16 @@ public class SettingsPage extends TabPage<SettingsScreen> {
},
3);
lstSettings.addItem(new BooleanSetting(FPref.ALLOW_CUSTOM_CARDS_IN_DECKS_CONFORMANCE,
localizer.getMessage("lblAllowCustomCardsInDecks"),
localizer.getMessage("nlAllowCustomCardsInDecks")) {
Forge.getLocalizer().getMessage("lblAllowCustomCardsInDecks"),
Forge.getLocalizer().getMessage("nlAllowCustomCardsInDecks")) {
@Override
public void select() {
super.select();
FOptionPane.showConfirmDialog(
localizer.getMessage("lblRestartForgeDescription"),
localizer.getMessage("lblRestartForge"),
localizer.getMessage("lblRestart"),
localizer.getMessage("lblLater"), new Callback<Boolean>() {
Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
Forge.getLocalizer().getMessage("lblRestartForge"),
Forge.getLocalizer().getMessage("lblRestart"),
Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -426,8 +423,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
},
3);
lstSettings.addItem(new BooleanSetting(FPref.UI_NETPLAY_COMPAT,
localizer.getMessage("lblExperimentalNetworkCompatibility"),
localizer.getMessage("nlExperimentalNetworkCompatibility")) {
Forge.getLocalizer().getMessage("lblExperimentalNetworkCompatibility"),
Forge.getLocalizer().getMessage("nlExperimentalNetworkCompatibility")) {
@Override
public void select() {
super.select();
@@ -436,8 +433,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
},
3);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_DISPOSE_TEXTURES,
localizer.getMessage("lblDisposeTextures"),
localizer.getMessage("nlDisposeTextures")) {
Forge.getLocalizer().getMessage("lblDisposeTextures"),
Forge.getLocalizer().getMessage("nlDisposeTextures")) {
@Override
public void select() {
super.select();
@@ -447,16 +444,16 @@ public class SettingsPage extends TabPage<SettingsScreen> {
3);
if (GuiBase.isAndroid()) { //this option does nothing except on Android
lstSettings.addItem(new BooleanSetting(FPref.UI_AUTO_CACHE_SIZE,
localizer.getMessage("lblAutoCacheSize"),
localizer.getMessage("nlAutoCacheSize")) {
Forge.getLocalizer().getMessage("lblAutoCacheSize"),
Forge.getLocalizer().getMessage("nlAutoCacheSize")) {
@Override
public void select() {
super.select();
FOptionPane.showConfirmDialog (
localizer.getMessage("lblRestartForgeDescription"),
localizer.getMessage("lblRestartForge"),
localizer.getMessage("lblRestart"),
localizer.getMessage("lblLater"), new Callback<Boolean>() {
Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
Forge.getLocalizer().getMessage("lblRestartForge"),
Forge.getLocalizer().getMessage("lblRestart"),
Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -471,8 +468,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
//Graphic Options
lstSettings.addItem(new BooleanSetting(FPref.UI_DISABLE_CARD_IMAGES,
localizer.getMessage("lblDisableCardImages"),
localizer.getMessage("nlDisableCardImages")) {
Forge.getLocalizer().getMessage("lblDisableCardImages"),
Forge.getLocalizer().getMessage("nlDisableCardImages")) {
@Override
public void select() {
super.select();
@@ -481,21 +478,21 @@ public class SettingsPage extends TabPage<SettingsScreen> {
},
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_ONLINE_IMAGE_FETCHER,
localizer.getMessage("cbImageFetcher"),
localizer.getMessage("nlImageFetcher")),
Forge.getLocalizer().getMessage("cbImageFetcher"),
Forge.getLocalizer().getMessage("nlImageFetcher")),
4);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_PREFERRED_ART,
localizer.getMessage("lblPreferredArt"),
localizer.getMessage("nlPreferredArt"),
Forge.getLocalizer().getMessage("lblPreferredArt"),
Forge.getLocalizer().getMessage("nlPreferredArt"),
FModel.getMagicDb().getCardArtAvailablePreferences()) {
@Override
public void valueChanged(String newValue) {
super.valueChanged(newValue);
FOptionPane.showConfirmDialog (
localizer.getMessage("lblRestartForgeDescription"),
localizer.getMessage("lblRestartForge"),
localizer.getMessage("lblRestart"),
localizer.getMessage("lblLater"), new Callback<Boolean>() {
Forge.getLocalizer().getMessage("lblRestartForgeDescription"),
Forge.getLocalizer().getMessage("lblRestartForge"),
Forge.getLocalizer().getMessage("lblRestart"),
Forge.getLocalizer().getMessage("lblLater"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -508,25 +505,25 @@ public class SettingsPage extends TabPage<SettingsScreen> {
},
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_SMART_CARD_ART,
localizer.getMessage("lblSmartCardArtOpt"),
localizer.getMessage("nlSmartCardArtOpt") + "\n"
+ localizer.getMessage("nlSmartCardArtOptNote")),
Forge.getLocalizer().getMessage("lblSmartCardArtOpt"),
Forge.getLocalizer().getMessage("nlSmartCardArtOpt") + "\n"
+ Forge.getLocalizer().getMessage("nlSmartCardArtOptNote")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_FOIL_EFFECT,
localizer.getMessage("cbDisplayFoil"),
localizer.getMessage("nlDisplayFoil")),
Forge.getLocalizer().getMessage("cbDisplayFoil"),
Forge.getLocalizer().getMessage("nlDisplayFoil")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_RANDOM_FOIL,
localizer.getMessage("cbRandomFoil"),
localizer.getMessage("nlRandomFoil")),
Forge.getLocalizer().getMessage("cbRandomFoil"),
Forge.getLocalizer().getMessage("nlRandomFoil")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_RANDOM_ART_IN_POOLS,
localizer.getMessage("cbRandomArtInPools"),
localizer.getMessage("nlRandomArtInPools")),
Forge.getLocalizer().getMessage("cbRandomArtInPools"),
Forge.getLocalizer().getMessage("nlRandomArtInPools")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_COMPACT_TABS,
localizer.getMessage("lblCompactTabs"),
localizer.getMessage("nlCompactTabs")) {
Forge.getLocalizer().getMessage("lblCompactTabs"),
Forge.getLocalizer().getMessage("nlCompactTabs")) {
@Override
public void select() {
super.select();
@@ -536,48 +533,48 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
},4);
lstSettings.addItem(new BooleanSetting(FPref.UI_COMPACT_LIST_ITEMS,
localizer.getMessage("lblCompactListItems"),
localizer.getMessage("nlCompactListItems")),
Forge.getLocalizer().getMessage("lblCompactListItems"),
Forge.getLocalizer().getMessage("nlCompactListItems")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_HIDE_REMINDER_TEXT,
localizer.getMessage("cbHideReminderText"),
localizer.getMessage("nlHideReminderText")),
Forge.getLocalizer().getMessage("cbHideReminderText"),
Forge.getLocalizer().getMessage("nlHideReminderText")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_MATCH_IMAGE_VISIBLE,
localizer.getMessage("lblShowMatchBackground"),
localizer.getMessage("nlShowMatchBackground")),
Forge.getLocalizer().getMessage("lblShowMatchBackground"),
Forge.getLocalizer().getMessage("nlShowMatchBackground")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_LIBGDX_TEXTURE_FILTERING,
localizer.getMessage("lblBattlefieldTextureFiltering"),
localizer.getMessage("nlBattlefieldTextureFiltering")),
Forge.getLocalizer().getMessage("lblBattlefieldTextureFiltering"),
Forge.getLocalizer().getMessage("nlBattlefieldTextureFiltering")),
4);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_DISPLAY_CURRENT_COLORS,
localizer.getMessage("cbpDisplayCurrentCardColors"),
localizer.getMessage("nlDisplayCurrentCardColors"),
Forge.getLocalizer().getMessage("cbpDisplayCurrentCardColors"),
Forge.getLocalizer().getMessage("nlDisplayCurrentCardColors"),
new String[]{
ForgeConstants.DISP_CURRENT_COLORS_NEVER, ForgeConstants.DISP_CURRENT_COLORS_MULTICOLOR,
ForgeConstants.DISP_CURRENT_COLORS_CHANGED, ForgeConstants.DISP_CURRENT_COLORS_MULTI_OR_CHANGED,
ForgeConstants.DISP_CURRENT_COLORS_ALWAYS}),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ROTATE_SPLIT_CARDS,
localizer.getMessage("lblRotateZoomSplit"),
localizer.getMessage("nlRotateZoomSplit")),
Forge.getLocalizer().getMessage("lblRotateZoomSplit"),
Forge.getLocalizer().getMessage("nlRotateZoomSplit")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ROTATE_PLANE_OR_PHENOMENON,
localizer.getMessage("lblRotateZoomPlanesPhenomena"),
localizer.getMessage("nlRotateZoomPlanesPhenomena")),
Forge.getLocalizer().getMessage("lblRotateZoomPlanesPhenomena"),
Forge.getLocalizer().getMessage("nlRotateZoomPlanesPhenomena")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_DYNAMIC_PLANECHASE_BG,
localizer.getMessage("lblDynamicBackgroundPlanechase"),
localizer.getMessage("nlDynamicBackgroundPlanechase")),
Forge.getLocalizer().getMessage("lblDynamicBackgroundPlanechase"),
Forge.getLocalizer().getMessage("nlDynamicBackgroundPlanechase")),
4);
lstSettings.addItem(new BooleanSetting(FPref.UI_DISABLE_IMAGES_EFFECT_CARDS,
localizer.getMessage("lblDisableCardEffect"),
localizer.getMessage("nlDisableCardEffect")),
Forge.getLocalizer().getMessage("lblDisableCardEffect"),
Forge.getLocalizer().getMessage("nlDisableCardEffect")),
4);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_ENABLE_BORDER_MASKING,
localizer.getMessage("lblBorderMaskOption"),
localizer.getMessage("nlBorderMaskOption"),
Forge.getLocalizer().getMessage("lblBorderMaskOption"),
Forge.getLocalizer().getMessage("nlBorderMaskOption"),
new String[]{"Off", "Crop", "Full", "Art"}) {
@Override
public void valueChanged(String newValue) {
@@ -586,8 +583,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
}, 4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_PRELOAD_EXTENDED_ART,
localizer.getMessage("lblPreloadExtendedArtCards"),
localizer.getMessage("nlPreloadExtendedArtCards")){
Forge.getLocalizer().getMessage("lblPreloadExtendedArtCards"),
Forge.getLocalizer().getMessage("nlPreloadExtendedArtCards")){
@Override
public void select() {
super.select();
@@ -596,13 +593,13 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
},4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_MATCH_SCROLL_INDICATOR,
localizer.getMessage("lblMatchScrollIndicator"),
localizer.getMessage("nlMatchScrollIndicator")),
Forge.getLocalizer().getMessage("lblMatchScrollIndicator"),
Forge.getLocalizer().getMessage("nlMatchScrollIndicator")),
4);
if (!GuiBase.isAndroid()) {
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_MAGNIFIER,
localizer.getMessage("lblEnableMagnifier"),
localizer.getMessage("nlEnableMagnifier")){
Forge.getLocalizer().getMessage("lblEnableMagnifier"),
Forge.getLocalizer().getMessage("nlEnableMagnifier")){
@Override
public void select() {
super.select();
@@ -614,8 +611,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
},4);
}
lstSettings.addItem(new BooleanSetting(FPref.UI_SHOW_FPS,
localizer.getMessage("lblShowFPSDisplay"),
localizer.getMessage("nlShowFPSDisplay")){
Forge.getLocalizer().getMessage("lblShowFPSDisplay"),
Forge.getLocalizer().getMessage("nlShowFPSDisplay")){
@Override
public void select() {
super.select();
@@ -624,58 +621,58 @@ public class SettingsPage extends TabPage<SettingsScreen> {
}
},4);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_CARD_COUNTER_DISPLAY_TYPE,
localizer.getMessage("cbpCounterDisplayType"),
localizer.getMessage("nlCounterDisplayType"),
Forge.getLocalizer().getMessage("cbpCounterDisplayType"),
Forge.getLocalizer().getMessage("nlCounterDisplayType"),
new String[]{
ForgeConstants.CounterDisplayType.TEXT.getName(), ForgeConstants.CounterDisplayType.IMAGE.getName(),
ForgeConstants.CounterDisplayType.HYBRID.getName(), ForgeConstants.CounterDisplayType.OLD_WHEN_SMALL.getName()}),
4);
//Card Overlays
lstSettings.addItem(new BooleanSetting(FPref.UI_SHOW_CARD_OVERLAYS,
localizer.getMessage("lblShowCardOverlays"),
localizer.getMessage("nlShowCardOverlays")),
Forge.getLocalizer().getMessage("lblShowCardOverlays"),
Forge.getLocalizer().getMessage("nlShowCardOverlays")),
5);
lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_CARD_NAME,
localizer.getMessage("lblShowCardNameOverlays"),
localizer.getMessage("nlShowCardNameOverlays")),
Forge.getLocalizer().getMessage("lblShowCardNameOverlays"),
Forge.getLocalizer().getMessage("nlShowCardNameOverlays")),
5);
lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_CARD_MANA_COST,
localizer.getMessage("lblShowCardManaCostOverlays"),
localizer.getMessage("nlShowCardManaCostOverlays")),
Forge.getLocalizer().getMessage("lblShowCardManaCostOverlays"),
Forge.getLocalizer().getMessage("nlShowCardManaCostOverlays")),
5);
lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_CARD_POWER,
localizer.getMessage("lblShowCardPTOverlays"),
localizer.getMessage("nlShowCardPTOverlays")),
Forge.getLocalizer().getMessage("lblShowCardPTOverlays"),
Forge.getLocalizer().getMessage("nlShowCardPTOverlays")),
5);
lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_CARD_ID,
localizer.getMessage("lblShowCardIDOverlays"),
localizer.getMessage("nlShowCardIDOverlays")),
Forge.getLocalizer().getMessage("lblShowCardIDOverlays"),
Forge.getLocalizer().getMessage("nlShowCardIDOverlays")),
5);
lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_DRAFT_RANKING,
localizer.getMessage("lblShowDraftRankingOverlay"),
localizer.getMessage("nlShowDraftRankingOverlay")),
Forge.getLocalizer().getMessage("lblShowDraftRankingOverlay"),
Forge.getLocalizer().getMessage("nlShowDraftRankingOverlay")),
5);
lstSettings.addItem(new BooleanSetting(FPref.UI_OVERLAY_ABILITY_ICONS,
localizer.getMessage("lblShowAbilityIconsOverlays"),
localizer.getMessage("nlShowAbilityIconsOverlays")),
Forge.getLocalizer().getMessage("lblShowAbilityIconsOverlays"),
Forge.getLocalizer().getMessage("nlShowAbilityIconsOverlays")),
5);
lstSettings.addItem(new BooleanSetting(FPref.UI_USE_LASER_ARROWS,
localizer.getMessage("lblUseLaserArrows"),
localizer.getMessage("nlUseLaserArrows")),
Forge.getLocalizer().getMessage("lblUseLaserArrows"),
Forge.getLocalizer().getMessage("nlUseLaserArrows")),
5);
//Vibration Options
lstSettings.addItem(new BooleanSetting(FPref.UI_VIBRATE_ON_LIFE_LOSS,
localizer.getMessage("lblVibrateWhenLosingLife"),
localizer.getMessage("nlVibrateWhenLosingLife")),
Forge.getLocalizer().getMessage("lblVibrateWhenLosingLife"),
Forge.getLocalizer().getMessage("nlVibrateWhenLosingLife")),
6);
lstSettings.addItem(new BooleanSetting(FPref.UI_VIBRATE_ON_LONG_PRESS,
localizer.getMessage("lblVibrateAfterLongPress"),
localizer.getMessage("nlVibrateAfterLongPress")),
Forge.getLocalizer().getMessage("lblVibrateAfterLongPress"),
Forge.getLocalizer().getMessage("nlVibrateAfterLongPress")),
6);
//Sound Options
lstSettings.addItem(new CustomSelectSetting(FPref.UI_CURRENT_SOUND_SET,
localizer.getMessage("cbpSoundSets"),
localizer.getMessage("nlpSoundSets"),
Forge.getLocalizer().getMessage("cbpSoundSets"),
Forge.getLocalizer().getMessage("nlpSoundSets"),
SoundSystem.instance.getAvailableSoundSets()) {
@Override
public void valueChanged(String newValue) {
@@ -685,8 +682,8 @@ public class SettingsPage extends TabPage<SettingsScreen> {
},
7);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_CURRENT_MUSIC_SET,
localizer.getMessage("cbpMusicSets"),
localizer.getMessage("nlpMusicSets"),
Forge.getLocalizer().getMessage("cbpMusicSets"),
Forge.getLocalizer().getMessage("nlpMusicSets"),
SoundSystem.getAvailableMusicSets()) {
@Override
public void valueChanged(String newValue) {
@@ -697,13 +694,13 @@ public class SettingsPage extends TabPage<SettingsScreen> {
},
7);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_SOUNDS,
localizer.getMessage("cbAdjustSoundsVolume"),
localizer.getMessage("nlAdjustSoundsVolume"),
Forge.getLocalizer().getMessage("cbAdjustSoundsVolume"),
Forge.getLocalizer().getMessage("nlAdjustSoundsVolume"),
new String[]{"0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"}),
7);
lstSettings.addItem(new CustomSelectSetting(FPref.UI_VOL_MUSIC,
localizer.getMessage("cbAdjustMusicVolume"),
localizer.getMessage("nlAdjustMusicVolume"),
Forge.getLocalizer().getMessage("cbAdjustMusicVolume"),
Forge.getLocalizer().getMessage("nlAdjustMusicVolume"),
new String[]{"0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"}) {
@Override
public void valueChanged(String newValue) {

8
forge-gui-mobile/src/forge/toolbox/DualListBox.java
View File

@@ -7,10 +7,10 @@ import java.util.List;
import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.utils.Align;
import forge.Forge;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FEvent.FEventType;
import forge.util.Callback;
import forge.util.Localizer;
// An input box for handling the order of choices.
// Left box has the original choices
@@ -114,8 +114,8 @@ public class DualListBox<T> extends FDialog {
};
// Dual List Complete Buttons
initButton(0, Localizer.getInstance().getMessage("lblOK"), onAccept);
initButton(1, Localizer.getInstance().getMessage("lblAuto"), new FEventHandler() {
initButton(0, Forge.getLocalizer().getMessage("lblOK"), onAccept);
initButton(1, Forge.getLocalizer().getMessage("lblAuto"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
addAll();
@@ -123,7 +123,7 @@ public class DualListBox<T> extends FDialog {
}
});
selectOrder = add(new FLabel.Builder().align(Align.center).text(Localizer.getInstance().getMessage("lblSelectOrder")).build());
selectOrder = add(new FLabel.Builder().align(Align.center).text(Forge.getLocalizer().getMessage("lblSelectOrder")).build());
orderedLabel = add(new FLabel.Builder().align(Align.center).build());
setButtonState();

37
forge-gui-mobile/src/forge/toolbox/FFileChooser.java
View File

@@ -18,7 +18,6 @@ import forge.menu.FPopupMenu;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Callback;
import forge.util.FileUtil;
import forge.util.Localizer;
import forge.util.Utils;
public class FFileChooser extends FDialog {
@@ -65,22 +64,22 @@ public class FFileChooser extends FDialog {
}
});
initButton(0, Localizer.getInstance().getMessage("lblOK"), new FEventHandler() {
initButton(0, Forge.getLocalizer().getMessage("lblOK"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
activateSelectedFile(true);
}
});
initButton(1, Localizer.getInstance().getMessage("lblNewFolder"), new FEventHandler() {
initButton(1, Forge.getLocalizer().getMessage("lblNewFolder"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
final File dir = getCurrentDir();
if (dir == null) {
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblCannotAddNewFolderToInvaildFolder"), Localizer.getInstance().getMessage("lblInvalidFolder"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblCannotAddNewFolderToInvaildFolder"), Forge.getLocalizer().getMessage("lblInvalidFolder"));
return;
}
FOptionPane.showInputDialog(Localizer.getInstance().getMessage("lblEnterNewFolderName"), new Callback<String>() {
FOptionPane.showInputDialog(Forge.getLocalizer().getMessage("lblEnterNewFolderName"), new Callback<String>() {
@Override
public void run(String result) {
if (StringUtils.isEmpty(result)) { return; }
@@ -96,12 +95,12 @@ public class FFileChooser extends FDialog {
catch (Exception e) {
e.printStackTrace();
}
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblEnterFolderNameNotValid", result), Localizer.getInstance().getMessage("lblInvalidName"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblEnterFolderNameNotValid", result), Forge.getLocalizer().getMessage("lblInvalidName"));
}
});
}
});
initButton(2, Localizer.getInstance().getMessage("lblCancel"), new FEventHandler() {
initButton(2, Forge.getLocalizer().getMessage("lblCancel"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
hide();
@@ -205,13 +204,13 @@ public class FFileChooser extends FDialog {
//validate return value
if (returnDirectory) {
if (!file.exists() || !file.isDirectory()) {
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblNoFolderExistsWithSelectPath"), Localizer.getInstance().getMessage("lblInvalidFolder"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblNoFolderExistsWithSelectPath"), Forge.getLocalizer().getMessage("lblInvalidFolder"));
return;
}
}
else {
if ((!file.exists() && choiceType == ChoiceType.OpenFile) || file.isDirectory()) {
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblNoFileExistsWithSelectPath"), Localizer.getInstance().getMessage("lblInvalidFile"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblNoFileExistsWithSelectPath"), Forge.getLocalizer().getMessage("lblInvalidFile"));
return;
}
}
@@ -234,16 +233,16 @@ public class FFileChooser extends FDialog {
private void renameFile(final File file) {
final File dir = file.getParentFile();
if (dir == null) {
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblCannotRenameFileInInvalidFolder"), Localizer.getInstance().getMessage("lblInvalidFolder"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblCannotRenameFileInInvalidFolder"), Forge.getLocalizer().getMessage("lblInvalidFolder"));
return;
}
String title;
if (file.isDirectory()) {
title = Localizer.getInstance().getMessage("lblEnterNewNameForFolder");
title = Forge.getLocalizer().getMessage("lblEnterNewNameForFolder");
}
else {
title = Localizer.getInstance().getMessage("lblEnterNewNameForFile");
title = Forge.getLocalizer().getMessage("lblEnterNewNameForFile");
}
FOptionPane.showInputDialog(title, file.getName(), new Callback<String>() {
@Override
@@ -261,15 +260,15 @@ public class FFileChooser extends FDialog {
catch (Exception e) {
e.printStackTrace();
}
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblEnterNameNotValid", result), Localizer.getInstance().getMessage("lblInvalidName"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblEnterNameNotValid", result), Forge.getLocalizer().getMessage("lblInvalidName"));
}
});
}
private void deleteFile(final Integer index, final File file) {
final String deleteBehavior = file.isDirectory() ? Localizer.getInstance().getMessage("lblDeleteFolder") : Localizer.getInstance().getMessage("lblDeleteFile");
FOptionPane.showConfirmDialog(Localizer.getInstance().getMessage("lblAreYouSureProceedDelete"), deleteBehavior,
Localizer.getInstance().getMessage("lblDelete"), Localizer.getInstance().getMessage("lblCancel"), new Callback<Boolean>() {
final String deleteBehavior = file.isDirectory() ? Forge.getLocalizer().getMessage("lblDeleteFolder") : Forge.getLocalizer().getMessage("lblDeleteFile");
FOptionPane.showConfirmDialog(Forge.getLocalizer().getMessage("lblAreYouSureProceedDelete"), deleteBehavior,
Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblCancel"), new Callback<Boolean>() {
@Override
public void run(Boolean result) {
if (result) {
@@ -294,7 +293,7 @@ public class FFileChooser extends FDialog {
catch (Exception ex) {
ex.printStackTrace();
}
FOptionPane.showErrorDialog(Localizer.getInstance().getMessage("lblCouldBotDeleteFile"));
FOptionPane.showErrorDialog(Forge.getLocalizer().getMessage("lblCouldBotDeleteFile"));
}
}
});
@@ -369,8 +368,8 @@ public class FFileChooser extends FDialog {
FPopupMenu menu = new FPopupMenu() {
@Override
protected void buildMenu() {
final String renameBehavior = value.isDirectory() ? Localizer.getInstance().getMessage("lblRenameFolder") : Localizer.getInstance().getMessage("lblRenameFile");
final String deleteBehavior = value.isDirectory() ? Localizer.getInstance().getMessage("lblDeleteFolder") : Localizer.getInstance().getMessage("lblDeleteFile");
final String renameBehavior = value.isDirectory() ? Forge.getLocalizer().getMessage("lblRenameFolder") : Forge.getLocalizer().getMessage("lblRenameFile");
final String deleteBehavior = value.isDirectory() ? Forge.getLocalizer().getMessage("lblDeleteFolder") : Forge.getLocalizer().getMessage("lblDeleteFile");
addItem(new FMenuItem(renameBehavior, Forge.hdbuttons ? FSkinImage.HDEDIT : FSkinImage.EDIT,
new FEventHandler() {
@Override

13
forge-gui-mobile/src/forge/toolbox/FOptionPane.java
View File

@@ -23,7 +23,6 @@ import forge.localinstance.skin.FSkinProp;
import forge.screens.match.views.VPrompt;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
import forge.util.WaitCallback;
@@ -56,15 +55,15 @@ public class FOptionPane extends FDialog {
}
public static void showMessageDialog(final String message, final String title, final FImage icon) {
showOptionDialog(message, title, icon, ImmutableList.of(Localizer.getInstance().getMessage("lblOK")), 0, null);
showOptionDialog(message, title, icon, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 0, null);
}
public static void showMessageDialog(final String message, FSkinFont messageFont, final String title, final FImage icon) {
showOptionDialog(message, messageFont, title, icon, ImmutableList.of(Localizer.getInstance().getMessage("lblOK")), 0, null);
showOptionDialog(message, messageFont, title, icon, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 0, null);
}
public static void showMessageDialog(final String message, final String title, final FImage icon, final Callback<Integer> callback) {
showOptionDialog(message, title, icon, ImmutableList.of(Localizer.getInstance().getMessage("lblOK")), 0, callback);
showOptionDialog(message, title, icon, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 0, callback);
}
public static void showConfirmDialog(final String message, final Callback<Boolean> callback) {
@@ -72,11 +71,11 @@ public class FOptionPane extends FDialog {
}
public static void showConfirmDialog(final String message, final String title, final Callback<Boolean> callback) {
showConfirmDialog(message, title, Localizer.getInstance().getMessage("lblYes"), Localizer.getInstance().getMessage("lblNo"), true, callback);
showConfirmDialog(message, title, Forge.getLocalizer().getMessage("lblYes"), Forge.getLocalizer().getMessage("lblNo"), true, callback);
}
public static void showConfirmDialog(final String message, final String title, final boolean defaultYes, final Callback<Boolean> callback) {
showConfirmDialog(message, title, Localizer.getInstance().getMessage("lblYes"), Localizer.getInstance().getMessage("lblNo"), defaultYes, callback);
showConfirmDialog(message, title, Forge.getLocalizer().getMessage("lblYes"), Forge.getLocalizer().getMessage("lblNo"), defaultYes, callback);
}
public static void showConfirmDialog(final String message, final String title, final String yesButtonText, final String noButtonText, final Callback<Boolean> callback) {
@@ -190,7 +189,7 @@ public class FOptionPane extends FDialog {
container.add(inputField);
container.setHeight(inputField.getHeight() + padTop + PADDING);
final FOptionPane optionPane = new FOptionPane(message, null, title, null, container, ImmutableList.of(Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel")), 0, new Callback<Integer>() {
final FOptionPane optionPane = new FOptionPane(message, null, title, null, container, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblCancel")), 0, new Callback<Integer>() {
@SuppressWarnings("unchecked")
@Override
public void run(final Integer result) {

4
forge-gui-mobile/src/forge/toolbox/FSpinner.java
View File

@@ -1,8 +1,8 @@
package forge.toolbox;
import forge.Forge;
import forge.toolbox.FEvent.FEventType;
import forge.util.Callback;
import forge.util.Localizer;
public class FSpinner extends FTextField {
@@ -36,7 +36,7 @@ public class FSpinner extends FTextField {
@Override
public boolean tap(float x, float y, int count) {
GuiChoose.getInteger(Localizer.getInstance().getMessage("lblSelectANumber"), minValue, maxValue, new Callback<Integer>() {
GuiChoose.getInteger(Forge.getLocalizer().getMessage("lblSelectANumber"), minValue, maxValue, new Callback<Integer>() {
@Override
public void run(Integer result) {
if (result != null && result != value) {

7
forge-gui-mobile/src/forge/toolbox/FTextField.java
View File

@@ -14,7 +14,6 @@ import forge.menu.FMenuItem;
import forge.menu.FPopupMenu;
import forge.toolbox.FEvent.FEventHandler;
import forge.toolbox.FEvent.FEventType;
import forge.util.Localizer;
import forge.util.TextBounds;
import forge.util.Utils;
@@ -46,7 +45,7 @@ public class FTextField extends FDisplayObject implements ITextField {
protected void buildMenu() {
if (text.length() > 0) {
if (!readOnly) {
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblCut"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblCut"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
Forge.getClipboard().setContents(getSelectedText());
@@ -56,7 +55,7 @@ public class FTextField extends FDisplayObject implements ITextField {
}
}));
}
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblCopy"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblCopy"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
Forge.getClipboard().setContents(getSelectedText());
@@ -64,7 +63,7 @@ public class FTextField extends FDisplayObject implements ITextField {
}));
}
if (!readOnly) {
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblPaste"), new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblPaste"), new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
textBeforeKeyInput = text;

4
forge-gui-mobile/src/forge/toolbox/GuiChoose.java
View File

@@ -7,6 +7,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import forge.Forge;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function;
@@ -14,7 +15,6 @@ import com.google.common.collect.Iterables;
import forge.game.card.CardView;
import forge.util.Callback;
import forge.util.Localizer;
public class GuiChoose {
@@ -172,7 +172,7 @@ public class GuiChoose {
for (int i = min; i <= cutoff; i++) {
choices.add(Integer.valueOf(i));
}
choices.add(Localizer.getInstance().getMessage("lblOther") + "...");
choices.add(Forge.getLocalizer().getMessage("lblOther") + "...");
oneOrNone(message, choices, new Callback<Object>() {
@Override

11
forge-gui-mobile/src/forge/toolbox/ListChooser.java
View File

@@ -41,7 +41,6 @@ import forge.menu.FMenuItem;
import forge.menu.FPopupMenu;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Callback;
import forge.util.Localizer;
import forge.util.Utils;
/**
@@ -95,7 +94,7 @@ public class ListChooser<T> extends FContainer {
if (list.size() > 25 && !lstChoices.getListItemRenderer().layoutHorizontal()) {
txtSearch = add(new FTextField());
txtSearch.setFont(FSkinFont.get(12));
txtSearch.setGhostText(Localizer.getInstance().getMessage("lblSearch"));
txtSearch.setGhostText(Forge.getLocalizer().getMessage("lblSearch"));
txtSearch.setChangedHandler(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
@@ -112,13 +111,13 @@ public class ListChooser<T> extends FContainer {
FPopupMenu menu = new FPopupMenu() {
@Override
protected void buildMenu() {
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblAdvancedSearch"), Forge.hdbuttons ? FSkinImage.HDSEARCH : FSkinImage.SEARCH, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblAdvancedSearch"), Forge.hdbuttons ? FSkinImage.HDSEARCH : FSkinImage.SEARCH, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
advancedSearchFilter.edit();
}
}));
addItem(new FMenuItem(Localizer.getInstance().getMessage("lblResetFilters"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() {
addItem(new FMenuItem(Forge.getLocalizer().getMessage("lblResetFilters"), Forge.hdbuttons ? FSkinImage.HDDELETE : FSkinImage.DELETE, new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
resetFilters();
@@ -135,9 +134,9 @@ public class ListChooser<T> extends FContainer {
final List<String> options;
if (minChoices == 0) {
options = ImmutableList.of(Localizer.getInstance().getMessage("lblOK"), Localizer.getInstance().getMessage("lblCancel"));
options = ImmutableList.of(Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblCancel"));
} else {
options = ImmutableList.of(Localizer.getInstance().getMessage("lblOK"));
options = ImmutableList.of(Forge.getLocalizer().getMessage("lblOK"));
}
updateHeight();

11
forge-gui/res/adventure/Shandalar/config.json
View File

@@ -1,13 +1,10 @@
{
"screenWidth": 480,
"screenHeight": 270,
"font": "skin/MiKrollFantasy.ttf",
"skin": "skin/ui_skin.json",
"fontColor": "ffffff" ,
"playerBaseSpeed": 30,
"minDeckSize": 40,
"starterDecks":
[
"starterDecks": [
"decks/starter/white.json",
"decks/starter/black.json",
"decks/starter/blue.json",
@@ -21,14 +18,16 @@
"staringMoney": 200,
"enemyLifeFactor": 0.8,
"sellFactor": 0.5
},{
},
{
"name": "Normal",
"startingLife": 12,
"staringMoney": 100,
"startingDifficulty": true,
"enemyLifeFactor": 1.0,
"sellFactor": 0.2
},{
},
{
"name": "Hard",
"startingLife": 8,
"staringMoney": 10,

10580
forge-gui/res/adventure/Shandalar/skin/LanaPixelCJK.fnt Normal file
View File

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More