Commit Graph

48 Commits (master)

Author SHA1 Message Date
ShawnieBoy 14408fc0e7 update counter icons 2018-08-09 13:11:19 +01:00
Martin Petricek bd5ae5fd7a Refactoring (#1543)
* Fix typos.

* Remove unnecessary boxing/unboxing.

* Replace traditional 'for' loops with 'foreach' loops.

* Replace explicit types with <> (diamonds) where they can be inferred.

* Collapse identical catch branches.

* Replace statement lambda with expression lambda for short statements.

* Remove unnecessary imports.

* Replace some lambdas with Comparator.comparing

* Replace Runnables with lambdas.

* Use addAll instead of adding whole collection manually.

* Simplify boolean expressions.

* Remove redundant 'else'.

* Simplify some boolean conditions that are always true or false.

* Inline redundant local variables.

* Remove extraneous semicolons.

* Fix Javadoc errors.

* Replace anonymous classes with lambdas.

* Replace chain of 'if's with switch.

* Remove delaration of exception that is never thrown.

* Use String/StringBuilder properly.
2018-04-08 08:59:14 +08:00
ShawnieBoy 592e9d258e sort MagicIcon and TextImages for non-p/t counter types 2017-07-19 19:43:06 +01:00
melvinzhang 5d5e8e57a9 add small undo icon and use it in undo message, for #1177 2017-07-14 16:08:49 +08:00
ShawnieBoy b7e586a68c add Bricker counter to counterTypes 2017-04-23 04:06:25 +01:00
ShawnieBoy cbcd41680d add missing TextImages edit for Energy symbol 2016-09-17 02:46:45 +01:00
ShawnieBoy 1f869617ef add Sleep counter 2016-02-26 14:51:46 +00:00
ShawnieBoy ff120174b7 add Page counter as Study counter 2016-02-25 22:43:43 +00:00
ShawnieBoy c0faad54a0 add Fuse counter 2016-02-25 18:46:34 +00:00
ShawnieBoy 963aae417d add Infection Counter image (as Spore) 2016-02-23 15:49:48 +00:00
ShawnieBoy 10374b5247 add MANA_PHYREXIAN_NULL for Phyrexian symbol with no mana color 2015-12-26 11:50:44 +00:00
melvinzhang a275f9b630 work around missing {P} symbol by using MANA_PHYREXIAN_BLACK for now to prevent crash when rendering Rage Extractor 2015-12-26 12:33:41 +08:00
melvinzhang 956ec61d55 relabel prevent damage symbol from {P} to {PD} as {P} is used for the Phyrexian symbol 2015-12-26 12:26:18 +08:00
melvinzhang f419f8e85f replace hardcoded {S} with reference to MagicCostManaType.Snow 2015-12-26 11:38:17 +08:00
melvinzhang 16a24db663 replace hard coded and slow MagicImages.getIcon with direct lookup via TextImages.getIcon 2015-12-26 11:36:49 +08:00
melvinzhang 4eb24b39b5 convert runtime check for duplication into assert 2015-12-20 14:15:45 +08:00
melvinzhang d35a047b63 replace hardcoded strings with references 2015-12-20 11:42:15 +08:00
ShawnieBoy 8ac0887fbd rename Tap and Untap symbols from Tapped-Untapped, to Tap-Untap 2015-12-19 13:14:44 +00:00
melvinzhang 8e0b88a944 refactor drawCounterInfo to use TextImages 2015-12-19 19:48:56 +08:00
melvinzhang 4357237985 use MagicIcon.MANA_COLORLESS to represent colorless mana 2015-12-14 23:28:06 +08:00
melvinzhang 33f9c0e66e render a TextComponent if textPart has no corresponding icon, fixes #383 2015-06-23 22:44:54 +08:00
ShawnieBoy 2484e6cc7d Include colorless Mana Icons up to 20 2015-06-23 13:48:16 +01:00
ShawnieBoy 551c69b352 Change TextImages summoning sickness [Cannottap] to {SS} to prevent
clash with Snow mana
2015-06-16 20:52:43 +01:00
ShawnieBoy 53b18b1935 add loyalty counter to TextImages 2015-04-16 22:08:40 +01:00
lodici ade16c76f4 - removed all UI reference from TextImages data class.
- simplified IconImages API.
2015-02-12 14:44:00 +00:00
lodici 5e26adb7a1 prefix mana icon enums in MagicIcon with MANA_. 2015-02-12 14:26:32 +00:00
lodici bac57a208c replace static mana icon constants with call to method using MagicIcon enum. 2015-02-12 14:13:45 +00:00
lodici 6bf7ba679d simplify syntax with diamond inference refactor. 2015-02-12 13:20:53 +00:00
lodici 81e8b0de5a replace IconImages static ImageIcons with call to getIcon; 2015-02-12 01:19:18 +00:00
lodici 2f3df381e6 bulk replace of public static icons in IconImages with call to getIcon() using MagicIcon enum in data package. 2015-02-11 15:58:27 +00:00
lodici feaa1edcc7 move IconImages into ui-related package as it is dependent on Swing/awt. 2015-02-04 16:46:35 +00:00
ShawnieBoy e5981073cc switch phyrexian mana from {P/*} to {*/P} to match json 2014-09-16 13:57:36 +01:00
ShawnieBoy b611eaae48 Import reorganise/remove unused 2014-04-18 22:43:01 +01:00
ShawnieBoy 993656e167 Add charge counter to TextImages 2014-04-04 22:43:22 +01:00
melvin 6339c0af29 add icon for Spore 2014-04-04 08:53:38 +08:00
ShawnieBoy 6d1e317759 Begin addition of colorless hybrid mana 2014-03-01 04:39:37 +00:00
melvin bb55929ff4 correct mapping from text to image for +1/+1 and -1/-1 counters 2014-02-27 17:00:34 +08:00
melvin c75730076a correct rendering of phyrexian mana symbols 2014-02-25 21:04:28 +08:00
melvin 64368e1b9a remove extraneous whitespace 2013-06-24 09:33:35 +08:00
melvin f1b27c586c convert to UNIX line endings 2013-04-13 10:32:25 +08:00
melvin e52410deae convert tab to four spaces 2012-08-26 16:56:30 +08:00
melvin 09acc5ec06 added icons for mana cost {11} to {16} 2012-05-25 23:19:05 +08:00
beholder c13861ba11 added bribery counter. added Gwafa Hazid, Profiteer 2012-03-04 11:03:11 +01:00
beholder a37d6e3c43 added goldcounter.png. added MagicCounterType.Gold. added Aurification 2011-10-17 17:59:27 +02:00
melvin 178bae1062 throw RuntimeException if text has no corresponding icon 2011-09-17 22:42:17 +08:00
melvin 57beae6a8e replaced import * with single class import statements 2011-08-31 14:08:53 +08:00
melvin 850d01d3d1 optimized import statements with IntelliJ 2011-08-10 23:28:35 +08:00
ubeefx 7fd13965b2 Initial version. 2010-11-21 18:54:59 +00:00