From f3fccfbd8ab8df7f46f3aa9f5001fbe74fc13274 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Fri, 12 Apr 2024 20:11:04 -0400
Subject: [PATCH] refactor: use setter method and private field

---
 Mage.Sets/src/mage/cards/h/HiddenPredators.java               | 2 +-
 Mage.Sets/src/mage/cards/l/LurkingJackals.java                | 2 +-
 Mage.Sets/src/mage/cards/o/OpalAvenger.java                   | 4 ++--
 Mage.Sets/src/mage/cards/v/VeiledCrocodile.java               | 2 +-
 Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java                  | 2 +-
 Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java   | 2 +-
 .../abilities/common/AttacksAloneSourceTriggeredAbility.java  | 2 +-
 .../common/AttacksAndIsNotBlockedTriggeredAbility.java        | 2 +-
 .../abilities/common/AttacksOrBlocksTriggeredAbility.java     | 2 +-
 .../java/mage/abilities/common/AttacksTriggeredAbility.java   | 2 +-
 .../common/BecomesBlockedByCreatureTriggeredAbility.java      | 2 +-
 .../common/BecomesBlockedSourceTriggeredAbility.java          | 2 +-
 .../common/BecomesPlottedSourceTriggeredAbility.java          | 4 ++--
 .../abilities/common/BecomesTappedSourceTriggeredAbility.java | 2 +-
 .../abilities/common/BecomesTargetSourceTriggeredAbility.java | 2 +-
 .../BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java    | 2 +-
 .../mage/abilities/common/BlocksSourceTriggeredAbility.java   | 2 +-
 .../java/mage/abilities/common/CycleTriggeredAbility.java     | 2 +-
 .../common/DealsCombatDamageToAPlayerTriggeredAbility.java    | 2 +-
 .../abilities/common/DealsCombatDamageTriggeredAbility.java   | 2 +-
 .../abilities/common/DealtDamageToSourceTriggeredAbility.java | 2 +-
 .../mage/abilities/common/DiesSourceTriggeredAbility.java     | 2 +-
 .../abilities/common/EntersBattlefieldTriggeredAbility.java   | 2 +-
 .../mage/abilities/common/SourcePhaseInTriggeredAbility.java  | 2 +-
 .../abilities/common/TurnedFaceUpSourceTriggeredAbility.java  | 2 +-
 Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java  | 2 +-
 .../src/main/java/mage/abilities/keyword/InspiredAbility.java | 2 +-
 .../main/java/mage/abilities/keyword/PackTacticsAbility.java  | 2 +-
 .../src/main/java/mage/abilities/meta/OrTriggeredAbility.java | 2 +-
 29 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/h/HiddenPredators.java b/Mage.Sets/src/mage/cards/h/HiddenPredators.java
index 330f9892bab..6a2027e90fe 100644
--- a/Mage.Sets/src/mage/cards/h/HiddenPredators.java
+++ b/Mage.Sets/src/mage/cards/h/HiddenPredators.java
@@ -47,7 +47,7 @@ class HiddenPredatorsStateTriggeredAbility extends StateTriggeredAbility {
 
     public HiddenPredatorsStateTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new HiddenPredatorsToken(), null, Duration.Custom));
-        this.replaceRuleText = false;
+        this.withRuleTextReplacement(false);
         setTriggerPhrase("When an opponent controls a creature with power 4 or greater, if {this} is an enchantment, ");
     }
 
diff --git a/Mage.Sets/src/mage/cards/l/LurkingJackals.java b/Mage.Sets/src/mage/cards/l/LurkingJackals.java
index a841e261389..e10149b40a0 100644
--- a/Mage.Sets/src/mage/cards/l/LurkingJackals.java
+++ b/Mage.Sets/src/mage/cards/l/LurkingJackals.java
@@ -42,7 +42,7 @@ class LurkingJackalsStateTriggeredAbility extends StateTriggeredAbility {
     public LurkingJackalsStateTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new LurkingJackalsToken(), null, Duration.Custom));
         setTriggerPhrase("When an opponent has 10 or less life, if {this} is an enchantment, ");
