Update to 1.21.3 - mostly - textures still don't work

Fix bug where if you bucket-ed a mob while your inventory was full, the mob and bucket would be deleted

Author: RhythmicSys

build.gradle.kts

@@ -1,41 +1,39 @@
-version = "0.2"
+version = "1.0"
 
 plugins {
     `java-library`
-    id("io.papermc.paperweight.userdev") version "1.5.3"
-    id("xyz.jpenilla.run-paper") version "2.0.1" // Adds runServer and runMojangMappedServer tasks for testing
+    id("io.papermc.paperweight.userdev") version "1.7.3"
+    id("xyz.jpenilla.run-paper") version "2.3.1" // Adds runServer and runMojangMappedServer tasks for testing
 }
 
 java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
 repositories {
     maven("https://repo.papermc.io/repository/maven-public/")
 }
 
 dependencies {
-    paperweight.paperDevBundle("1.20-R0.1-SNAPSHOT")
+    paperweight.paperDevBundle("1.21.3-R0.1-SNAPSHOT")
 }
 
 tasks {
     assemble {
-        dependsOn(reobfJar)
+        dependsOn("reobfJar")
     }
 
     compileJava {
-        options.encoding = Charsets.UTF_8.name()
-        options.release.set(17)
+        options.encoding = "UTF-8"
+        options.release.set(21)
     }
     javadoc {
-        options.encoding = Charsets.UTF_8.name()
+        options.encoding = "UTF-8"
     }
     processResources {
-        filteringCharset = Charsets.UTF_8.name()
+        filteringCharset = "UTF-8"
         filesMatching("plugin.yml") {
-            expand(
-                "version" to project.version
-            )
+            expand("version" to project.version)
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

src/main/java/simplexity/simplebucketmobs/config/Config.java

@@ -14,41 +14,48 @@ public class Config {
 
     private static Config instance;
 
-    private final Set<EntityType> allowedTypes;
+    private final Set<EntityType> allowedBasicTypes;
     private String bucketTitle;
     private boolean noHostileTargeting;
-    // TODO: Allowed Types dependent on Bucket
     // TODO: Disallowed Attributes
 
     private Config() {
-        allowedTypes = new HashSet<>();
+        allowedBasicTypes = new HashSet<>();
     }
 
     public static Config getInstance() {
         if (instance == null) instance = new Config();
         return instance;
     }
 
-    public Set<EntityType> getAllowedTypes() { return Collections.unmodifiableSet(allowedTypes); }
+    public Set<EntityType> getAllowedBasicTypes() { return Collections.unmodifiableSet(allowedBasicTypes); }
     public String getBucketTitle() { return bucketTitle; }
     public boolean isNoHostileTargeting() { return noHostileTargeting; }
 
     public void reloadConfig() {
         SimpleBucketMobs.getPlugin().reloadConfig();
         FileConfiguration config = SimpleBucketMobs.getPlugin().getConfig();
-        List<String> types = config.getStringList("allowed-types");
-        allowedTypes.clear();
-        for (String type : types) {
+        setupTypes(config);
+        bucketTitle = config.getString("bucket-title", "<aqua><type> Bucket");
+        noHostileTargeting = config.getBoolean("no-hostile-targeting", true);
+    }
+
+    private void setupTypes(FileConfiguration config) {
+        List<String> basicTypes = config.getStringList("allowed-types");
+        allowedBasicTypes.clear();
+        validateTypes(basicTypes, allowedBasicTypes);
+    }
+
+    private void validateTypes(List<String> stringList, Set<EntityType> entityList){
+        for (String type : stringList) {
             try {
                 EntityType entityType = EntityType.valueOf(type.toUpperCase());
-                allowedTypes.add(entityType);
+                entityList.add(entityType);
             }
             catch (IllegalArgumentException e) {
                 SimpleBucketMobs.getPlugin().getLogger().warning(Message.LOGGER_INVALID_MOB_TYPE.getMessage() + type);
             }
         }
-        bucketTitle = config.getString("bucket-title", "<aqua><type> Bucket");
-        noHostileTargeting = config.getBoolean("no-hostile-targeting", true);
     }
 
 }

src/main/java/simplexity/simplebucketmobs/listener/BucketMob.java

@@ -1,5 +1,6 @@
 package simplexity.simplebucketmobs.listener;
 
+import org.bukkit.craftbukkit.entity.CraftLivingEntity;
 import simplexity.simplebucketmobs.SimpleBucketMobs;
 import simplexity.simplebucketmobs.config.Config;
 import simplexity.simplebucketmobs.config.Texture;
@@ -14,7 +15,7 @@
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_20_R1.entity.CraftLivingEntity;
+
 import org.bukkit.entity.*;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -47,13 +48,13 @@ public void bucketMob(PlayerInteractEntityEvent event) {
         if (!(clicked instanceof LivingEntity entity)) return;
         if (entity.getType() == EntityType.PLAYER) return;
         if (Config.getInstance().isNoHostileTargeting()
-                && entity instanceof Monster monster
-                && monster.getTarget() != null
-                && monster.getTarget().equals(player)) {
+            && entity instanceof Monster monster
+            && monster.getTarget() != null
+            && monster.getTarget().equals(player)) {
             player.sendMessage(Message.ERROR_BUCKET_HOSTILE_TARGETING.getParsedMessage());
             return;
         }
-        if (!Config.getInstance().getAllowedTypes().contains(entity.getType())) return;
+        if (!Config.getInstance().getAllowedBasicTypes().contains(entity.getType())) return;
         if (!(player.hasPermission(Permission.BUCKET_ALL.get()) || player.hasPermission(Permission.BUCKET_MOB.get() + entity.getType()))) {
             player.sendMessage(Message.ERROR_BUCKET_NO_PERMISSION.getParsedMessage());
             return;
@@ -67,7 +68,6 @@ public void bucketMob(PlayerInteractEntityEvent event) {
             event.setCancelled(true);
             return;
         }
-
         ItemStack mobBucket = new ItemStack(Material.BUCKET);
         Entity vehicle = entity.getVehicle();
         if (vehicle != null) vehicle.removePassenger(entity);
@@ -91,12 +91,17 @@ public void bucketMob(PlayerInteractEntityEvent event) {
         Texture.getInstance().setCustomData(entity.getType(), meta, tag);
         mobBucket.setItemMeta(meta);
         if (player.getGameMode() != GameMode.CREATIVE) bucket.subtract();
-        player.getInventory().addItem(mobBucket);
+        if (player.getInventory().firstEmpty() == -1) {
+            player.getWorld().dropItemNaturally(player.getLocation(), mobBucket);
+        } else {
+            player.getInventory().addItem(mobBucket);
+        }
         try {
             // TODO: Configurable?
             String soundName = "ENTITY_" + entity.getType() + "_HURT";
             player.playSound(player.getLocation(), Sound.valueOf(soundName), 0.75f, 1.0f);
-        } catch (IllegalArgumentException ignored) { }
+        } catch (IllegalArgumentException ignored) {
+        }
         entity.remove();
     }
 
@@ -115,13 +120,13 @@ public void unbucketMob(PlayerInteractEvent event) {
 
         String serializedNbt = bucket.getItemMeta().getPersistentDataContainer().get(mobNBTKey, PersistentDataType.STRING);
 
-        try { if (serializedNbt != null) applyNBT(location, serializedNbt, event.getBlockFace()); }
-        catch (IOException | CommandSyntaxException e) {
+        try {
+            if (serializedNbt != null) applyNBT(location, serializedNbt, event.getBlockFace());
+        } catch (IOException | CommandSyntaxException e) {
             player.sendMessage(Message.ERROR_FAILED_DESERIALIZATION.getParsedMessage());
             e.printStackTrace();
             return;
-        }
-        catch (IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             player.sendMessage(Message.ERROR_NO_BUCKET_MOB.getParsedMessage());
             e.printStackTrace();
             return;
@@ -148,6 +153,7 @@ public void noBucketLiquid(PlayerBucketFillEvent event) {
 
     /**
      * Serializes the NBT Data from the LivingEntity.
+     *
      * @param e LivingEntity
      * @return String serialization of the LivingEntity.
      */
@@ -159,22 +165,20 @@ private CompoundTag serializeNBT(LivingEntity e) {
 
     /**
      * Deserializes the NBT Data into the LivingEntity.
-     * @param location Location to spawn Mob.
+     *
+     * @param location      Location to spawn Mob.
      * @param serializedNbt NBT as a String
-     * @exception IllegalArgumentException Invalid Mob Type Found
-     * @exception IOException Failed to read NBT Tags.
-     * @exception CommandSyntaxException What.
+     * @throws IllegalArgumentException Invalid Mob Type Found
+     * @throws IOException              Failed to read NBT Tags.
+     * @throws CommandSyntaxException   What.
      */
     private void applyNBT(Location location, String serializedNbt, BlockFace face) throws IllegalArgumentException, IOException, CommandSyntaxException {
         CompoundTag tag = TagParser.parseTag(serializedNbt);
         Tag idTag = tag.get("id");
         // TODO: Maybe throw exception.
         if (idTag == null) return;
         String id = idTag.getAsString().split(":")[1].toUpperCase();
-        EntityType mobType;
-        // Special cases where minecraft:id != Bukkit Name.
-        if (id.equals("MOOSHROOM")) mobType = EntityType.MUSHROOM_COW;
-        else mobType = EntityType.valueOf(id);
+        EntityType mobType = EntityType.valueOf(id);
         Entity entity = location.getWorld().spawnEntity(location, mobType, CreatureSpawnEvent.SpawnReason.CUSTOM, spawned -> {
             CompoundTag newLoc = new CompoundTag();
             ((CraftLivingEntity) spawned).getHandle().save(newLoc);
@@ -189,6 +193,7 @@ private void applyNBT(Location location, String serializedNbt, BlockFace face) t
 
     /**
      * Converts a string to Name Case
+     *
      * @param input String
      * @return String but using Name Case
      * @implNote Thanks Baeldung (https://www.baeldung.com/java-string-title-case)
@@ -203,8 +208,7 @@ private String nameCase(String input) {
             else if (toUpper) {
                 c = Character.toTitleCase(c);
                 toUpper = false;
-            }
-            else {
+            } else {
                 c = Character.toLowerCase(c);
             }
             nameCased.append(c);
@@ -214,20 +218,21 @@ else if (toUpper) {
 
     /**
      * Adjusts the location given
+     *
      * @param interactionPoint Location of Interaction Point
-     * @param face Block Face of Interaction
+     * @param face             Block Face of Interaction
      * @return The same Location.
      */
     private Location adjustLoc(Location interactionPoint, BlockFace face, BoundingBox entityBox) {
         double height = entityBox.getHeight();
         double widthX = entityBox.getWidthX();
         double widthZ = entityBox.getWidthZ();
         switch (face) {
-            case DOWN -> interactionPoint.add(0, -1*height, 0);
-            case EAST -> interactionPoint.add(.5*widthX, 0, 0);
-            case WEST -> interactionPoint.add(-.5*widthX, 0, 0);
-            case NORTH -> interactionPoint.add(0, 0, -.5*widthZ);
-            case SOUTH -> interactionPoint.add(0, 0, .5*widthZ);
+            case DOWN -> interactionPoint.add(0, -1 * height, 0);
+            case EAST -> interactionPoint.add(.5 * widthX, 0, 0);
+            case WEST -> interactionPoint.add(-.5 * widthX, 0, 0);
+            case NORTH -> interactionPoint.add(0, 0, -.5 * widthZ);
+            case SOUTH -> interactionPoint.add(0, 0, .5 * widthZ);
         }
         return interactionPoint;
     }