From 27b0bc107c5eae1b6f74ae4972e7c1543eef0a47 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Wed, 7 Oct 2020 19:16:41 +0800
Subject: [PATCH] Generate getters for trait methods

---
 .../citizensnpcs/commands/AdminCommands.java  |  6 +---
 .../main/java/net/citizensnpcs/trait/Age.java |  4 +++
 .../citizensnpcs/trait/ArmorStandTrait.java   | 24 ++++++++++++++++
 .../net/citizensnpcs/trait/CommandTrait.java  |  4 +++
 .../net/citizensnpcs/trait/EndermanTrait.java |  4 +++
 .../net/citizensnpcs/trait/FollowTrait.java   |  4 +++
 .../net/citizensnpcs/trait/GameModeTrait.java |  6 +++-
 .../net/citizensnpcs/trait/HologramTrait.java |  8 ++++++
 .../net/citizensnpcs/trait/LookClose.java     | 28 +++++++++++++++++++
 .../net/citizensnpcs/trait/MountTrait.java    |  4 +++
 .../net/citizensnpcs/trait/RabbitType.java    |  4 +++
 .../java/net/citizensnpcs/trait/Saddle.java   |  4 +++
 .../citizensnpcs/trait/ScoreboardTrait.java   |  8 ++++++
 .../net/citizensnpcs/trait/SheepTrait.java    |  8 ++++++
 .../net/citizensnpcs/trait/SlimeSize.java     |  4 +++
 .../trait/VillagerProfession.java             |  4 +++
 .../net/citizensnpcs/trait/WoolColor.java     |  4 +++
 .../trait/versioned/BossBarTrait.java         | 20 +++++++++++++
 .../trait/versioned/FoxTrait.java             | 16 +++++++++++
 .../trait/versioned/LlamaTrait.java           |  8 ++++++
 .../trait/versioned/MushroomCowTrait.java     |  4 +++
 .../trait/versioned/PandaTrait.java           | 16 +++++++++++
 .../trait/versioned/ParrotTrait.java          |  4 +++
 .../trait/versioned/PhantomTrait.java         |  4 +++
 .../trait/versioned/ShulkerTrait.java         |  8 ++++++
 .../trait/versioned/SnowmanTrait.java         |  8 ++++++
 .../trait/versioned/TropicalFishTrait.java    | 12 ++++++++
 .../trait/versioned/VillagerTrait.java        |  8 ++++++
 28 files changed, 230 insertions(+), 6 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/commands/AdminCommands.java b/main/src/main/java/net/citizensnpcs/commands/AdminCommands.java
index 6a590d0f9..d0f02e8af 100644
--- a/main/src/main/java/net/citizensnpcs/commands/AdminCommands.java
+++ b/main/src/main/java/net/citizensnpcs/commands/AdminCommands.java
@@ -1,11 +1,8 @@
 package net.citizensnpcs.commands;
 
 import org.bukkit.command.CommandSender;
-import org.bukkit.scoreboard.Scoreboard;
-import org.bukkit.scoreboard.Team;
 
 import net.citizensnpcs.Citizens;
-import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.command.Command;
 import net.citizensnpcs.api.command.CommandContext;
 import net.citizensnpcs.api.command.Requirements;
@@ -15,7 +12,6 @@ import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.util.Messaging;
 import net.citizensnpcs.util.Messages;
 import net.citizensnpcs.util.StringHelper;
