Commit Graph

1795 Commits

Author SHA1 Message Date
TwentyToedToad
96d065189b Add Demonic Covenant and supporting changes (#6257)
* Add Demonic Covenant and supporting changes

* Updated changes

* Update demonic_covenant.txt

* Addressing PR comments

---------

Co-authored-by: loperjchris <christopher.loper1990@gmail.com>
2024-10-10 10:13:19 +03:00
Anthony Calosa
644fa46681 Merge branch 'master' into master2 2024-10-09 16:44:29 +08:00
Anthony Calosa
708fed3350 update and unified version code property 2024-10-09 12:32:09 +08:00
Jetz72
48adeb357d Show chosen mana for mana abilities as symbols (#6256)
* Support for icons in dialogs.
Mana abilities show chosen mana via icons.
Thread safety for showOptionDialog

* Ensure EventDispatchThread for showInputDialog

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
2024-10-08 22:17:18 +03:00
Anthony Calosa
eada2c6d4f Merge branch 'master' into master2 2024-10-07 06:06:05 +08:00
Hans Mackowiak
80b30d9a6a Room: First Spell Part (#6044)
* Room: First Spell 

----

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
Co-authored-by: TRT <>
Co-authored-by: Anthony Calosa <anthonycalosa@gmail.com>
2024-10-06 20:11:28 +02:00
Jetz
2e769ac279 Bug fix in RandomReservoir accumulator 2024-09-29 11:03:12 -04:00
Jetz
871947a540 Guava migration - Optimize imports 2024-09-26 09:59:26 -04:00
Jetz
6a04fcd500 Guava migration - Remove migration scaffold 2024-09-26 09:36:50 -04:00
Anthony Calosa
56400d4444 JAVA17 Update 2024-09-26 11:52:42 +08:00
Jetz
0278f5817b Guava migration - Create IterableUtil to house iterable helper methods dependent on Java predicates 2024-09-25 09:26:41 -04:00
Jetz
f636910ebb Guava migration - Rename StreamUtils -> StreamUtil for consistency 2024-09-25 09:01:46 -04:00
Jetz
1395baa2ff Guava migration - Fix build error 2024-09-25 08:59:21 -04:00
Jetz
d01c4e056b Guava migration - Remove unused imports 2024-09-25 08:48:28 -04:00
Jetz
52112e671c Guava migration - Slight cleanup 2024-09-25 08:46:07 -04:00
Jetz
a57bab1dac Guava migration - Remove single use Predicate implementations
Remove unused parameters of other predicates
2024-09-24 09:33:23 -04:00
Jetz
1af22ff4b6 Guava migration - Remove CollectionSuppliers 2024-09-22 16:54:49 -04:00
Jetz
cb4c64ce2c Guava migration - Added PaperCard predicates for commonly forwarded CardRules predicates 2024-09-22 16:48:08 -04:00
Jetz
d173c22688 Fixed some predicate logic issues. 2024-09-22 16:12:04 -04:00
Jetz
05d58c2fce Guava migration - Add StreamUtils.random collectors 2024-09-22 14:47:57 -04:00
Jetz
c2f72bb3c2 Guava migration - Stream support for FCollectionView 2024-09-22 11:05:19 -04:00
Jetz
c91334029a Guava migration - Refactor edition type checks 2024-09-19 09:20:02 -04:00
Jetz
7ab333a60a Guava migration - ItemPool collector 2024-09-16 09:10:21 -04:00
Jetz
8189f134eb Merge branch 'master' into code-cleanup
# Conflicts:
#	forge-ai/src/main/java/forge/ai/AiAttackController.java
#	forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
#	forge-core/src/main/java/forge/item/IPaperCard.java
#	forge-game/src/main/java/forge/game/ForgeScript.java
#	forge-game/src/main/java/forge/game/ability/effects/ManifestBaseEffect.java
#	forge-game/src/main/java/forge/game/card/CardState.java
#	forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
#	forge-game/src/main/java/forge/game/trigger/Trigger.java
2024-09-15 18:11:24 -04:00
Jetz
1644e7427e Guava migration - Replace select usages of Iterables.transform 2024-09-15 17:33:18 -04:00
Jetz
76aa19622e Guava migration - Replace select usages of Iterables.filter 2024-09-15 17:16:24 -04:00
Anthony Calosa
78f3d3d74d update more dependency 2024-09-10 23:39:51 +08:00
Jetz
cf68a75c03 Guava migration - Inline Iterables.all (Collection overload) 2024-09-08 15:29:41 -04:00
Jetz
7e3bb81428 Guava migration - Inline Iterables.any (Collection overload) 2024-09-08 15:27:36 -04:00
Jetz
b4015af203 Guava migration - Inline Iterables.any and Iterables.all (FCollectionView overloads) 2024-09-08 14:56:05 -04:00
Jetz
47164153f4 Guava migration - Add helper methods for FCollectionView anyMatch and allMatch 2024-09-08 14:21:43 -04:00
Anthony Calosa
a8f6842e21 update some dependency 2024-09-08 21:30:29 +08:00
Jetz
dfac93a668 Guava migration - Inline Iterables.find (Collection overload) 2024-09-06 20:33:37 -04:00
Jetz
36cff7e401 Guava migration - Inline Iterables.removeIf (Collection overload) 2024-09-06 20:32:22 -04:00
Jetz
d9c54aa9a1 Guava migration - Inline Iterables.addAll (Collection overload) 2024-09-06 20:18:49 -04:00
Jetz
c1de0dee6a Guava migration - Inline Iterables.removeAll (Collection overload) 2024-09-06 19:58:24 -04:00
Jetz
efe55efa43 Guava migration - Inline Iterables.isEmpty (Collection overload) 2024-09-06 19:57:22 -04:00
Jetz
4c8a94b18a Guava migration - Inline Predicates.compose 2024-09-06 19:50:14 -04:00
Jetz
6e3726ee79 Guava migration - Remove unused imports 2024-09-06 19:23:54 -04:00
Jetz
734bcec8bf Guava migration - Helper method for composing CardRules into PaperCards 2024-09-06 19:17:28 -04:00
Jetz
85f80bb5f1 Guava migration - Explode Predicate "Presets" subclasses 2024-09-06 18:10:24 -04:00
Jetz
0bf04c2fc8 Guava migration - Add common helper predicates 2024-09-06 09:24:32 -04:00
Chris H
9a5f0b9ff1 Fix MH3 generation 2024-09-05 07:13:13 -04:00
Jetz
2d233f8ad5 Guava migration - Inline Predicates.or 2024-09-04 00:23:58 -04:00
Jetz
b37f8725ba Guava migration - Inline Predicates.and 2024-09-03 20:22:45 -04:00
Jetz
78bc9fd04e Guava migration - Inline Predicates.not 2024-09-03 09:41:07 -04:00
Jetz
6b96bca83f Guava migration - Inline Predicates.equalTo 2024-09-03 08:54:18 -04:00
Jetz
4eb8fddfef Guava migration - Inline Predicates.in 2024-09-02 20:06:49 -04:00
Jetz
ef011d3f51 Guava migration - Inline Predicates.instanceOf 2024-09-02 20:03:13 -04:00
Jetz
77ba9f1728 Guava migration - Inline Predicates.alwaysTrue 2024-09-02 20:00:38 -04:00