Refactoring deprecated method

CitizensDev · Jun 25, 2020 · d741407 · d741407
1 parent 7c07d9d
commit d741407
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/net/citizensnpcs/api/ai/speech/SimpleSpeechController.java b/src/main/java/net/citizensnpcs/api/ai/speech/SimpleSpeechController.java
@@ -1,12 +1,12 @@
 package net.citizensnpcs.api.ai.speech;
 
+import org.bukkit.Bukkit;
+
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.ai.speech.event.NPCSpeechEvent;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.trait.trait.Speech;
 
-import org.bukkit.Bukkit;
-
 /**
  * Simple implementation of {@link SpeechController} which allows a NPC to speak with any registered {@link VocalChord}.
  * 
@@ -20,7 +20,7 @@ public SimpleSpeechController(NPC npc) {
 
     @Override
     public void speak(SpeechContext context) {
-        speak(context, npc.getTrait(Speech.class).getDefaultVocalChord());
+        speak(context, npc.getOrAddTrait(Speech.class).getDefaultVocalChord());
     }
 
     @Override

diff --git a/src/main/java/net/citizensnpcs/api/command/RequirementsProcessor.java b/src/main/java/net/citizensnpcs/api/command/RequirementsProcessor.java
@@ -47,7 +47,7 @@ public void process(CommandSender sender, CommandContext context, Annotation ins
         }
 
         if (requirements.ownership() && npc != null && !sender.hasPermission("citizens.admin")
-                && !npc.getTrait(Owner.class).isOwnedBy(sender)) {
+                && !npc.getOrAddTrait(Owner.class).isOwnedBy(sender)) {
             throw new RequirementMissingException(Messaging.tr(CommandMessages.MUST_BE_OWNER));
         }
 
@@ -67,7 +67,7 @@ public void process(CommandSender sender, CommandContext context, Annotation ins
         }
         types.removeAll(Sets.newHashSet(requirements.excludedTypes()));
 
-        EntityType type = npc.getTrait(MobType.class).getType();
+        EntityType type = npc.getOrAddTrait(MobType.class).getType();
         if (!types.contains(type)) {
             throw new RequirementMissingException(Messaging.tr(CommandMessages.REQUIREMENTS_INVALID_MOB_TYPE,
                     type.name().toLowerCase().replace('_', ' ')));

diff --git a/src/main/java/net/citizensnpcs/api/trait/trait/Inventory.java b/src/main/java/net/citizensnpcs/api/trait/trait/Inventory.java
@@ -61,7 +61,7 @@ public void inventoryCloseEvent(InventoryCloseEvent event) {
         for (int i = 0; i < contents.length; i++) {
             this.contents[i] = contents[i];
             if (i == 0) {
-                npc.getTrait(Equipment.class).setItemInHand(contents[i]);
+                npc.getOrAddTrait(Equipment.class).setItemInHand(contents[i]);
             }
         }
         if (npc.getEntity() instanceof InventoryHolder) {
@@ -164,7 +164,7 @@ private void saveContents(Entity entity) {
             contents = ((InventoryHolder) entity).getInventory().getContents();
         }
         if (entity instanceof Player) {
-            npc.getTrait(Equipment.class).setItemInHand(contents[0]);
+            npc.getOrAddTrait(Equipment.class).setItemInHand(contents[0]);
         }
     }
 
@@ -230,7 +230,7 @@ public void setItem(int slot, ItemStack item) {
             throw new IndexOutOfBoundsException();
         }
         if (slot == 0) {
-            npc.getTrait(Equipment.class).setItemInHand(item);
+            npc.getOrAddTrait(Equipment.class).setItemInHand(item);
         }
     }
 

diff --git a/src/main/java/net/citizensnpcs/api/util/Placeholders.java b/src/main/java/net/citizensnpcs/api/util/Placeholders.java
@@ -17,7 +17,7 @@ public static String replace(String text, CommandSender sender, NPC npc) {
         if (npc == null) {
             return text;
         }
-        text = text.replace("<owner>", npc.getTrait(Owner.class).getOwner());
+        text = text.replace("<owner>", npc.getOrAddTrait(Owner.class).getOwner());
         text = text.replace("<npc>", npc.getName());
         text = text.replace("<id>", Integer.toString(npc.getId()));
         return text;