-import net.citizensnpcs.util.Util;
 
 @Requirements
 public class AdminCommands {
@@ -31,7 +27,7 @@ public class AdminCommands {
         Messaging.send(sender, "     <7>-- <c>Author: fullwall");
         Messaging.send(sender, "     <7>-- <c>Source Code: http://github.com/CitizensDev");
         Messaging.send(sender, "     <7>-- <c>Website: " + plugin.getDescription().getWebsite());
-        Messaging.send(sender, "     <7>-- <c>Report an issue: http://github.com/CitizensDev/Citizens2/issues"); 
+        Messaging.send(sender, "     <7>-- <c>Report an issue: http://github.com/CitizensDev/Citizens2/issues");
     }
 
     @Command(
diff --git a/main/src/main/java/net/citizensnpcs/trait/Age.java b/main/src/main/java/net/citizensnpcs/trait/Age.java
index 12880588f..6825403fe 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Age.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Age.java
@@ -34,6 +34,10 @@ public class Age extends Trait implements Toggleable {
         Messaging.sendTr(sender, Messages.AGE_TRAIT_DESCRIPTION, npc.getName(), age, locked);
     }
 
+    public int getAge() {
+        return age;
+    }
+
     private boolean isAgeable() {
         return ageable != null;
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java b/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java
index ad77e53cc..4719772af 100644
--- a/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/ArmorStandTrait.java
@@ -41,6 +41,30 @@ public class ArmorStandTrait extends Trait {
         super("armorstandtrait");
     }
 
+    public boolean getGravity() {
+        return gravity;
+    }
+
+    public boolean getHasArms() {
+        return hasarms;
+    }
+
+    public boolean getHasBaseplate() {
+        return hasbaseplate;
+    }
+
+    public boolean isMarker() {
+        return marker;
+    }
+
+    public boolean isSmall() {
+        return small;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
     @Override
     public void onSpawn() {
         if (npc.getEntity() instanceof ArmorStand) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
index e21537a1a..76e42ecbf 100644
--- a/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/CommandTrait.java
@@ -217,6 +217,10 @@ public class CommandTrait extends Trait {
         }
     }
 
+    public double getCost() {
+        return cost;
+    }
+
     public ExecutionMode getExecutionMode() {
         return executionMode;
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/EndermanTrait.java b/main/src/main/java/net/citizensnpcs/trait/EndermanTrait.java
index 17b0493a2..5cbe2f228 100644
--- a/main/src/main/java/net/citizensnpcs/trait/EndermanTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/EndermanTrait.java
@@ -19,6 +19,10 @@ public class EndermanTrait extends Trait {
         super("endermantrait");
     }
 
+    public boolean isAngry() {
+        return angry;
+    }
+
     @Override
     public void run() {
         if (npc.getEntity() instanceof Enderman) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java b/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
index d7dfb8a0e..4d3684b7d 100644
--- a/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/FollowTrait.java
@@ -31,6 +31,10 @@ public class FollowTrait extends Trait {
         super("followtrait");
     }
 
+    public Player getFollowingPlayer() {
+        return player;
+    }
+
     /**
      * Returns whether the trait is actively following a {@link Player}.
      */
diff --git a/main/src/main/java/net/citizensnpcs/trait/GameModeTrait.java b/main/src/main/java/net/citizensnpcs/trait/GameModeTrait.java
index 7174eee7e..0bb17be61 100644
--- a/main/src/main/java/net/citizensnpcs/trait/GameModeTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/GameModeTrait.java
@@ -9,7 +9,7 @@ import net.citizensnpcs.api.trait.TraitName;
 
 /**
  * Persists the {@link GameMode} of a {@link Player} NPC.
- * 
+ *
  * @see Player#setGameMode(GameMode)
  */
 @TraitName("gamemodetrait")
@@ -21,6 +21,10 @@ public class GameModeTrait extends Trait {
         super("gamemodetrait");
     }
 
+    public GameMode getGameMode() {
+        return mode;
+    }
+
     @Override
     public void run() {
         if (npc.isSpawned() && npc.getEntity() instanceof Player && mode != null) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
index 28913bde9..a75690c44 100644
--- a/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/HologramTrait.java
@@ -67,6 +67,10 @@ public class HologramTrait extends Trait {
         return hologramNPC;
     }
 
+    public HologramDirection getDirection() {
+        return direction;
+    }
+
     private double getEntityHeight() {
         return NMS.getHeight(npc.getEntity());
     }
@@ -75,6 +79,10 @@ public class HologramTrait extends Trait {
         return (lineHeight == -1 ? Setting.DEFAULT_NPC_HOLOGRAM_LINE_HEIGHT.asDouble() : lineHeight) * (lineNumber + 1);
     }
 
+    public double getLineHeight() {
+        return lineHeight;
+    }
+
     public List<String> getLines() {
         return lines;
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/LookClose.java b/main/src/main/java/net/citizensnpcs/trait/LookClose.java
index bd2920100..fcf3aae1f 100644
--- a/main/src/main/java/net/citizensnpcs/trait/LookClose.java
+++ b/main/src/main/java/net/citizensnpcs/trait/LookClose.java
@@ -96,6 +96,26 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
         }
     }
 
+    public int getRandomLookDelay() {
+        return randomLookDelay;
+    }
+
+    public float[] getRandomLookPitchRange() {
+        return randomPitchRange;
+    }
+
+    public float[] getRandomLookYawRange() {
+        return randomYawRange;
+    }
+
+    public double getRange() {
+        return range;
+    }
+
+    public Player getTarget() {
+        return lookingAt;
+    }
+
     private boolean hasInvalidTarget() {
         if (lookingAt == null)
             return true;
@@ -119,6 +139,10 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
         return false;
     }
 
+    public boolean isRandomLook() {
+        return enableRandomLook;
+    }
+
     @Override
     public void load(DataKey key) {
         range = key.getDouble("range");
@@ -225,6 +249,10 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
         return "LookClose{" + enabled + "}";
     }
 
+    public boolean useRealisticLooking() {
+        return realisticLooking;
+    }
+
     private static final Location CACHE_LOCATION = new Location(null, 0, 0, 0);
     private static final Location CACHE_LOCATION2 = new Location(null, 0, 0, 0);
     private static final Location NPC_LOCATION = new Location(null, 0, 0, 0);
diff --git a/main/src/main/java/net/citizensnpcs/trait/MountTrait.java b/main/src/main/java/net/citizensnpcs/trait/MountTrait.java
index 1e65fe691..72823d57d 100644
--- a/main/src/main/java/net/citizensnpcs/trait/MountTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/MountTrait.java
@@ -36,6 +36,10 @@ public class MountTrait extends Trait {
         }
     }
 
+    public UUID getMountedOn() {
+        return mountedOn;
+    }
+
     @Override
     public void onDespawn() {
         Entity e = NMS.getVehicle(npc.getEntity());
diff --git a/main/src/main/java/net/citizensnpcs/trait/RabbitType.java b/main/src/main/java/net/citizensnpcs/trait/RabbitType.java
index 505696bad..189c23265 100644
--- a/main/src/main/java/net/citizensnpcs/trait/RabbitType.java
+++ b/main/src/main/java/net/citizensnpcs/trait/RabbitType.java
@@ -21,6 +21,10 @@ public class RabbitType extends Trait {
         super("rabbittype");
     }
 
+    public Rabbit.Type getRabbitType() {
+        return type;
+    }
+
     @Override
     public void onSpawn() {
         rabbit = npc.getEntity() instanceof Rabbit ? (Rabbit) npc.getEntity() : null;
diff --git a/main/src/main/java/net/citizensnpcs/trait/Saddle.java b/main/src/main/java/net/citizensnpcs/trait/Saddle.java
index 60d550913..7ae7ac90c 100644
--- a/main/src/main/java/net/citizensnpcs/trait/Saddle.java
+++ b/main/src/main/java/net/citizensnpcs/trait/Saddle.java
@@ -51,4 +51,8 @@ public class Saddle extends Trait implements Toggleable {
     public String toString() {
         return "Saddle{" + saddle + "}";
     }
+
+    public boolean useSaddle() {
+        return saddle;
+    }
 }
\ No newline at end of file
diff --git a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
index 6a0dbf525..f13a0cf8f 100644
--- a/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/ScoreboardTrait.java
@@ -93,6 +93,14 @@ public class ScoreboardTrait extends Trait {
         Util.sendTeamPacketToOnlinePlayers(team, 2);
     }
 
+    public ChatColor getColor() {
+        return color;
+    }
+
+    public Set<String> getTags() {
+        return tags;
+    }
+
     public void removeTag(String tag) {
         tags.remove(tag);
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/SheepTrait.java b/main/src/main/java/net/citizensnpcs/trait/SheepTrait.java
index a4dd0820b..4bf940605 100644
--- a/main/src/main/java/net/citizensnpcs/trait/SheepTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/SheepTrait.java
@@ -24,6 +24,14 @@ public class SheepTrait extends Trait {
         super("sheeptrait");
     }
 
+    public DyeColor getColor() {
+        return color;
+    }
+
+    public boolean isSheared() {
+        return sheared;
+    }
+
     @EventHandler
     private void onPlayerShearEntityEvent(PlayerShearEntityEvent event) {
         if (npc != null && npc.equals(CitizensAPI.getNPCRegistry().getNPC(event.getEntity()))) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/SlimeSize.java b/main/src/main/java/net/citizensnpcs/trait/SlimeSize.java
index 51a7f747a..4b9a30b9c 100644
--- a/main/src/main/java/net/citizensnpcs/trait/SlimeSize.java
+++ b/main/src/main/java/net/citizensnpcs/trait/SlimeSize.java
@@ -28,6 +28,10 @@ public class SlimeSize extends Trait {
         Messaging.sendTr(sender, Messages.SIZE_DESCRIPTION, npc.getName(), size);
     }
 
+    public int getSize() {
+        return size;
+    }
+
     @Override
     public void onSpawn() {
         if (!(npc.getEntity() instanceof Slime)) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java b/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java
index 0f8e0dff6..99278dff1 100644
--- a/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java
+++ b/main/src/main/java/net/citizensnpcs/trait/VillagerProfession.java
@@ -22,6 +22,10 @@ public class VillagerProfession extends Trait {
         super("profession");
     }
 
+    public Profession getProfession() {
+        return profession;
+    }
+
     @Override
     public void load(DataKey key) throws NPCLoadException {
         try {
diff --git a/main/src/main/java/net/citizensnpcs/trait/WoolColor.java b/main/src/main/java/net/citizensnpcs/trait/WoolColor.java
index 76ce9a5ad..ffc704d66 100644
--- a/main/src/main/java/net/citizensnpcs/trait/WoolColor.java
+++ b/main/src/main/java/net/citizensnpcs/trait/WoolColor.java
@@ -25,6 +25,10 @@ public class WoolColor extends Trait {
         super("woolcolor");
     }
 
+    public DyeColor getColor() {
+        return color;
+    }
+
     @Override
     public void load(DataKey key) throws NPCLoadException {
         try {
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/BossBarTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/BossBarTrait.java
index e1e6c1ae3..263b6b98c 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/BossBarTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/BossBarTrait.java
@@ -31,11 +31,27 @@ public class BossBarTrait extends Trait {
         super("bossbar");
     }
 
+    public BarColor getColor() {
+        return color;
+    }
+
+    public List<BarFlag> getFlags() {
+        return flags;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
     private boolean isBoss(Entity entity) {
         return entity.getType() == EntityType.ENDER_DRAGON || entity.getType() == EntityType.WITHER
                 || entity.getType() == EntityType.GUARDIAN;
     }
 
+    public boolean isVisible() {
+        return visible;
+    }
+
     @Override
     public void run() {
         if (!npc.isSpawned() || !isBoss(npc.getEntity()))
@@ -67,6 +83,10 @@ public class BossBarTrait extends Trait {
         this.flags = Lists.newArrayList(flags);
     }
 
+    public void setFlags(List<BarFlag> flags) {
+        this.flags = flags;
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java
index f6dea64ee..caef8c682 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/FoxTrait.java
@@ -21,6 +21,22 @@ public class FoxTrait extends Trait {
         super("foxtrait");
     }
 
+    public Fox.Type getType() {
+        return type;
+    }
+
+    public boolean isCrouching() {
+        return crouching;
+    }
+
+    public boolean isSitting() {
+        return sitting;
+    }
+
+    public boolean isSleeping() {
+        return sleeping;
+    }
+
     @Override
     public void run() {
         if (npc.isSpawned() && npc.getEntity() instanceof Fox) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/LlamaTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/LlamaTrait.java
index 6f496b623..414e9415a 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/LlamaTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/LlamaTrait.java
@@ -18,6 +18,14 @@ public class LlamaTrait extends Trait {
         super("llamatrait");
     }
 
+    public Color getColor() {
+        return color;
+    }
+
+    public int getStrength() {
+        return strength;
+    }
+
     @Override
     public void run() {
         if (npc.isSpawned() && npc.getEntity() instanceof Llama) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/MushroomCowTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/MushroomCowTrait.java
index 21baa590f..cde400b15 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/MushroomCowTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/MushroomCowTrait.java
@@ -16,6 +16,10 @@ public class MushroomCowTrait extends Trait {
         super("mushroomcowtrait");
     }
 
+    public Variant getVariant() {
+        return variant;
+    }
+
     @Override
     public void onSpawn() {
         setVariant(variant);
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/PandaTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/PandaTrait.java
index eb39f4c0d..c65169a20 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/PandaTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/PandaTrait.java
@@ -20,6 +20,18 @@ public class PandaTrait extends Trait {
         super("pandatrait");
     }
 
+    public Panda.Gene getHiddenGene() {
+        return hiddenGene;
+    }
+
+    public Panda.Gene getMainGene() {
+        return mainGene;
+    }
+
+    public boolean isSitting() {
+        return sitting;
+    }
+
     @Override
     public void run() {
         if (npc.isSpawned() && npc.getEntity() instanceof Panda) {
@@ -40,6 +52,10 @@ public class PandaTrait extends Trait {
         this.mainGene = gene;
     }
 
+    public void setSitting(boolean sitting) {
+        this.sitting = sitting;
+    }
+
     public boolean toggleSitting() {
         return sitting = !sitting;
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/ParrotTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/ParrotTrait.java
index 33f3f0dcd..562b2b403 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/ParrotTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/ParrotTrait.java
@@ -16,6 +16,10 @@ public class ParrotTrait extends Trait {
         super("parrottrait");
     }
 
+    public Variant getVariant() {
+        return variant;
+    }
+
     @Override
     public void run() {
         if (npc.isSpawned() && npc.getEntity() instanceof Parrot) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/PhantomTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/PhantomTrait.java
index dd99a132c..c15060d2e 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/PhantomTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/PhantomTrait.java
@@ -15,6 +15,10 @@ public class PhantomTrait extends Trait {
         super("phantomtrait");
     }
 
+    public int getSize() {
+        return size;
+    }
+
     @Override
     public void run() {
         if (npc.isSpawned() && npc.getEntity() instanceof Phantom) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java
index eeb7a4eed..933d469cf 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/ShulkerTrait.java
@@ -20,6 +20,14 @@ public class ShulkerTrait extends Trait {
         super("shulkertrait");
     }
 
+    public DyeColor getColor() {
+        return color;
+    }
+
+    public int getPeek() {
+        return peek;
+    }
+
     @Override
     public void onSpawn() {
         setPeek(peek);
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/SnowmanTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/SnowmanTrait.java
index 0ee5141e5..aa33c767a 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/SnowmanTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/SnowmanTrait.java
@@ -15,6 +15,10 @@ public class SnowmanTrait extends Trait {
         super("snowmantrait");
     }
 
+    public boolean isDerp() {
+        return derp;
+    }
+
     @Override
     public void run() {
         if (npc.getEntity() instanceof Snowman) {
@@ -22,6 +26,10 @@ public class SnowmanTrait extends Trait {
         }
     }
 
+    public void setDerp(boolean derp) {
+        this.derp = derp;
+    }
+
     public boolean toggleDerp() {
         return this.derp = !this.derp;
     }
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/TropicalFishTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/TropicalFishTrait.java
index 76701021a..b6a060f43 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/TropicalFishTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/TropicalFishTrait.java
@@ -21,6 +21,18 @@ public class TropicalFishTrait extends Trait {
         super("tropicalfishtrait");
     }
 
+    public DyeColor getBodyColor() {
+        return bodyColor;
+    }
+
+    public Pattern getPattern() {
+        return pattern;
+    }
+
+    public DyeColor getPatternColor() {
+        return patternColor;
+    }
+
     @Override
     public void run() {
         if (npc.isSpawned() && npc.getEntity() instanceof TropicalFish) {
diff --git a/main/src/main/java/net/citizensnpcs/trait/versioned/VillagerTrait.java b/main/src/main/java/net/citizensnpcs/trait/versioned/VillagerTrait.java
index a44ac808b..57ccc838a 100644
--- a/main/src/main/java/net/citizensnpcs/trait/versioned/VillagerTrait.java
+++ b/main/src/main/java/net/citizensnpcs/trait/versioned/VillagerTrait.java
@@ -17,6 +17,14 @@ public class VillagerTrait extends Trait {
         super("villagertrait");
     }
 
+    public int getLevel() {
+        return level;
+    }
+
+    public Villager.Type getType() {
+        return type;
+    }
+
     @Override
     public void run() {
         if (!(npc.getEntity() instanceof Villager))