Jetz
6c10351d93
Merge remote-tracking branch 'origin/master' into code-cleanup
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/ability/PlayAi.java
# forge-core/src/main/java/forge/util/collect/FCollection.java
# forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
2024-12-05 08:27:25 -05:00
Anthony Calosa
b858b48fde
remove Collections.synchronized
2024-12-05 16:39:10 +08:00
Anthony Calosa
8e16456b2e
update comments
2024-12-04 22:12:22 +08:00
Anthony Calosa
36f0021cae
revert threadsafeiterable
2024-12-04 22:04:29 +08:00
kevlahnota
a0cad5fa48
fix FCollection ( #6657 )
2024-12-04 14:45:05 +01:00
Jetz
db2764f1ce
Fix Build Errors
2024-12-04 08:27:37 -05:00
Jetz
44cf7dbbea
Merge remote-tracking branch 'origin/master' into code-cleanup
...
# Conflicts:
# forge-ai/src/main/java/forge/ai/AiAttackController.java
# forge-ai/src/main/java/forge/ai/AiCardMemory.java
# forge-ai/src/main/java/forge/ai/AiController.java
# forge-core/src/main/java/forge/card/ICardDatabase.java
# forge-core/src/main/java/forge/item/generation/BoosterGenerator.java
# forge-core/src/main/java/forge/util/FileSection.java
# forge-core/src/main/java/forge/util/collect/FCollection.java
# forge-game/src/main/java/forge/game/card/CardProperty.java
# forge-game/src/main/java/forge/game/combat/Combat.java
# forge-game/src/main/java/forge/game/spellability/SpellAbility.java
# forge-game/src/main/java/forge/game/staticability/StaticAbilityContinuous.java
# forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
# forge-gui-mobile/src/forge/itemmanager/ItemManager.java
# forge-gui/src/main/java/forge/deck/DeckgenUtil.java
# forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java
2024-12-04 08:15:30 -05:00
kevlahnota
c6c55a5a6a
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-12-01 12:12:31 +08:00
Ayora29
115276fa56
Update draftable edition sections ( #6631 )
...
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix art index when parsing edition files sections
Add "scheme" section
Add fallback sheet in BoosterGenerator
Rewrite FileSection and Use LinkedHashMap for sections map
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Convert MKM to BoosterSlots
* Rename "RareMythic" section
* Remove conjured cards that do not have unique artwork.
* Restore basic land order
* Fixes
* parseSections : Fix Index out of bounds error for empty file
* FileSection.java : use for loop instead of do/while
---------
Co-authored-by: Agetian <stavdev@mail.ru >
2024-11-29 12:15:11 +03:00
Anthony Calosa
e1d7c4a429
use Guava memoize
2024-11-26 05:48:21 +08:00
Anthony Calosa
08bab22a23
refactor lazy initialization
2024-11-25 20:45:05 +08:00
Agetian
85e3cef612
Revert "Update draftable edition sections ( #6274 )" ( #6623 )
...
This reverts commit 46f3f01450
2024-11-24 16:48:01 +03:00
Ayora29
46f3f01450
Update draftable edition sections ( #6274 )
...
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix art index when parsing edition files sections
Add "scheme" section
Add fallback sheet in BoosterGenerator
Rewrite FileSection and Use LinkedHashMap for sections map
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Fix edition txt files
* Convert MKM to BoosterSlots
* Rename "RareMythic" section
* Remove conjured cards that do not have unique artwork.
* Restore basic land order
2024-11-24 16:39:21 +03:00
Anthony Calosa
b0411423f6
use Executor, update MatchScreen
2024-11-23 13:22:41 +08:00
Anthony Calosa
78e587b32b
handle exception
2024-11-22 19:13:15 +08:00
kevlahnota
f01d03e706
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-22 06:13:37 +08:00
tool4ever
5fa9f5b50e
Fix Kentaro ( #6600 )
2024-11-21 16:58:13 +00:00
Anthony Calosa
dda5afe704
refactor ManaPool
...
move custom multimap implementation for floating mana since this only covers small section
2024-11-21 13:33:52 +08:00
Chris H
0bc4e5d7b9
Restore flatten and version for now
2024-11-20 20:48:21 -05:00
GitHub Actions
c95afd86d8
[maven-release-plugin] prepare for next development iteration
2024-11-20 20:48:21 -05:00
GitHub Actions
ac37ee1947
[maven-release-plugin] prepare release forge-2.0.00
2024-11-20 20:48:21 -05:00
Chris H
0553eb58ef
Temporarily remove flatten to get a release out
2024-11-20 20:48:21 -05:00
Anthony Calosa
0854fbb947
update FCollection
...
Replace copyonwritearray to a custom implementation for concurrent modification exception. A little bit slower but supports iterator operations.
Added FCollectionTest
2024-11-19 22:32:37 +08:00
Anthony Calosa
619130b519
remove unused import
2024-11-17 08:07:07 +08:00
Anthony Calosa
5dc84a68c4
remove threadsafeIterable
...
The original purpose which is to create a copy of linkedlist to iterate to avoid concurrent modification, but we use copyonwritearray design and it is already thread safe and iteration while modification is handled internally.
2024-11-17 08:00:29 +08:00
kevlahnota
0247acbd49
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-16 18:52:12 +08:00
Anthony Calosa
95e3304948
add coloridversion check
2024-11-16 18:24:22 +08:00
kevlahnota
b5f96ab8e2
Merge branch 'master' into CrypticSpire
2024-11-16 17:14:51 +08:00
Anthony Calosa
f52b7abe61
create ConcurrentMultiMap, remove unused map
2024-11-15 20:24:20 +08:00
kevlahnota
d9c4c818b5
Merge branch 'master' into AI_ATTACK_TIMEOUT
2024-11-15 16:53:04 +08:00
kevlahnota
4b13e55d83
fix infinite notice for missing tokens
2024-11-15 16:26:05 +08:00
kevlahnota
fc85623343
better to use a linkedqueue
2024-11-15 11:51:26 +08:00
kevlahnota
8a1d25e4e9
fix failing test
2024-11-15 11:46:20 +08:00
kevlahnota
37eed29ad2
try this multimap for manapool
2024-11-15 11:08:17 +08:00
Anthony Calosa
e2c37d11e7
AI Attack Timeout
2024-11-14 19:11:25 +08:00
Anthony Calosa
58e4b7e2df
Merge remote-tracking branch 'origin/CrypticSpire' into CrypticSpire
2024-11-14 10:31:11 +08:00
Anthony Calosa
b161502595
update setting colorID
2024-11-14 10:30:33 +08:00
kevlahnota
65c74b2009
Merge branch 'master' into CrypticSpire
2024-11-14 09:05:37 +08:00
Anthony Calosa
8d9dabf7d7
remove uncommited changes
2024-11-14 06:06:26 +08:00
Anthony Calosa
60cfd97162
remove unused imports
2024-11-14 06:02:38 +08:00
Anthony Calosa
71ecf91bb5
from list to set
2024-11-14 06:00:02 +08:00
Anthony Calosa
85913a3d6c
load from deck
2024-11-13 23:42:08 +08:00
Jetz
c347ff5810
Merge remote-tracking branch 'origin/master' into code-cleanup
...
# Conflicts:
# forge-core/src/main/java/forge/StaticData.java
2024-11-13 09:20:00 -05:00
Jetz
d81c5a40cf
Revert .toList() for Android compatibility
2024-11-13 09:17:33 -05:00
Anthony Calosa
88613c555a
refactor some vars, and save to deck file
...
todo validate
2024-11-13 22:13:18 +08:00
Anthony Calosa
5afaff814a
update deck editor for spire
2024-11-13 10:29:18 +08:00
kevlahnota
82555babd8
Update StaticData.java
...
remove concurrency for token audit
2024-11-12 22:48:15 +08:00
kevlahnota
d7fd20ec5f
add note
2024-11-11 23:49:26 +08:00
Anthony Calosa
71480e63df
Support older Android
...
- missing toList from stream
2024-11-11 23:36:54 +08:00
Anthony Calosa
cb2ddf39f8
update auditer
2024-11-11 17:00:04 +08:00
