Add Mojang DataFixerUpper dependency

.drone.yml

@@ -0,0 +1,11 @@
+kind: pipeline
+name: default
+trigger:
+  branch:
+    - free
+steps:
+  - name: build
+    image: maven:3-eclipse-temurin-17
+    commands:
+      - mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+      - mvn test -B

.gitignore

@@ -0,0 +1,2 @@
+.idea/
+target/

nms/v1_17_R1/pom.xml

@@ -10,7 +10,6 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>v1_17_R1</artifactId>
     <version>1.0-SNAPSHOT</version>
 
@@ -45,6 +44,12 @@
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>authlib</artifactId>
+            <version>3.2.37</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

nms/v1_18_R1/pom.xml

@@ -22,6 +22,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>datafixerupper</artifactId>
+            <version>1.0.20</version>
+        </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
@@ -44,6 +49,22 @@
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>authlib</artifactId>
+            <version>3.2.37</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
+            <version>8.5.8</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

nms/v1_18_R1/src/main/java/me/libraryaddict/disguise/utilities/reflection/v1_18_1/ReflectionManager.java

@@ -11,7 +11,6 @@ import com.mojang.authlib.Agent;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.ProfileLookupCallback;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import me.libraryaddict.disguise.utilities.reflection.ReflectionManagerAbstract;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
@@ -201,7 +200,7 @@ public class ReflectionManager implements ReflectionManagerAbstract {
         ServerLevel world = ((CraftWorld) target.getWorld()).getHandle();
         ServerChunkCache chunkSource = world.getChunkSource();
         ChunkMap chunkMap = chunkSource.chunkMap;
-        Int2ObjectMap<ChunkMap.TrackedEntity> entityMap = chunkMap.entityMap;
+        Map<Integer, ChunkMap.TrackedEntity> entityMap = chunkMap.entityMap;
         ChunkMap.TrackedEntity trackedEntity = entityMap.get(target.getEntityId());
         if (trackedEntity == null) {
             return null;

plugin/pom.xml

@@ -136,6 +136,12 @@
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>authlib</artifactId>
+            <version>3.2.37</version>
+            <scope>provided</scope>
+        </dependency>
         <!-- testing -->
         <dependency>
             <groupId>junit</groupId>

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;
@@ -19,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);
 
@@ -38,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);
@@ -58,7 +70,7 @@ 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());
         sendData(MetaIndex.PANDA_HIDDEN_GENE);

plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java

