Commit Graph

2391 Commits

Author SHA1 Message Date
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
76aa19622e Guava migration - Replace select usages of Iterables.filter 2024-09-15 17:16:24 -04:00
Paul Hammerton
33e733559e fix_test 2024-09-13 17:27:43 +01:00
Jetz
79a640ca8a Guava migration - Cleanup imports 2024-09-06 20:20:06 -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
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
77ba9f1728 Guava migration - Inline Predicates.alwaysTrue 2024-09-02 20:00:38 -04:00
Jetz
16c0fa1095 Guava migration - Fix lingering build errors 2024-09-02 19:51:21 -04:00
Jetz
055dff71ce Guava migration - Inline Predicate varargs methods 2024-09-02 19:36:39 -04:00
Jetz
6a87768647 Guava migration - Migrate Suppliers 2024-09-02 18:03:26 -04:00
Jetz
8702e299cd Guava migration - Migrate Functions 2024-09-02 17:40:41 -04:00
Jetz
9765279166 Guava migration - Migrate Predicates 2024-09-02 17:08:25 -04:00
Jetz
4d6292802f Guava migration - Migrate static libraries 2024-09-02 14:52:42 -04:00
tool4ever
756ba28a14 Some fixes (#6004)
* Fix NPE
2024-08-28 15:54:28 +00:00
Jetz
4afc86b4b4 Support functional variants in translations 2024-08-26 00:25:43 -04:00
Hans Mackowiak
77710cf1b0 refactor LandAbility to be created by CardFactory (#5047)
---------

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.60>
2024-08-23 10:57:33 +02:00
Chris H
d2178756b5 Declare Forge user agent (#5946) 2024-08-18 19:17:43 +02:00
Chris H
4554dee721 Generate individual booster slots with individual replacement percentages
Convert MH3 to booster slot percentages
2024-08-16 16:57:21 -04:00
Jetz
27046744a4 Cleanup - Unused imports 2024-08-10 13:14:53 -04:00
Jetz
2fb7ad0c7b Cleanup - Statement lambda -> expression lambda 2024-08-10 12:58:32 -04:00
Jetz
4614c6c0c9 Cleanup - Map.getOrDefault and Map.computeIfAbsent 2024-08-10 12:48:52 -04:00
Jetz
bdc890c32c Cleanup - Collections.sort -> list.sort 2024-08-10 12:43:38 -04:00
Jetz
0ee46ff6ef Cleanup - .equals("") -> .isEmpty() 2024-08-10 12:28:18 -04:00
Jetz
9bbe4805a3 Cleanup - Redundant String.format 2024-08-10 12:21:50 -04:00
Jetz
daa9d59a67 Cleanup - addAll -> constructor parameter 2024-08-10 12:17:54 -04:00
Jetz
b417946032 Cleanup - PowerMock ignores for newer JDKs 2024-08-10 12:12:05 -04:00
Jetz
ae9877ce3c Cleanup - Collection.toArray 2024-08-10 10:25:35 -04:00
Paul Hammerton
cc6d3aa2e4 fix_tests 2024-08-10 14:00:57 +01:00
Paul Hammerton
982c2eeab5 Update CardDbCardMockTestCase.java 2024-08-03 14:52:03 +01:00
Paul Hammerton
30c10f5e08 Update CardDbCardMockTestCase.java 2024-08-03 14:46:03 +01:00
Paul Hammerton
1d443eb337 Update CardDbCardMockTestCase.java 2024-08-03 14:34:35 +01:00
Jetz72
d62dfe1c8c Miscallaneous Cleanup Part 2 - Lambdas and Method References (#5737)
* Cleanup - Unnecessary Boxing

* Cleanup - Unnecessary Unboxing

* Cleanup - For-Each Loops

* Cleanup - `indexOf != -1` -> `contains`

* Cleanup - Merge identical catch blocks

* Cleanup - Try-with-resources

* Cleanup - System.lineSeparator

* Cleanup - Reference types to primitives
Some loops over Integers were switched to IntStreams to hopefully cut down on overall boxing.

* Cleanup - Manually filling and copying arrays

* Remove unused imports

* Switch a lambda to a method reference

* Cleanup - CardPredicate Aggregates to method references

* Cleanup - Other static functions to method references

* Cleanup - Ambiguous class reference
Unclear when or how this happened...

* Cleanup - Anonymous -> Method reference

* Cleanup - Anonymous -> Lambda

* Cleanup - Comparator helper methods

* Cleanup - final method in final class

* Cleanup - private final methods

* Remove unused imports

* Convert a couple more lambdas to comparators.

* Simplify creature type list comparison.

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
2024-08-02 08:23:58 +03:00
Chris H
5fc6d38954 Autoclose FileOutputStreams (#5753) 2024-08-01 21:22:40 +03:00
Agetian
c081294f82 - Fix the AI sideboarding mode not loading on startup. 2024-08-01 08:56:50 -04:00
Jetz72
ec9f6e2d2b Added attraction light icons (#5663)
Refactored functional variants to be merged in the card face rather than the card factory
Some variant characteristics now show in deck builder columns
Fixed loading progress amount
"[card] has neither ManaCost nor Color" warning now actually displays when these are missing.

Co-authored-by: Jetz <Jetz722@gmail.com>
Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
2024-07-30 08:28:45 +03:00
Jetz72
3968c7e197 Miscallaneous Cleanup (#5703)
* Cleanup - Unnecessary Boxing

* Cleanup - Unnecessary Unboxing

* Cleanup - For-Each Loops

* Cleanup - `indexOf != -1` -> `contains`

* Cleanup - Merge identical catch blocks

* Cleanup - Try-with-resources

* Cleanup - System.lineSeparator

* Cleanup - Reference types to primitives
Some loops over Integers were switched to IntStreams to hopefully cut down on overall boxing.

* Cleanup - Manually filling and copying arrays

* Remove unused imports

* Switch a lambda to a method reference

---------

Co-authored-by: Jetz <Jetz722@gmail.com>
2024-07-29 17:23:43 +03:00
Chris H
5c55d7b001 Set User agent to modern chrome (#5708) 2024-07-28 12:56:01 +03:00
Chris H
404702c14d Fix preferences for Experimental restore 2024-07-24 11:09:20 -04:00
Jetz
983f2d2856 Fixed QuestCommander deck editor, hopefully. 2024-07-23 18:17:59 -04:00
Anthony Calosa
1504f221fc update prefs 2024-07-19 10:55:23 +08:00
Anthony Calosa
8fe5891c61 prevent crash using invalid theme 2024-07-19 10:06:07 +08:00
Chris H
31cf6a1c5d Update forge.sh (#5372)
https://github.com/Card-Forge/forge/issues/309
2024-07-11 16:58:46 +03:00
Chris H
3a61118ade Merge pull request #5357 from Jetz72/Attractions
Attraction Support
2024-07-02 11:02:43 -04:00
Chris H
b03b3517ea Backup Plan with hot swappable Input 2024-07-01 23:01:04 -04:00