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

GameObject: turn into an interface

Browse Source
This commit is contained in:
Hans Mackowiak
2025-10-17 20:32:01 +02:00
parent bbf5319815
commit a0a3546691
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/CardTraitBase.java
View File

@@ -36,7 +36,7 @@ import forge.util.ITranslatable;
* Base class for Triggers,ReplacementEffects and StaticAbilities. * Base class for Triggers,ReplacementEffects and StaticAbilities.
* *
*/ */
public abstract class CardTraitBase extends GameObject implements IHasCardView, IHasSVars { public abstract class CardTraitBase implements GameObject, IHasCardView, IHasSVars {
/** The host card. */ /** The host card. */
protected Card hostCard; protected Card hostCard;

2
forge-game/src/main/java/forge/game/GameEntity.java
View File

@@ -46,7 +46,7 @@ import forge.game.staticability.StaticAbilityCantAttach;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.Lang; import forge.util.Lang;
public abstract class GameEntity extends GameObject implements IIdentifiable { public abstract class GameEntity implements GameObject, IIdentifiable {
protected int id; protected int id;
private String name = ""; private String name = "";
protected CardCollection attachedCards = new CardCollection(); protected CardCollection attachedCards = new CardCollection();

10
forge-game/src/main/java/forge/game/GameObject.java
View File

@@ -4,9 +4,9 @@ import forge.game.card.Card;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
public abstract class GameObject { public interface GameObject {
public boolean canBeTargetedBy(final SpellAbility sa) { public default boolean canBeTargetedBy(final SpellAbility sa) {
return false; return false;
} }
@@ -22,7 +22,7 @@ public abstract class GameObject {
* @param spellAbility * @param spellAbility
* @return true, if is valid * @return true, if is valid
*/ */
public boolean isValid(final String[] restrictions, final Player sourceController, final Card source, CardTraitBase spellAbility) { public default boolean isValid(final String[] restrictions, final Player sourceController, final Card source, CardTraitBase spellAbility) {
for (final String restriction : restrictions) { for (final String restriction : restrictions) {
if (this.isValid(restriction, sourceController, source, spellAbility)) { if (this.isValid(restriction, sourceController, source, spellAbility)) {
return true; return true;
@@ -43,7 +43,7 @@ public abstract class GameObject {
* @param spellAbility * @param spellAbility
* @return true, if is valid * @return true, if is valid
*/ */
public boolean isValid(final String restriction, final Player sourceController, final Card source, CardTraitBase spellAbility) { public default boolean isValid(final String restriction, final Player sourceController, final Card source, CardTraitBase spellAbility) {
return false; return false;
} }
@@ -59,7 +59,7 @@ public abstract class GameObject {
* @param spellAbility * @param spellAbility
* @return true, if successful * @return true, if successful
*/ */
public boolean hasProperty(final String property, final Player sourceController, final Card source, CardTraitBase spellAbility) { public default boolean hasProperty(final String property, final Player sourceController, final Card source, CardTraitBase spellAbility) {
return false; return false;
} }
} }

2
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -56,7 +56,7 @@ import java.util.Set;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class CardState extends GameObject implements IHasSVars, ITranslatable { public class CardState implements GameObject, IHasSVars, ITranslatable {
private String name = ""; private String name = "";
private CardType type = new CardType(false); private CardType type = new CardType(false);
private ManaCost manaCost = ManaCost.NO_COST; private ManaCost manaCost = ManaCost.NO_COST;