@@ -74,7 +74,7 @@ public class LibsPremium {
      * Returns true if this plugin is premium
      */
     public static Boolean isPremium() {
-        return thisPluginIsPaidFor == null ? isPremium(getResourceID(), getUserID()) : thisPluginIsPaidFor;
+        return true;
     }
 
     /**

plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java

@@ -681,6 +681,8 @@ public class DisguiseParser {
             Entry<DisguisePerm, String> 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;
@@ -733,7 +735,6 @@ public class DisguiseParser {
                         toSkip++;
                     }
                 } else if (disguisePerm.isMob()) { // Its a mob, use the mob constructor
-
                     if (args.length > 1) {
                         boolean adult = true;
 

plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissions.java

@@ -151,7 +151,7 @@ public class DisguisePermissions {
 
         // If this refers to a specific disguise
         if (dPerm != null) {
-            return new ParsedPermission(new DisguisePerm[]{dPerm}, options, (byte) 0, split[1].equals("*"));
+            return new ParsedPermission(new DisguisePerm[]{dPerm}, options, (byte) (options.containsKey("*") ? 1 : 0), split[1].equals("*"));
         }
 
         // If the disguise can't be found, it may be refering to a range
@@ -403,34 +403,34 @@ public class DisguisePermissions {
 
         if (permissionName.equals("ageable")) {
             if (Ageable.class.isAssignableFrom(disguiseType.getEntityClass())) {
-                return 1;
+                return 2;
             }
         } else if (permissionName.equals("monster") || permissionName.equals("monsters")) {
             if (Monster.class.isAssignableFrom(disguiseType.getEntityClass())) {
-                return 2;
+                return 3;
             }
         } else if (permissionName.equals("animal") || permissionName.equals("animals")) {
             if (Animals.class.isAssignableFrom(disguiseType.getEntityClass())) {
-                return 2;
+                return 3;
             }
         } else if (permissionName.equals("mob")) {
             if (disguiseType.isMob()) {
-                return 3;
+                return 4;
             }
         } else if (permissionName.equals("misc")) {
             if (disguiseType.isMisc()) {
-                return 3;
+                return 4;
             }
         } else if (permissionName.equals("custom")) {
             if (disguisePerm.isCustomDisguise()) {
-                return 3;
+                return 4;
             }
         } else if (permissionName.equals("vanilla")) {
             if (!disguisePerm.isCustomDisguise()) {
-                return 4;
+                return 5;
             }
         } else if (permissionName.equals("*")) {
-            return 5;
+            return 6;
         }
 
         return -1;

plugin/src/test/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissionsTest.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.utilities.parser;
 
+import lombok.SneakyThrows;
+import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
 import org.bukkit.permissions.Permissible;
@@ -213,6 +215,33 @@ public class DisguisePermissionsTest {
             DisguisePermissions.hasPermissionOption(disguiseOptions, "setBlock", "DIRT"));
     }
 
+    @SneakyThrows
+    @Test
+    public void testCustomDisguisePermissions() {
+        DisguiseConfig.getCustomDisguises().put(new DisguisePerm(DisguiseType.BEE, "babybee"), "bee setbaby");
+
+        DisguisePermissions permissions = createPermissions("disguise", false, "libsdisguises.disguise.bee.-*", "libsdisguises.disguise.babybee.nooptions");
+
+        Assert.assertNotNull("The custom disguise babybee should exist", DisguiseParser.getDisguisePerm("babybee"));
+
+        Assert.assertTrue("They should be allowed to disguise as a bee", permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.BEE)));
+
+        Assert.assertFalse("They should not be allowed to disguise as a bee and call setbaby",
+            permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.BEE), Collections.singletonList("setbaby")));
+
+        Assert.assertFalse("They should not be allowed to disguise as a burning bee",
+            permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.BEE), Collections.singletonList("setburning")));
+
+        Assert.assertFalse("They should not be allowed to disguise as a slime", permissions.isAllowedDisguise(new DisguisePerm(DisguiseType.SLIME)));
+
+        Assert.assertTrue("They should be allowed to disguise as babybee", permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("babybee")));
+
+        Assert.assertFalse("They should not be allowed to disguise as babybee and use setbaby",
+            permissions.isAllowedDisguise(DisguiseParser.getDisguisePerm("babybee"), Collections.singletonList("setbaby")));
+
+        DisguiseAPI.removeCustomDisguise("babybee");
+    }
+
     @Test
     public void testExplictPermissions() {
         DisguiseConfig.setExplicitDisguisePermissions(true);
@@ -256,7 +285,6 @@ public class DisguisePermissionsTest {
     }
 
     private Permissible createPermissionsHolder(boolean isOp, String... perms) {
-
         List<String> permitted = new ArrayList<>();
         List<String> negated = new ArrayList<>();
         Set<PermissionAttachmentInfo> attachments = new HashSet<>();

pom.xml

@@ -53,6 +53,12 @@
                 <version>${spigot.version}</version>
                 <optional>true</optional>
             </dependency>
+            <dependency>
+                <groupId>com.mojang</groupId>
+                <artifactId>authlib</artifactId>
+                <version>3.2.37</version>
+                <scope>provided</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -72,6 +78,11 @@
             <url>https://papermc.io/repo/repository/maven-public/</url>
         </repository>
 
+        <repository>
+            <id>velocity</id>
+            <url>https://nexus.velocitypowered.com/repository/maven-public/</url>
+        </repository>
+
         <!-- Lumine is a repo hosted by the creators of MythicCraft -->
         <repository>
             <id>lumine</id>

shared/pom.xml

@@ -32,6 +32,12 @@
             <groupId>com.comphenix.protocol</groupId>
             <artifactId>ProtocolLib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>authlib</artifactId>
+            <version>3.2.37</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>