From b50c6c07dfc15628bfb629a3bc14b1f7c04f87bb Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 3 Apr 2022 19:37:50 +1200 Subject: [PATCH 1/3] Add a note to ignore --- .../libraryaddict/disguise/utilities/parser/DisguiseParser.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java index c01d7dc1..e9c1a845 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java @@ -681,6 +681,8 @@ public class DisguiseParser { Entry customDisguise = DisguiseConfig.getRawCustomDisguise(args[0]); if (customDisguise != null) { + // TODO Doesn't this mean we can't add args to our custom disguise on /disguise? + // Need to add user defined args for the custom disguise args = DisguiseUtilities.split(customDisguise.getValue()); name = customDisguise.getKey().toReadable(); customName = true; From 1b33b03c907c0ed1e52aa229b3ccb073d7f0191c Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 6 May 2022 22:31:52 +1200 Subject: [PATCH 2/3] Hide setHiddenGene from command --- .../disguise/disguisetypes/watchers/PandaWatcher.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java index c3cdada4..e05bce4f 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java @@ -4,6 +4,7 @@ import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.utilities.parser.RandomDefaultValue; +import me.libraryaddict.disguise.utilities.reflection.annotations.MethodOnlyUsedBy; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import org.bukkit.entity.Panda; @@ -59,6 +60,7 @@ public class PandaWatcher extends AgeableWatcher { } @RandomDefaultValue + @MethodOnlyUsedBy(value = {}) // Hide from command public void setHiddenGene(Panda.Gene gene) { setData(MetaIndex.PANDA_HIDDEN_GENE, (byte) gene.ordinal()); sendData(MetaIndex.PANDA_HIDDEN_GENE); From cc86e130ea24468282475e5bdc32080a592cdede Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 6 May 2022 23:06:36 +1200 Subject: [PATCH 3/3] Hide setMainGene, add setGene instead. --- .../disguisetypes/watchers/PandaWatcher.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java index e05bce4f..8d5ed411 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java @@ -20,11 +20,22 @@ public class PandaWatcher extends AgeableWatcher { super(disguise); if (DisguiseConfig.isRandomDisguises()) { + // We don't do 'setGene' here so it's just as random as it would be as if it was natural. setMainGene(Panda.Gene.values()[new Random().nextInt(Panda.Gene.values().length)]); setHiddenGene(Panda.Gene.values()[new Random().nextInt(Panda.Gene.values().length)]); } } + public Panda.Gene getGene() { + return getMainGene(); + } + + @RandomDefaultValue + public void setGene(Panda.Gene gene) { + setMainGene(gene); + setHiddenGene(gene); + } + public Panda.Gene getMainGene() { int id = getData(MetaIndex.PANDA_MAIN_GENE); @@ -39,7 +50,7 @@ public class PandaWatcher extends AgeableWatcher { return Panda.Gene.NORMAL; } - @RandomDefaultValue + @MethodOnlyUsedBy(value = {}) // Hide from command public void setMainGene(Panda.Gene gene) { setData(MetaIndex.PANDA_MAIN_GENE, (byte) gene.ordinal()); sendData(MetaIndex.PANDA_MAIN_GENE); @@ -59,7 +70,6 @@ public class PandaWatcher extends AgeableWatcher { return Panda.Gene.NORMAL; } - @RandomDefaultValue @MethodOnlyUsedBy(value = {}) // Hide from command public void setHiddenGene(Panda.Gene gene) { setData(MetaIndex.PANDA_HIDDEN_GENE, (byte) gene.ordinal());