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

Some Java 11 migrations

Browse Source
This commit is contained in:
Jetz
2024-12-05 08:05:17 -05:00
parent db2764f1ce
commit fa94754c91
4 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -1581,7 +1581,7 @@ public class AiController {
return spellAbility.isLandAbility() || (spellAbility.getHostCard() != null && ComputerUtilCard.isCardRemAIDeck(spellAbility.getHostCard())); return spellAbility.isLandAbility() || (spellAbility.getHostCard() != null && ComputerUtilCard.isCardRemAIDeck(spellAbility.getHostCard()));
}); });
//removed skipped SA //removed skipped SA
skipped = Lists.newArrayList(Iterables.filter(saList, SpellAbility::isSkip)); skipped = saList.stream().filter(SpellAbility::isSkip).collect(Collectors.toList());
if (!skipped.isEmpty()) if (!skipped.isEmpty())
saList.removeAll(skipped); saList.removeAll(skipped);
//update LivingEndPlayer //update LivingEndPlayer

2
forge-game/src/main/java/forge/game/ability/effects/DiscoverEffect.java
View File

@@ -92,7 +92,7 @@ public class DiscoverEffect extends SpellAbilityEffect {
List<SpellAbility> sas = AbilityUtils.getBasicSpellsFromPlayEffect(found, p); List<SpellAbility> sas = AbilityUtils.getBasicSpellsFromPlayEffect(found, p);
// filter out land abilities due to MDFC or similar // filter out land abilities due to MDFC or similar
sas.removeIf(sp -> sp.isLandAbility()); sas.removeIf(SpellAbility::isLandAbility);
// the spell must also have a mana value equal to or less than the discover number // the spell must also have a mana value equal to or less than the discover number
sas.removeIf(sp -> sp.getPayCosts().getTotalMana().getCMC() > num); sas.removeIf(sp -> sp.getPayCosts().getTotalMana().getCMC() > num);

6
forge-game/src/main/java/forge/game/ability/effects/UnlockDoorEffect.java
View File

@@ -52,7 +52,7 @@ public class UnlockDoorEffect extends SpellAbilityEffect {
c.unlockRoom(activator, sa.getCardStateName()); c.unlockRoom(activator, sa.getCardStateName());
break; break;
case "Unlock": case "Unlock":
List<CardState> states = c.getLockedRooms().stream().map(stateName -> c.getState(stateName)).collect(Collectors.toList()); List<CardState> states = c.getLockedRooms().stream().map(c::getState).collect(Collectors.toList());
// need to choose Room Name // need to choose Room Name
CardState chosen = activator.getController().chooseSingleCardState(sa, states, "Choose Room to unlock", params); CardState chosen = activator.getController().chooseSingleCardState(sa, states, "Choose Room to unlock", params);
@@ -65,7 +65,7 @@ public class UnlockDoorEffect extends SpellAbilityEffect {
switch (c.getLockedRooms().size()) { switch (c.getLockedRooms().size()) {
case 0: case 0:
// no locked, all unlocked, can only lock door // no locked, all unlocked, can only lock door
List<CardState> unlockStates = c.getUnlockedRooms().stream().map(stateName -> c.getState(stateName)).collect(Collectors.toList()); List<CardState> unlockStates = c.getUnlockedRooms().stream().map(c::getState).collect(Collectors.toList());
CardState chosenUnlock = activator.getController().chooseSingleCardState(sa, unlockStates, "Choose Room to lock", params); CardState chosenUnlock = activator.getController().chooseSingleCardState(sa, unlockStates, "Choose Room to lock", params);
if (chosenUnlock == null) { if (chosenUnlock == null) {
continue; continue;
@@ -88,7 +88,7 @@ public class UnlockDoorEffect extends SpellAbilityEffect {
} }
break; break;
case 2: case 2:
List<CardState> lockStates = c.getLockedRooms().stream().map(stateName -> c.getState(stateName)).collect(Collectors.toList()); List<CardState> lockStates = c.getLockedRooms().stream().map(c::getState).collect(Collectors.toList());
// need to choose Room Name // need to choose Room Name
CardState chosenLock = activator.getController().chooseSingleCardState(sa, lockStates, "Choose Room to unlock", params); CardState chosenLock = activator.getController().chooseSingleCardState(sa, lockStates, "Choose Room to unlock", params);

14
forge-gui-android/src/com/badlogic/gdx/backends/android/AndroidApplication.java
View File

@@ -290,12 +290,7 @@ public class AndroidApplication extends Activity implements AndroidApplicationBa
} }
super.onResume(); super.onResume();
keyboardHeightProvider.setKeyboardHeightObserver((DefaultAndroidInput)Gdx.input); keyboardHeightProvider.setKeyboardHeightObserver((DefaultAndroidInput)Gdx.input);
((AndroidGraphics)getGraphics()).getView().post(new Runnable() { ((AndroidGraphics)getGraphics()).getView().post(() -> keyboardHeightProvider.start());
@Override
public void run () {
keyboardHeightProvider.start();
}
});
} }
@Override @Override
@@ -382,12 +377,7 @@ public class AndroidApplication extends Activity implements AndroidApplicationBa
@Override @Override
public void exit () { public void exit () {
handler.post(new Runnable() { handler.post(AndroidApplication.this::finish);
@Override
public void run () {
AndroidApplication.this.finish();
}
});
} }
@Override @Override