-        this.replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     private LurkingJackalsStateTriggeredAbility(final LurkingJackalsStateTriggeredAbility ability) {
diff --git a/Mage.Sets/src/mage/cards/o/OpalAvenger.java b/Mage.Sets/src/mage/cards/o/OpalAvenger.java
index 4979139b49b..812059959bf 100644
--- a/Mage.Sets/src/mage/cards/o/OpalAvenger.java
+++ b/Mage.Sets/src/mage/cards/o/OpalAvenger.java
@@ -39,9 +39,9 @@ public final class OpalAvenger extends CardImpl {
 
 class OpalAvengerStateTriggeredAbility extends StateTriggeredAbility {
 
-    public OpalAvengerStateTriggeredAbility() {
+    OpalAvengerStateTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new OpalAvengerToken(), null, Duration.Custom));
-        this.replaceRuleText = false;
+        this.withRuleTextReplacement(false);
         setTriggerPhrase("When you have 10 or less life, if {this} is an enchantment, ");
     }
 
diff --git a/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java b/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java
index 1672b591c39..66092e37d46 100644
--- a/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java
+++ b/Mage.Sets/src/mage/cards/v/VeiledCrocodile.java
@@ -42,7 +42,7 @@ class VeiledCrocodileStateTriggeredAbility extends StateTriggeredAbility {
 
     public VeiledCrocodileStateTriggeredAbility() {
         super(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new VeilCrocodileToken(), null, Duration.Custom));
-        this.replaceRuleText = false;
+        this.withRuleTextReplacement(false);
         setTriggerPhrase("When a player has no cards in hand, if {this} is an enchantment, ");
     }
 
diff --git a/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java b/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java
index b34a48e4217..4b660dddbb3 100644
--- a/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java
+++ b/Mage.Sets/src/mage/cards/z/ZhurTaaDruid.java
@@ -51,7 +51,7 @@ class ZhurTaaDruidAbility extends TriggeredAbilityImpl {
     ZhurTaaDruidAbility() {
         super(Zone.BATTLEFIELD, new DamagePlayersEffect(1, TargetController.OPPONENT));
         setTriggerPhrase("Whenever you tap {this} for mana, ");
-        this.replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     private ZhurTaaDruidAbility(final ZhurTaaDruidAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
index bf0b4889bda..5e967cdedd8 100644
--- a/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
+++ b/Mage/src/main/java/mage/abilities/TriggeredAbilityImpl.java
@@ -27,7 +27,7 @@ public abstract class TriggeredAbilityImpl extends AbilityImpl implements Trigge
     private boolean leavesTheBattlefieldTrigger;
     private boolean triggersOnceEachTurn = false;
     private boolean doOnlyOnceEachTurn = false;
-    protected boolean replaceRuleText = false; // if true, replace "{this}" with "it" in effect text
+    private boolean replaceRuleText = false; // if true, replace "{this}" with "it" in effect text
     private GameEvent triggerEvent = null;
     private String triggerPhrase = null;
 
diff --git a/Mage/src/main/java/mage/abilities/common/AttacksAloneSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksAloneSourceTriggeredAbility.java
index 76295c94fff..449edea9d30 100644
--- a/Mage/src/main/java/mage/abilities/common/AttacksAloneSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/AttacksAloneSourceTriggeredAbility.java
@@ -16,7 +16,7 @@ public class AttacksAloneSourceTriggeredAbility extends TriggeredAbilityImpl {
     public AttacksAloneSourceTriggeredAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect);
         setTriggerPhrase("Whenever {this} attacks alone, ");
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
     }
 
     protected AttacksAloneSourceTriggeredAbility(final AttacksAloneSourceTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/AttacksAndIsNotBlockedTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksAndIsNotBlockedTriggeredAbility.java
index 8db14e1f72c..d1f7381716d 100644
--- a/Mage/src/main/java/mage/abilities/common/AttacksAndIsNotBlockedTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/AttacksAndIsNotBlockedTriggeredAbility.java
@@ -24,7 +24,7 @@ public class AttacksAndIsNotBlockedTriggeredAbility extends TriggeredAbilityImpl
         super(Zone.BATTLEFIELD, effect, optional);
         this.setTargetPointer = setTargetPointer;
         setTriggerPhrase("Whenever {this} attacks and isn't blocked, ");
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
     }
 
     protected AttacksAndIsNotBlockedTriggeredAbility(final AttacksAndIsNotBlockedTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java
index 9f837aa7eb8..073c247ea2a 100644
--- a/Mage/src/main/java/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/AttacksOrBlocksTriggeredAbility.java
@@ -16,7 +16,7 @@ public class AttacksOrBlocksTriggeredAbility extends TriggeredAbilityImpl {
         } else {
             setTriggerPhrase("Whenever {this} attacks or blocks, ");
         }
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
     }
 
     protected AttacksOrBlocksTriggeredAbility(final AttacksOrBlocksTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java
index f12ed09e6fc..ad873b7a35c 100644
--- a/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/AttacksTriggeredAbility.java
@@ -35,7 +35,7 @@ public class AttacksTriggeredAbility extends TriggeredAbilityImpl {
         this.text = text;
         this.setTargetPointer = setTargetPointer;
         setTriggerPhrase("Whenever {this} attacks, ");
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
     }
 
     protected AttacksTriggeredAbility(final AttacksTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java
index 1756058c2fa..71f29b71529 100644
--- a/Mage/src/main/java/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/BecomesBlockedByCreatureTriggeredAbility.java
@@ -24,7 +24,7 @@ public class BecomesBlockedByCreatureTriggeredAbility extends TriggeredAbilityIm
     public BecomesBlockedByCreatureTriggeredAbility(Effect effect, FilterCreaturePermanent filter, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
         this.filter = filter;
-        this.replaceRuleText = false;
+        this.withRuleTextReplacement(false);
         setTriggerPhrase("Whenever {this} becomes blocked by " + CardUtil.addArticle(filter.getMessage()) + ", ");
     }
 
diff --git a/Mage/src/main/java/mage/abilities/common/BecomesBlockedSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesBlockedSourceTriggeredAbility.java
index aaeaa6a3954..c3426a54153 100644
--- a/Mage/src/main/java/mage/abilities/common/BecomesBlockedSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/BecomesBlockedSourceTriggeredAbility.java
@@ -22,7 +22,7 @@ public class BecomesBlockedSourceTriggeredAbility extends TriggeredAbilityImpl {
         super(Zone.BATTLEFIELD, effect, optional);
         this.setTargetPointer = setTargetPointer;
         setTriggerPhrase(getWhen() + "{this} becomes blocked, ");
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
     }
 
     protected BecomesBlockedSourceTriggeredAbility(final BecomesBlockedSourceTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/BecomesPlottedSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesPlottedSourceTriggeredAbility.java
index 568db97b8b2..c60a04de45e 100644
--- a/Mage/src/main/java/mage/abilities/common/BecomesPlottedSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/BecomesPlottedSourceTriggeredAbility.java
@@ -14,7 +14,7 @@ public class BecomesPlottedSourceTriggeredAbility extends TriggeredAbilityImpl {
     public BecomesPlottedSourceTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.EXILED, effect, optional);
         setTriggerPhrase("When {this} becomes plotted, ");
-        replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     public BecomesPlottedSourceTriggeredAbility(Effect effect) {
@@ -42,4 +42,4 @@ public class BecomesPlottedSourceTriggeredAbility extends TriggeredAbilityImpl {
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java
index 9824e66ef03..bbd66b2327f 100644
--- a/Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/BecomesTappedSourceTriggeredAbility.java
@@ -19,7 +19,7 @@ public class BecomesTappedSourceTriggeredAbility extends TriggeredAbilityImpl {
     public BecomesTappedSourceTriggeredAbility(Effect effect, boolean isOptional) {
         super(Zone.BATTLEFIELD, effect, isOptional);
         setTriggerPhrase("Whenever {this} becomes tapped, ");
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
     }
 
     protected BecomesTappedSourceTriggeredAbility(final BecomesTappedSourceTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/BecomesTargetSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BecomesTargetSourceTriggeredAbility.java
index 0b400eb3ed3..e1fcc98a772 100644
--- a/Mage/src/main/java/mage/abilities/common/BecomesTargetSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/BecomesTargetSourceTriggeredAbility.java
@@ -33,7 +33,7 @@ public class BecomesTargetSourceTriggeredAbility extends TriggeredAbilityImpl {
         this.filter = filter;
         this.setTargetPointer = setTargetPointer;
         setTriggerPhrase(getWhen() + "{this} becomes the target of " + filter.getMessage() + ", ");
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
     }
 
     protected BecomesTargetSourceTriggeredAbility(final BecomesTargetSourceTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java
index bef3b6738e7..298a0e5c4c8 100644
--- a/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility.java
@@ -32,7 +32,7 @@ public class BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility extends Triggered
     public BlocksOrBecomesBlockedByOneOrMoreTriggeredAbility(Effect effect, FilterPermanent filter, boolean optional, String rule) {
         super(Zone.BATTLEFIELD, effect, optional);
         this.filter = filter;
-        this.replaceRuleText = false;
+        this.withRuleTextReplacement(false);
         this.rule = rule;
         setTriggerPhrase("Whenever {this} blocks or becomes blocked by one or more " + (filter != null ? filter.getMessage() : "creatures") + ", ");
     }
diff --git a/Mage/src/main/java/mage/abilities/common/BlocksSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/BlocksSourceTriggeredAbility.java
index ee7962204c4..224d5a4a27d 100644
--- a/Mage/src/main/java/mage/abilities/common/BlocksSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/BlocksSourceTriggeredAbility.java
@@ -18,7 +18,7 @@ public class BlocksSourceTriggeredAbility extends TriggeredAbilityImpl {
     public BlocksSourceTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
         setTriggerPhrase("Whenever {this} blocks, ");
-        this.replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     protected BlocksSourceTriggeredAbility(final BlocksSourceTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/CycleTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/CycleTriggeredAbility.java
index cad25db019a..7144fd0a6f8 100644
--- a/Mage/src/main/java/mage/abilities/common/CycleTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/CycleTriggeredAbility.java
@@ -14,7 +14,7 @@ public class CycleTriggeredAbility extends ZoneChangeTriggeredAbility {
 
     public CycleTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.ALL, effect, "When you cycle {this}, ", optional);
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
     }
 
     public CycleTriggeredAbility(Effect effect) {
diff --git a/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
index 54c26399e82..a7f7adbb43a 100644
--- a/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/DealsCombatDamageToAPlayerTriggeredAbility.java
@@ -23,7 +23,7 @@ public class DealsCombatDamageToAPlayerTriggeredAbility extends TriggeredAbility
         super(Zone.BATTLEFIELD, effect, optional);
         this.setTargetPointer = setTargetPointer;
         setTriggerPhrase(getWhen() + "{this} deals combat damage to a player, ");
-        this.replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     protected DealsCombatDamageToAPlayerTriggeredAbility(final DealsCombatDamageToAPlayerTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/DealsCombatDamageTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsCombatDamageTriggeredAbility.java
index ea1be8fa952..5d85fbe626a 100644
--- a/Mage/src/main/java/mage/abilities/common/DealsCombatDamageTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/DealsCombatDamageTriggeredAbility.java
@@ -20,7 +20,7 @@ public class DealsCombatDamageTriggeredAbility extends TriggeredAbilityImpl {
     public DealsCombatDamageTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
         setTriggerPhrase(getWhen() + "{this} deals combat damage, ");
-        this.replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     protected DealsCombatDamageTriggeredAbility(final DealsCombatDamageTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java
index 550084127be..28def61a738 100644
--- a/Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/DealtDamageToSourceTriggeredAbility.java
@@ -23,7 +23,7 @@ public class DealtDamageToSourceTriggeredAbility extends TriggeredAbilityImpl {
             this.setAbilityWord(AbilityWord.ENRAGE);
         }
         setTriggerPhrase("Whenever {this} is dealt damage, ");
-        this.replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     protected DealtDamageToSourceTriggeredAbility(final DealtDamageToSourceTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/DiesSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DiesSourceTriggeredAbility.java
index 98bbd454eb2..790e94ae41e 100644
--- a/Mage/src/main/java/mage/abilities/common/DiesSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/DiesSourceTriggeredAbility.java
@@ -15,7 +15,7 @@ public class DiesSourceTriggeredAbility extends ZoneChangeTriggeredAbility {
 
     public DiesSourceTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, Zone.GRAVEYARD, effect, "When {this} dies, ", optional);
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
     }
 
     public DiesSourceTriggeredAbility(Effect effect) {
diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTriggeredAbility.java
index 4177879a831..a601cb79ff1 100644
--- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldTriggeredAbility.java
@@ -17,7 +17,7 @@ public class EntersBattlefieldTriggeredAbility extends TriggeredAbilityImpl {
 
     public EntersBattlefieldTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.ALL, effect, optional); // Zone.All because a creature with trigger can be put into play and be sacrificed during the resolution of an effect (discard Obstinate Baloth with Smallpox)
-        this.replaceRuleText = true; // default true to replace "{this}" with "it"
+        this.withRuleTextReplacement(true); // default true to replace "{this}" with "it"
         setTriggerPhrase("When {this} enters the battlefield, ");
     }
 
diff --git a/Mage/src/main/java/mage/abilities/common/SourcePhaseInTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/SourcePhaseInTriggeredAbility.java
index 73b2e536e4d..45c9ebb62bb 100644
--- a/Mage/src/main/java/mage/abilities/common/SourcePhaseInTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/SourcePhaseInTriggeredAbility.java
@@ -14,7 +14,7 @@ public class SourcePhaseInTriggeredAbility extends TriggeredAbilityImpl {
     public SourcePhaseInTriggeredAbility(Effect effect, boolean optional) {
         super(Zone.BATTLEFIELD, effect, optional);
         setTriggerPhrase("Whenever {this} phases in, ");
-        this.replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     protected SourcePhaseInTriggeredAbility(final SourcePhaseInTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java
index 235ccbfc870..efa38462d9f 100644
--- a/Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java
@@ -29,7 +29,7 @@ public class TurnedFaceUpSourceTriggeredAbility extends TriggeredAbilityImpl {
         this.setWorksFaceDown(true);
         this.setTargetPointer = setTargetPointer;
         setTriggerPhrase("When {this} is turned face up, ");
-        this.replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     protected TurnedFaceUpSourceTriggeredAbility(final TurnedFaceUpSourceTriggeredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java b/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java
index a7e22c11e43..b9d4c155501 100644
--- a/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/HeroicAbility.java
@@ -34,7 +34,7 @@ public class HeroicAbility extends TriggeredAbilityImpl {
         if (isHeroic) {
             this.setAbilityWord(AbilityWord.HEROIC);
         }
-        this.replaceRuleText = false;
+        this.withRuleTextReplacement(false);
         setTriggerPhrase("Whenever you cast a spell that targets {this}, ");
     }
 
diff --git a/Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java b/Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java
index 38711040a63..69404586aab 100644
--- a/Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/InspiredAbility.java
@@ -28,7 +28,7 @@ public class InspiredAbility extends TriggeredAbilityImpl {
             setAbilityWord(AbilityWord.INSPIRED);
         }
         setTriggerPhrase("Whenever {this} becomes untapped, ");
-        this.replaceRuleText = true;
+        this.withRuleTextReplacement(true);
     }
 
     protected InspiredAbility(final InspiredAbility ability) {
diff --git a/Mage/src/main/java/mage/abilities/keyword/PackTacticsAbility.java b/Mage/src/main/java/mage/abilities/keyword/PackTacticsAbility.java
index d942fe0229f..11747b82e7e 100644
--- a/Mage/src/main/java/mage/abilities/keyword/PackTacticsAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/PackTacticsAbility.java
@@ -17,7 +17,7 @@ public class PackTacticsAbility extends TriggeredAbilityImpl {
 
     public PackTacticsAbility(Effect effect) {
         super(Zone.BATTLEFIELD, effect, false);
-        this.replaceRuleText = false;
+        this.withRuleTextReplacement(false);
         this.setAbilityWord(AbilityWord.PACK_TACTICS);
         setTriggerPhrase("Whenever {this} attacks, if you attacked with creatures with total power 6 or greater this combat, ");
     }
diff --git a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java
index 22967dc7d91..c4128665c58 100644
--- a/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/meta/OrTriggeredAbility.java
@@ -37,7 +37,7 @@ public class OrTriggeredAbility extends TriggeredAbilityImpl {
     public OrTriggeredAbility(Zone zone, Effect effect, boolean optional, String ruleTrigger, TriggeredAbility... abilities) {
         super(zone, effect, optional);
         this.ruleTrigger = ruleTrigger;
-        this.replaceRuleText = false;
+        this.withRuleTextReplacement(false);
         Collections.addAll(this.triggeredAbilities, abilities);
         for (TriggeredAbility ability : triggeredAbilities) {
             //Remove useless data