diff --git a/.gitignore b/.gitignore
index f167d06..0ca7755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,4 +114,5 @@ run/
 
 # Gradle stuff
 .gradle
-build
\ No newline at end of file
+build
+/Bucket_Mobs_Resource_Pack/
\ No newline at end of file
diff --git a/README.md b/README.md
index 03caf6e..4d99121 100644
--- a/README.md
+++ b/README.md
@@ -2,89 +2,144 @@
 
 [![wakatime](https://wakatime.com/badge/user/1f3b44b5-611a-484d-bcdc-b2084eefec1a/project/2a7588f5-f1d8-4dae-aa7b-fea0bf437f78.svg)](https://wakatime.com/@1f3b44b5-611a-484d-bcdc-b2084eefec1a/projects/szguvxhtkl)
 
-Throw mobs into buckets! :D
+Throw mobs into buckets - like axolotls, but for everything else.
 
-## Permissions
-| Permission                      |  What it do                                      | Default |
-|---------------------------------|--------------------------------------------------|---------|
-| `simplebucketmobs.bucket.<mob>` | Allows the user to bucket the specified mob      | `false` |
-| `simplebucketmobs.bucket.all`   | Allows the user to bucket all enabled mobs       | `op`    |
-| `simplebucketmobs.reload`       | Reload plugin configuration files                | `op`    |
-| `simplebucketmobs.debucket`     | Dump saved mob NBT data from Mob Bucket to chat. | `op`    |
+Right-click a mob with an empty bucket to capture it. Right-click a block to release it.
+
+## Commands
+
+| Command | Description | Permission |
+|---|---|---|
+| `/sbm reload` | Reload all configuration files | `simplebucketmobs.reload` |
+| `/sbm debucket` | Print NBT debug info for the bucket mob in your hand | `simplebucketmobs.debucket` |
 
-## Texture Configuration
+Aliases: `/simplebucketmobs`, `/simplebucketmob`
+
+## Permissions
 
-This configuration is `texture.yml` which is specifically used for custom model data. Currently, the custom model data is applied to a bucket.
+| Permission | Description | Default |
+|---|---|---|
+| `simplebucketmobs.bucket.<mob>` | Bucket a specific mob type (e.g. `simplebucketmobs.bucket.sheep`) | `false` |
+| `simplebucketmobs.bucket.all` | Bucket all enabled mob types | `op` |
+| `simplebucketmobs.reload` | Reload configuration files | `op` |
+| `simplebucketmobs.debucket` | Dump saved mob data to chat | `op` |
 
-The texture configuration is made to be customizable in the event you wanted to make special textures for each variant of a mob.
+Per-mob permissions are only checked when `requires-permission: true` is set for that mob in `config.yml`.
 
-For example, if you wanted to set a special blue sheep texture, rather than just having a generic texture for all sheep.
+## Configuration (`config.yml`)
 
-### Using "default"
+### Captured Item Style
 
-The simplest way to assign custom model data is to use the default option.
+Controls the appearance of the bucket item produced when a mob is captured.
 
 ```yaml
-SHEEP:
-  default: 1
-PIG:
-  default: 2
+captured-item-style:
+  use-resource-pack: true       # Apply item-model from texture.yml (requires a resource pack)
+  default:
+    item-type: BUCKET           # Material of the bucket item
+    item-model: "minecraft:bucket"  # Fallback item model (NamespacedKey)
+    name: "<aqua><display_name> in a Bucket"  # MiniMessage display name
+    lore:
+      - "<gray>A <type_name_cased> sits in the bucket</gray>"
+    enchantment-glint: true     # Whether the item has an enchantment glint
 ```
 
-This is the easiest way to set it and will set it to all mobs of that type.
-In the above example, all sheep will have custom model data 1 and all pigs will have custom model data 2.
+**Name placeholders:**
 
-### Using the nbtKey and nbtValue
+| Placeholder | Example output |
+|---|---|
+| `<type>` | `SHEEP` |
+| `<type_name_cased>` | `Sheep` |
+| `<display_name>` | Custom name if set, otherwise the mob's default display name |
 
-nbtKey and nbtValue are the ways I will be referring to the NBT Tags. nbtValue is our "goal".  The examples are simplified by removing the extra JSON.
+### Mob Rules (`bucket-type-settings`)
 
-Consider a villager's profession...
+Controls which mobs can be bucketed and under what conditions.
 
-```json
-{ "VillagerData": {"level":1, "profession":"minecraft:none", "type":"minecraft:desert"} }
+```yaml
+bucket-type-settings:
+  default:
+    allow: false
+    sneak-required: false
+    pickup-when-aggro: false
+    requires-permission: false
+  types:
+    SHEEP:
+      allow: true
+    VILLAGER:
+      allow: true
+      sneak-required: true       # Player must be sneaking to bucket this mob
+      requires-permission: true  # Checks simplebucketmobs.bucket.villager
+    SLIME:
+      allow: true
+      pickup-when-aggro: true    # Can be bucketed even when targeting the player
 ```
 
-If we want to differentiate custom model data based on a villager's profession, our nbtValue will be "minecraft:none" in this example.
+Valid entity type names follow the [Bukkit EntityType enum](https://purpurmc.org/javadoc/org/bukkit/entity/EntityType.html). The following are always blocked regardless of config, since they are already bucketable in vanilla: `TROPICAL_FISH`, `SALMON`, `COD`, `AXOLOTL`, `PUFFERFISH`, `TADPOLE`.
+
+## Texture Configuration (`texture.yml`)
+
+`texture.yml` maps mob types (and their variants) to item model keys. These keys are [NamespacedKeys](https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/NamespacedKey.html) pointing to models in your resource pack. `use-resource-pack` in `config.yml` must be `true` for these to apply.
+
+The default values reference the [Bucket Mobs Resources](https://modrinth.com/resourcepack/bucket-mobs-resources/versions) resource pack.
 
-You would get to the nbtValue using all the nbtKeys along the way. This will look like this in your `texture.yml`...
+### Basic format
+
+Every mob entry supports a `default` key used as the fallback when no variant matches:
 
 ```yaml
-VILLAGER:
-  VillagerData:
-    profession:
-      "minecraft:none": 1
+blaze:
+  default: "simplexity:bucket_mobs/misc/blaze"
 ```
 
-As shown above, you can use any information stored in the NBT tags to differentiate specific variants of a mob. Here are a few more examples...
+### Variant format
 
-**Parrot (Variant)**
+For mobs whose variant is recognized by the plugin (see table below), sub-keys under `type` are matched against the variant name:
 
-```json
-{ "Variant": 1 }
-```
 ```yaml
-PARROT:
-  default: 0
-  Variant:
-    1: 1
+frog:
+  default: "simplexity:bucket_mobs/frog/cold"
+  type:
+    cold: "simplexity:bucket_mobs/frog/cold"
+    temperate: "simplexity:bucket_mobs/frog/temperate"
+    warm: "simplexity:bucket_mobs/frog/warm"
 ```
 
-**Sheep (Color)**
+### Supported variant lookups
+
+| Mob | `type` key format | Example keys |
+|---|---|---|
+| Cat | `Cat.Type` enum, lowercase | `tabby`, `black`, `red`, `siamese`, `british_shorthair`, `calico`, `persian`, `ragdoll`, `white`, `jellie`, `all_black` |
+| Fox | `Fox.Type` enum, lowercase | `red`, `snow` |
+| Frog | `Frog.Variant` enum, lowercase | `cold`, `temperate`, `warm` |
+| Horse | `<color>_<style>`, both lowercase | `brown_none`, `white_white_stockings`, `black_white_field`, etc. |
+| Llama | `Llama.Color` enum, lowercase | `creamy`, `white`, `brown`, `gray` |
+| Mooshroom | `MushroomCow.Variant` enum, lowercase | `red`, `brown` |
+| Parrot | `Parrot.Variant` enum, lowercase | `red`, `blue`, `green`, `cyan`, `gray` |
+| Rabbit | `Rabbit.Type` enum, lowercase | `brown`, `white`, `black`, `black_and_white`, `gold`, `salt_and_pepper`, `the_killer_bunny` |
+| Sheep | `DyeColor` enum, lowercase | `white`, `orange`, `black`, `red`, etc. |
+| Shulker | `DyeColor` enum, lowercase | `white`, `orange`, `black`, `red`, etc. |
+| Trader Llama | `Llama.Color` enum, lowercase | `creamy`, `white`, `brown`, `gray` |
+| Villager | `Villager.Profession` enum, lowercase | `none`, `farmer`, `librarian`, `cleric`, etc. |
+| Wolf | `Wolf.Variant` enum, lowercase | `pale`, `ashen`, `black`, `chestnut`, `rusty`, `snowy`, `spotted`, `striped`, `woods` |
+
+All other mobs use only `default`.
+
+### Horse key format
+
+Horse keys combine color and marking style separated by an underscore:
 
-```json
-{ "Color": "2b" }
-```
 ```yaml
-SHEEP:
-  default: 0
-  Color:
-    0b: 0
-    1b: 1
-    2b: 2
+horse:
+  type:
+    brown_none: "simplexity:bucket_mobs/horse/brown_default"
+    brown_white_stockings: "simplexity:bucket_mobs/horse/brown_white_stockings_and_blaze"
+    brown_white_field: "simplexity:bucket_mobs/horse/brown_white_field"
 ```
 
-> **Note**
-> 
-> You can only use one set of nbtValues (in the villager example, profession).
-> 
-> The method used to search for the desired nbtValue is not recursive and will not find all possible values.
+Valid colors: `white`, `creamy`, `chestnut`, `brown`, `black`, `gray`, `dark_brown`  
+Valid styles: `none`, `white`, `whitefield`, `white_stockings`, `dots`, `black_dots`
+
+## Locale (`locale.yml`)
+
+All player-facing messages are defined in `locale.yml` using [MiniMessage](https://docs.advntr.dev/minimessage/format.html) syntax. Edit the values there to change any message text without recompiling.
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
deleted file mode 100644
index 2c055aa..0000000
--- a/build.gradle.kts
+++ /dev/null
@@ -1,39 +0,0 @@
-version = "1.2"
-
-plugins {
-    `java-library`
-    id("io.papermc.paperweight.userdev") version "2.0.0-beta.8"
-    id("xyz.jpenilla.run-paper") version "2.3.1" // Adds runServer and runMojangMappedServer tasks for testing
-}
-
-java {
-    toolchain.languageVersion.set(JavaLanguageVersion.of(21))
-}
-
-repositories {
-    maven("https://repo.papermc.io/repository/maven-public/")
-}
-
-dependencies {
-    paperweight.paperDevBundle("1.21.4-R0.1-SNAPSHOT")
-}
-
-tasks {
-    assemble {
-        dependsOn("reobfJar")
-    }
-
-    compileJava {
-        options.encoding = "UTF-8"
-        options.release.set(21)
-    }
-    javadoc {
-        options.encoding = "UTF-8"
-    }
-    processResources {
-        filteringCharset = "UTF-8"
-        filesMatching("plugin.yml") {
-            expand("version" to project.version)
-        }
-    }
-}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index cea7a79..0000000
--- a/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
deleted file mode 100644
index b740cf1..0000000
--- a/gradlew
+++ /dev/null
@@ -1,249 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       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/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# 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
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    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=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=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# 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" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
deleted file mode 100644
index 25da30d..0000000
--- a/gradlew.bat
+++ /dev/null
@@ -1,92 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-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
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-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
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..7fa647c
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.simplexity</groupId>
+    <artifactId>SimpleBucketMobs</artifactId>
+    <version>2.0.0-DEV</version>
+    <packaging>jar</packaging>
+    <name>SimpleBucketMobs</name>
+
+    <properties>
+        <java.version>21</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <createDependencyReducedPom>false</createDependencyReducedPom>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <paperweight-mappings-namespace>mojang</paperweight-mappings-namespace>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>papermc-repo</id>
+            <url>https://repo.papermc.io/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>sonatype</id>
+            <url>https://oss.sonatype.org/content/groups/public/</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.21.6-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/settings.gradle.kts b/settings.gradle.kts
deleted file mode 100644
index b5bd391..0000000
--- a/settings.gradle.kts
+++ /dev/null
@@ -1,7 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven("https://repo.papermc.io/repository/maven-public/")
-    }
-}
-rootProject.name = "SimpleBucketMobs"
diff --git a/src/main/java/simplexity/simplebucketmobs/SimpleBucketMobs.java b/src/main/java/simplexity/simplebucketmobs/SimpleBucketMobs.java
index 7a9b399..11bd34f 100644
--- a/src/main/java/simplexity/simplebucketmobs/SimpleBucketMobs.java
+++ b/src/main/java/simplexity/simplebucketmobs/SimpleBucketMobs.java
@@ -1,33 +1,33 @@
 package simplexity.simplebucketmobs;
 
+import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.java.JavaPlugin;
 import simplexity.simplebucketmobs.command.CommandHandler;
 import simplexity.simplebucketmobs.command.subcommand.Debucket;
 import simplexity.simplebucketmobs.command.subcommand.Reload;
-import simplexity.simplebucketmobs.config.Config;
+import simplexity.simplebucketmobs.config.ConfigHandler;
 import simplexity.simplebucketmobs.config.Locale;
 import simplexity.simplebucketmobs.config.Texture;
-import simplexity.simplebucketmobs.listener.BucketMob;
-import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
+import simplexity.simplebucketmobs.listener.InteractListeners;
+import simplexity.simplebucketmobs.util.BucketMobPermission;
 
+import java.util.List;
+
+@SuppressWarnings("UnstableApiUsage")
 public final class SimpleBucketMobs extends JavaPlugin {
 
     private static Plugin plugin;
     private static MiniMessage miniMessage;
-    private static GsonComponentSerializer gsonComponentSerializer;
-    private static PlainTextComponentSerializer plainTextSerializer;
 
     @Override
     public void onEnable() {
         plugin = this;
         miniMessage = MiniMessage.miniMessage();
-        gsonComponentSerializer = GsonComponentSerializer.gson();
-        plainTextSerializer = PlainTextComponentSerializer.plainText();
-        Bukkit.getPluginManager().registerEvents(new BucketMob(), this);
+        registerPermissions();
+        Bukkit.getPluginManager().registerEvents(new InteractListeners(), this);
         registerCommands();
         reloadPluginConfigs();
     }
@@ -37,21 +37,43 @@ public void onDisable() {
         // Plugin shutdown logic
     }
 
-    public static Plugin getPlugin() { return plugin; }
-    public static MiniMessage getMiniMessage() { return miniMessage; }
-    public static GsonComponentSerializer getGsonSerializer() { return gsonComponentSerializer; }
-    public static PlainTextComponentSerializer getPlainTextSerializer() { return plainTextSerializer; }
+    public static Plugin getPlugin() {
+        return plugin;
+    }
+
+    public static MiniMessage getMiniMessage() {
+        return miniMessage;
+    }
 
     public static void reloadPluginConfigs() {
         plugin.saveDefaultConfig();
-        Config.getInstance().reloadConfig();
+        plugin.reloadConfig();
+        plugin.getConfig().options().copyDefaults(true);
+        plugin.saveConfig();
+        ConfigHandler.getInstance().reloadConfig();
         Locale.getInstance().reloadLocale();
         Texture.getInstance().reloadTextureConfig();
     }
+
+    private void registerPermissions() {
+        for (BucketMobPermission perm : BucketMobPermission.values()) {
+            Bukkit.getPluginManager().addPermission(perm.getPermission());
+        }
+    }
+
     private void registerCommands() {
-        this.getCommand("simplebucketmobs").setExecutor(new CommandHandler());
         CommandHandler.subcommandList.clear();
         CommandHandler.subcommandList.put("reload", new Reload());
         CommandHandler.subcommandList.put("debucket", new Debucket());
+        CommandHandler handler = new CommandHandler();
+
+        getLifecycleManager().registerEventHandler(LifecycleEvents.COMMANDS, event -> {
+            event.registrar().register(
+                "simplebucketmobs",
+                "SimpleBucketMobs Base Command.",
+                List.of("sbm", "simplebucketmob"),
+                handler
+            );
+        });
     }
 }
diff --git a/src/main/java/simplexity/simplebucketmobs/command/CommandHandler.java b/src/main/java/simplexity/simplebucketmobs/command/CommandHandler.java
index 803601d..2af8708 100644
--- a/src/main/java/simplexity/simplebucketmobs/command/CommandHandler.java
+++ b/src/main/java/simplexity/simplebucketmobs/command/CommandHandler.java
@@ -1,24 +1,30 @@
 package simplexity.simplebucketmobs.command;
 
-import simplexity.simplebucketmobs.util.Message;
-import org.bukkit.command.Command;
+import io.papermc.paper.command.brigadier.BasicCommand;
+import io.papermc.paper.command.brigadier.CommandSourceStack;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import simplexity.simplebucketmobs.util.Message;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 
-public class CommandHandler implements TabExecutor {
+@SuppressWarnings("UnstableApiUsage")
+public class CommandHandler implements BasicCommand {
 
     public static final List<String> emptyList = Collections.unmodifiableList(new ArrayList<>());
     public static HashMap<String, SubCommand> subcommandList = new HashMap<>();
 
     @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+    public void execute(@NotNull CommandSourceStack source, @NotNull String[] args) {
+        CommandSender sender = source.getSender();
         if (args.length == 0) {
             // TODO: Help
-            return true;
+            return;
         }
         String subcommand = args[0].toLowerCase();
         if (subcommandList.containsKey(subcommand)) {
@@ -26,11 +32,12 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         } else {
             sender.sendMessage(Message.ERROR_COMMAND_NOT_FOUND.getParsedMessage());
         }
-        return true;
     }
 
     @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {        if (args.length == 0) return new ArrayList<>();
+    public @NotNull Collection<String> suggest(@NotNull CommandSourceStack source, @NotNull String[] args) {
+        CommandSender sender = source.getSender();
+        if (args.length == 0) return new ArrayList<>();
         if (args.length == 1) {
             List<String> list = new ArrayList<>();
             for (SubCommand cmd : subcommandList.values()) {
@@ -40,8 +47,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
         }
         String subcommand = args[0].toLowerCase();
         if (subcommandList.containsKey(subcommand) && sender.hasPermission(subcommandList.get(subcommand).getPermission())) {
-            return subcommandList.get(subcommand).getSubcommandArguments(sender, args);
+            List<String> suggestions = subcommandList.get(subcommand).getSubcommandArguments(sender, args);
+            return suggestions != null ? suggestions : List.of();
         }
         return new ArrayList<>();
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/simplexity/simplebucketmobs/command/SubCommand.java b/src/main/java/simplexity/simplebucketmobs/command/SubCommand.java
index 6ee277f..48525c3 100644
--- a/src/main/java/simplexity/simplebucketmobs/command/SubCommand.java
+++ b/src/main/java/simplexity/simplebucketmobs/command/SubCommand.java
@@ -1,7 +1,7 @@
 package simplexity.simplebucketmobs.command;
 
-import simplexity.simplebucketmobs.util.Permission;
 import org.bukkit.command.CommandSender;
+import org.bukkit.permissions.Permission;
 
 import java.util.List;
 
@@ -30,7 +30,9 @@ public String getSyntax() {
         return syntax;
     }
 
-    public String getPermission() { return permission.get(); }
+    public Permission getPermission() {
+        return permission;
+    }
 
     public abstract void execute(CommandSender sender, String[] args);
 
diff --git a/src/main/java/simplexity/simplebucketmobs/command/subcommand/Debucket.java b/src/main/java/simplexity/simplebucketmobs/command/subcommand/Debucket.java
index a3a22e0..8b7d2cc 100644
--- a/src/main/java/simplexity/simplebucketmobs/command/subcommand/Debucket.java
+++ b/src/main/java/simplexity/simplebucketmobs/command/subcommand/Debucket.java
@@ -1,9 +1,9 @@
 package simplexity.simplebucketmobs.command.subcommand;
 
 import simplexity.simplebucketmobs.command.SubCommand;
-import simplexity.simplebucketmobs.listener.BucketMob;
+import simplexity.simplebucketmobs.listener.InteractListeners;
 import simplexity.simplebucketmobs.util.Message;
-import simplexity.simplebucketmobs.util.Permission;
+import simplexity.simplebucketmobs.util.BucketMobPermission;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;
@@ -15,7 +15,7 @@
 
 public class Debucket extends SubCommand {
     public Debucket() {
-        super("debucket", "Allows you to dump the JSON NBT data to the player chat.", "/sbm debucket", Permission.COMMAND_DEBUCKET);
+        super("debucket", "Allows you to dump the JSON NBT data to the player chat.", "/sbm debucket", BucketMobPermission.DEBUCKET_COMMAND.getPermission());
     }
 
     @Override
@@ -24,22 +24,33 @@ public void execute(CommandSender sender, String[] args) {
             sender.sendMessage(Message.ERROR_NOT_A_PLAYER.getParsedMessage());
             return;
         }
-        if (!sender.hasPermission(Permission.COMMAND_DEBUCKET.get())) {
+        if (!sender.hasPermission(BucketMobPermission.DEBUCKET_COMMAND.getPermission())) {
             sender.sendMessage(Message.ERROR_COMMAND_NO_PERMISSION.getParsedMessage());
             return;
         }
         ItemStack item = player.getInventory().getItem(EquipmentSlot.HAND);
+        if (item == null || item.getType().isAir() || item.getItemMeta() == null) {
+            player.sendMessage(Message.ERROR_NO_BUCKET_MOB.getParsedMessage());
+            return;
+        }
         PersistentDataContainer pdc = item.getItemMeta().getPersistentDataContainer();
-        String nbt = pdc.get(BucketMob.mobNBTKey, PersistentDataType.STRING);
-        if (nbt == null) {
+        // Legacy format: NBT stored as a string
+        String nbt = pdc.get(InteractListeners.legacyMobTag, PersistentDataType.STRING);
+        if (nbt != null) {
+            player.sendMessage(nbt);
+            return;
+        }
+        // New format: entity serialized as a byte array
+        byte[] serializedData = pdc.get(InteractListeners.newMobTag, PersistentDataType.BYTE_ARRAY);
+        if (serializedData == null) {
             player.sendMessage(Message.ERROR_NO_BUCKET_MOB.getParsedMessage());
             return;
         }
-        player.sendMessage(nbt);
+        player.sendMessage("Serialized mob data (" + serializedData.length + " bytes, binary format)");
     }
 
     @Override
     public List<String> getSubcommandArguments(CommandSender sender, String[] args) {
         return null;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/simplexity/simplebucketmobs/command/subcommand/Reload.java b/src/main/java/simplexity/simplebucketmobs/command/subcommand/Reload.java
index 4a876c2..e860ea4 100644
--- a/src/main/java/simplexity/simplebucketmobs/command/subcommand/Reload.java
+++ b/src/main/java/simplexity/simplebucketmobs/command/subcommand/Reload.java
@@ -4,19 +4,19 @@
 import simplexity.simplebucketmobs.command.CommandHandler;
 import simplexity.simplebucketmobs.command.SubCommand;
 import simplexity.simplebucketmobs.util.Message;
-import simplexity.simplebucketmobs.util.Permission;
+import simplexity.simplebucketmobs.util.BucketMobPermission;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
 public class Reload extends SubCommand {
     public Reload() {
-        super("reload", "Reloads SimpleBucketMobs", "/sbm reload", Permission.COMMAND_RELOAD);
+        super("reload", "Reloads SimpleBucketMobs", "/sbm reload", BucketMobPermission.COMMAND_RELOAD.getPermission());
     }
 
     @Override
     public void execute(CommandSender sender, String[] args) {
-        if (!sender.hasPermission(Permission.COMMAND_RELOAD.get())) {
+        if (!sender.hasPermission(BucketMobPermission.COMMAND_RELOAD.getPermission())) {
             sender.sendMessage(Message.ERROR_COMMAND_NO_PERMISSION.getParsedMessage());
             return;
         }
diff --git a/src/main/java/simplexity/simplebucketmobs/config/Config.java b/src/main/java/simplexity/simplebucketmobs/config/Config.java
deleted file mode 100644
index e4000ef..0000000
--- a/src/main/java/simplexity/simplebucketmobs/config/Config.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package simplexity.simplebucketmobs.config;
-
-import simplexity.simplebucketmobs.SimpleBucketMobs;
-import simplexity.simplebucketmobs.util.Message;
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.entity.EntityType;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class Config {
-
-    private static Config instance;
-
-    // These can already be bucketed, we don't wanna double-bucket lol
-    private final Set<EntityType> generalDisallowedTypes = Set.of(
-            EntityType.TROPICAL_FISH, EntityType.SALMON, EntityType.COD,
-            EntityType.AXOLOTL, EntityType.PUFFERFISH, EntityType.TADPOLE);
-
-    private final Set<EntityType> allowedBasicTypes;
-    private String bucketTitle;
-    private boolean noHostileTargeting;
-    private boolean listIsBlacklist;
-    private boolean useResourcePack;
-    // TODO: Disallowed Attributes
-
-    private Config() {
-        allowedBasicTypes = new HashSet<>();
-    }
-
-    public static Config getInstance() {
-        if (instance == null) instance = new Config();
-        return instance;
-    }
-
-    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();
-        setupTypes(config);
-        bucketTitle = config.getString("bucket-title", "<aqua><type> Bucket");
-        noHostileTargeting = config.getBoolean("no-hostile-targeting", true);
-        listIsBlacklist = config.getBoolean("list-is-blacklist", false);
-        useResourcePack = config.getBoolean("use-resource-pack", true);
-    }
-
-    private void setupTypes(FileConfiguration config) {
-        List<String> basicTypes = config.getStringList("allowed-types");
-        allowedBasicTypes.clear();
-        if (listIsBlacklist) {
-            populateTypes(basicTypes, allowedBasicTypes);
-        } else {
-            validateTypes(basicTypes, allowedBasicTypes);
-        }
-    }
-
-    private void validateTypes(List<String> stringList, Set<EntityType> entityList) {
-        for (String type : stringList) {
-            try {
-                EntityType entityType = EntityType.valueOf(type.toUpperCase());
-                entityList.add(entityType);
-            } catch (IllegalArgumentException e) {
-                SimpleBucketMobs.getPlugin().getLogger().warning(Message.LOGGER_INVALID_MOB_TYPE.getMessage() + type);
-            }
-        }
-    }
-
-    private void populateTypes(List<String> stringList, Set<EntityType> entityList) {
-        for (EntityType entityType : EntityType.values()) {
-            if (stringList.contains(entityType.toString())) continue;
-            if (generalDisallowedTypes.contains(entityType)) continue;
-            entityList.add(entityType);
-        }
-    }
-
-    public boolean isUseResourcePack() {
-        return useResourcePack;
-    }
-}
diff --git a/src/main/java/simplexity/simplebucketmobs/config/ConfigHandler.java b/src/main/java/simplexity/simplebucketmobs/config/ConfigHandler.java
new file mode 100644
index 0000000..bd07199
--- /dev/null
+++ b/src/main/java/simplexity/simplebucketmobs/config/ConfigHandler.java
@@ -0,0 +1,147 @@
+package simplexity.simplebucketmobs.config;
+
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.EntityType;
+import org.slf4j.Logger;
+import simplexity.simplebucketmobs.SimpleBucketMobs;
+import simplexity.simplebucketmobs.listener.BucketRule;
+
+import java.util.HashMap;
+import java.util.Set;
+
+public class
+ConfigHandler {
+
+    private static ConfigHandler instance;
+    private static final Logger logger = SimpleBucketMobs.getPlugin().getSLF4JLogger();
+    private static final Material DEFAULT_MATERIAL = Material.BUCKET;
+
+    // These can already be bucketed, we don't wanna double-bucket lol
+    private final Set<EntityType> generalDisallowedTypes = Set.of(
+            EntityType.TROPICAL_FISH, EntityType.SALMON, EntityType.COD,
+            EntityType.AXOLOTL, EntityType.PUFFERFISH, EntityType.TADPOLE);
+
+    private final HashMap<EntityType, BucketRule> entityRules = new HashMap<>();
+    private BucketRule defaultRule;
+    private String bucketTitle;
+    private NamespacedKey defaultModel;
+    private boolean useResourcePack, enchantmentGlint;
+    private Material mobBucketMaterial;
+    // TODO: Disallowed Attributes
+
+    public static ConfigHandler getInstance() {
+        if (instance == null) instance = new ConfigHandler();
+        return instance;
+    }
+
+    public String getBucketTitle() {
+        return bucketTitle;
+    }
+
+    public void reloadConfig() {
+        SimpleBucketMobs.getPlugin().reloadConfig();
+        FileConfiguration config = SimpleBucketMobs.getPlugin().getConfig();
+        bucketTitle = config.getString("mob-bucket-style.default.name", "<aqua><display_name> in a Bucket");
+        enchantmentGlint = config.getBoolean("mob-bucket-style.default.enchantment-glint", true);
+        useResourcePack = config.getBoolean("mob-bucket-style.use-resource-pack", true);
+        mobBucketMaterial = validateMaterial(config.getString("mob-bucket-style.default.item-type"));
+        defaultModel = validateItemModel(config.getString("mob-bucket-style.default.item-model", "minecraft:bucket"));
+        setupTypes(config);
+    }
+
+    private void setupTypes(FileConfiguration config) {
+        boolean defaultAllowed = config.getBoolean("bucket-type-settings.default.allow", false);
+        boolean defaultSneak = config.getBoolean("bucket-type-settings.default.sneak-required", false);
+        boolean defaultPickupAggro = config.getBoolean("bucket-type-settings.default.pickup-when-aggro", false);
+        boolean defaultRequiresPermission = config.getBoolean("bucket-type-settings.default.requires-permission", false);
+        defaultRule = new BucketRule(defaultAllowed, defaultSneak, defaultPickupAggro, defaultRequiresPermission);
+        ConfigurationSection typesSection = config.getConfigurationSection("bucket-type-settings.types");
+        if (typesSection == null) return;
+        entityRules.clear();
+        for (String entityKey : typesSection.getKeys(false)) {
+            EntityType entityType = validateType(entityKey);
+            if (entityType == null) continue;
+            if (generalDisallowedTypes.contains(entityType)) continue;
+            ConfigurationSection entitySection = typesSection.getConfigurationSection(entityKey);
+            if (entitySection == null) {
+                entityRules.put(entityType, new BucketRule(defaultAllowed, defaultSneak, defaultPickupAggro, defaultRequiresPermission));
+                continue;
+            }
+            boolean allow = entitySection.getBoolean("allow", defaultAllowed);
+            boolean sneak = entitySection.getBoolean("sneak-required", defaultSneak);
+            boolean aggro = entitySection.getBoolean("pickup-when-aggro", defaultPickupAggro);
+            boolean reqPerm = entitySection.getBoolean("requires-permission", defaultRequiresPermission);
+            entityRules.put(entityType, new BucketRule(allow, sneak, aggro, reqPerm));
+        }
+    }
+
+    private EntityType validateType(String entityName) {
+        try {
+            return EntityType.valueOf(entityName.toUpperCase());
+        } catch (IllegalArgumentException e) {
+            logger.warn("Invalid entity type: {} - settings for this entity will be skipped", entityName);
+        }
+        return null;
+    }
+
+    private NamespacedKey validateItemModel(String modelLocation) {
+        NamespacedKey key = NamespacedKey.fromString(modelLocation);
+        if (key == null) {
+            logger.warn("Invalid item model: {} - using default model 'minecraft:bucket'", modelLocation);
+            return NamespacedKey.fromString("minecraft:bucket");
+        }
+        return key;
+    }
+
+    private Material validateMaterial(String materialName) {
+        if (materialName == null) {
+            logger.warn("No material found for mob-bucket-style.default.item-type, using default material: {}", DEFAULT_MATERIAL);
+            return DEFAULT_MATERIAL;
+        }
+        Material material = Material.getMaterial(materialName);
+        if (material == null) {
+            logger.warn("Invalid material in 'mob-bucket-style.default.item-type': {} - using default material: {}", materialName, DEFAULT_MATERIAL);
+            return DEFAULT_MATERIAL;
+        }
+        return material;
+    }
+
+    public boolean isUsingResourcePack() {
+        return useResourcePack;
+    }
+
+    private BucketRule getRule(EntityType type) {
+        return entityRules.getOrDefault(type, defaultRule);
+    }
+
+    public boolean bucketingAllowed(EntityType type) {
+        return getRule(type).allow;
+    }
+
+    public boolean isSneakRequired(EntityType type) {
+        return getRule(type).sneakRequired;
+    }
+
+    public boolean canPickupWhenAggro(EntityType type) {
+        return getRule(type).pickupWhenAggro;
+    }
+
+    public boolean requiresExplicitPermission(EntityType type) {
+        return getRule(type).requiresPermission;
+    }
+
+    public boolean isEnchantmentGlint() {
+        return enchantmentGlint;
+    }
+
+    public Material getMobBucketMaterial() {
+        return mobBucketMaterial;
+    }
+
+    public NamespacedKey getDefaultModel() {
+        return defaultModel;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/simplexity/simplebucketmobs/config/Locale.java b/src/main/java/simplexity/simplebucketmobs/config/Locale.java
index d0ad5df..9620dad 100644
--- a/src/main/java/simplexity/simplebucketmobs/config/Locale.java
+++ b/src/main/java/simplexity/simplebucketmobs/config/Locale.java
@@ -39,7 +39,7 @@ public void reloadLocale() {
                 Message message = Message.valueOf(key);
                 message.setMessage(locale.getString(key, message.getMessage()));
             } catch (IllegalArgumentException e) {
-                SimpleBucketMobs.getPlugin().getLogger().warning(Message.LOGGER_INVALID_LOCALE_KEY + key);
+                SimpleBucketMobs.getPlugin().getSLF4JLogger().warn("Invalid locale key: {} - Delete key from locale.yml to stop seeing this message", key);
             }
         }
     }
diff --git a/src/main/java/simplexity/simplebucketmobs/config/Texture.java b/src/main/java/simplexity/simplebucketmobs/config/Texture.java
index d9b0111..0dd70af 100644
--- a/src/main/java/simplexity/simplebucketmobs/config/Texture.java
+++ b/src/main/java/simplexity/simplebucketmobs/config/Texture.java
@@ -1,15 +1,13 @@
 package simplexity.simplebucketmobs.config;
 
+import org.bukkit.DyeColor;
 import org.bukkit.NamespacedKey;
-import simplexity.simplebucketmobs.SimpleBucketMobs;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.EntityType;
-import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.entity.*;
+import org.slf4j.Logger;
+import simplexity.simplebucketmobs.SimpleBucketMobs;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,6 +19,7 @@ public class Texture {
     private final String fileName = "texture.yml";
     private final File dataFile = new File(SimpleBucketMobs.getPlugin().getDataFolder(), fileName);
     private final FileConfiguration texture = new YamlConfiguration();
+    private final Logger logger = SimpleBucketMobs.getPlugin().getSLF4JLogger();
 
     private Texture() {
         if (!dataFile.exists()) SimpleBucketMobs.getPlugin().saveResource(fileName, false);
@@ -32,91 +31,149 @@ public static Texture getInstance() {
         return instance;
     }
 
-    public FileConfiguration getTextureConfig() { return texture; }
+    public FileConfiguration getTextureConfig() {
+        return texture;
+    }
 
     public void reloadTextureConfig() {
-        try { texture.load(dataFile); }
-        catch (IOException | InvalidConfigurationException e) { e.printStackTrace(); }
-    }
-
-    public void setCustomData(EntityType type, ItemMeta meta, CompoundTag tag) {
-        ConfigurationSection section = texture.getConfigurationSection(type.toString());
-        if (section == null) return;
-        setNewItemModel(meta, section);
-        if (surprise(type, meta, tag)) return;
-        String value = null;
-        // Until we hit a dead end or found the path...
-        while (true) {
-            String ymlKey = null;
-            // Find a valid key to look into.
-            for (String key : section.getKeys(false)) {
-                // If the tag does not exist, ignore this value.
-                if (!tag.contains(key)) continue;
-                ymlKey = key;
-                break;
-            }
-            if (ymlKey == null) break;
-            // If the key does not lead to a configuration section, we cannot continue.
-            if (!section.isConfigurationSection(ymlKey)) {
-                break;
-            }
-            // If the tag is not a CompoundTag, this is the value we need.
-            // TODO: Make it so if a value "exists" it is true, not just that the value is set to a specific one.
-            if (!tag.contains(ymlKey, 10)) {
-                Tag currentTag = tag.get(ymlKey);
-                assert currentTag != null; // Guaranteed, we checked.
-                value = currentTag.getAsString();
-                section = section.getConfigurationSection(ymlKey);
-                break;
-            }
-            // Otherwise, go deeper...
-            section = section.getConfigurationSection(ymlKey);
-            tag = tag.getCompound(ymlKey);
-            assert section != null; // Guaranteed, ymlKey was pulled out of the keySet and the set was unmodified.
+        try {
+            texture.load(dataFile);
+        } catch (IOException | InvalidConfigurationException e) {
+            logger.error("Failed to load {}", fileName, e);
         }
-        if (value == null) return;
-        assert section != null; // Guaranteed, ymlKey was pulled out of the keySet and the set was unmodified.
-        setNewItemModel(value, meta, section);
     }
 
-    private boolean surprise(EntityType type, ItemMeta meta, CompoundTag tag) {
-        ConfigurationSection section = texture.getConfigurationSection("special");
-        if (section == null) return false;
-        if (type == EntityType.CHICKEN && tag.getShort("Fire") > 0)  {
-            setNewItemModel("fried", meta, section);
-            return true;
-        }
-        // Dog having owner workaround. TODO: Be smarter and figure a solution.
-        /*if (type == EntityType.WOLF && tag.hasUUID("Owner")) {
-            meta.setCustomModelData(section.getInt("tamed_wolf", 0));
-            return true;
-        }
-        // Toast Rabbit workaround.
-         TODO: Fix Toast Rabbit Workaround or be smarter and figure a solution.
-        if (type == EntityType.RABBIT) {
-            System.out.println("RABBIT");
-            Tag name =  tag.get("CustomName");
-            if (name != null) {
-                System.out.println("RABBIT NAME");
-                 Component nameComponent = SimpleBucketMobs.getGsonSerializer().deserialize(name.toString());
-                 if (SimpleBucketMobs.getMiniMessage().stripTags(nameString).equals("Toast")) {
-                     System.out.println("RABBIT NAME TOAST");
-                     meta.setCustomModelData(section.getInt("toast", 0));
-                     return true;
-                 }
-            }
+    public NamespacedKey getItemModel(LivingEntity entity) {
+        String itemModelLocation = locateItemModel(entity);
+        NamespacedKey key = NamespacedKey.fromString(itemModelLocation);
+        if (key == null) {
+            logger.warn("Invalid or missing item model string for entity: {} Value: '{}'", entity.getType(), itemModelLocation);
+            return ConfigHandler.getInstance().getDefaultModel();
         }
-        */
-        return false;
+        return key;
     }
-    private void setNewItemModel(ItemMeta meta, ConfigurationSection section) {
-        setNewItemModel("default", meta, section);
+
+    private String locateItemModel(LivingEntity entity) {
+        if (entity instanceof Cat cat) return getCatItemModel(cat);
+        if (entity instanceof Chicken chicken) return getChickenItemModel(chicken);
+        if (entity instanceof MushroomCow mooshroom) return getMooshroomItemModel(mooshroom);
+        if (entity instanceof Cow cow) return getCowItemModel(cow);
+        if (entity instanceof Fox fox) return getFoxItemModel(fox);
+        if (entity instanceof Frog frog) return getFrogItemModel(frog);
+        if (entity instanceof Horse horse) return getHorseItemModel(horse);
+        // Have to do this first otherwise llama will eat it
+        if (entity instanceof TraderLlama traderLlama) return getTraderLlamaItemModel(traderLlama);
+        if (entity instanceof Llama llama) return getLlamaItemModel(llama);
+        if (entity instanceof Parrot parrot) return getParrotItemModel(parrot);
+        if (entity instanceof Pig pig) return getPigItemModel(pig);
+        if (entity instanceof Rabbit rabbit) return getRabbitItemModel(rabbit);
+        if (entity instanceof Sheep sheep) return getSheepItemModel(sheep);
+        if (entity instanceof Shulker shulker) return getShulkerItemModel(shulker);
+        if (entity instanceof Villager villager) return getVillagerItemModel(villager);
+        if (entity instanceof Wolf wolf) return getWolfItemModel(wolf);
+        return texture.getString(entity.getType().toString().toLowerCase() + ".default", "minecraft:bucket");
+    }
+
+    public String getCatItemModel(Cat cat) {
+        Cat.Type catType = cat.getCatType();
+        String defaultTexture = texture.getString("cat.default", "minecraft:bucket");
+        return texture.getString("cat.type." + catType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getChickenItemModel(Chicken chicken) {
+        EntityType chickenType = chicken.getType();
+        String defaultTexture = texture.getString("chicken.default", "minecraft:bucket");
+        return texture.getString("chicken.type." + chickenType.toString().toLowerCase(), defaultTexture);
     }
-    private void setNewItemModel(String key, ItemMeta meta, ConfigurationSection section) {
-        String modelLocation = section.getString(key, "minecraft:bucket");
-        String[] split = modelLocation.split(":");
-        NamespacedKey namespacedKey = new NamespacedKey(split[0], split[1]);
-        meta.setItemModel(namespacedKey);
+
+    public String getCowItemModel(Cow cow) {
+        EntityType cowType = cow.getType();
+        String defaultTexture = texture.getString("cow.default", "minecraft:bucket");
+        return texture.getString("cow.type." + cowType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getFoxItemModel(Fox fox) {
+        Fox.Type foxType = fox.getFoxType();
+        String defaultTexture = texture.getString("fox.default", "minecraft:bucket");
+        return texture.getString("fox.type." + foxType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getFrogItemModel(Frog frog) {
+        Frog.Variant frogType = frog.getVariant();
+        String defaultTexture = texture.getString("frog.default", "minecraft:bucket");
+        return texture.getString("frog.type." + frogType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getHorseItemModel(Horse horse) {
+        Horse.Color color = horse.getColor();
+        Horse.Style style = horse.getStyle();
+        String defaultTexture = texture.getString("horse.default", "minecraft:bucket");
+        String colorKey = color.name().toLowerCase();
+        String styleKey = style.name().toLowerCase();
+        String key = colorKey + "_" + styleKey;
+        return texture.getString("horse.type." + key, defaultTexture);
+    }
+
+    public String getLlamaItemModel(Llama llama) {
+        Llama.Color llamaColor = llama.getColor();
+        String defaultTexture = texture.getString("llama.default", "minecraft:bucket");
+        return texture.getString("llama.type." + llamaColor.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getMooshroomItemModel(MushroomCow mooshroom) {
+        MushroomCow.Variant mooshroomType = mooshroom.getVariant();
+        String defaultTexture = texture.getString("mooshroom.default", "minecraft:bucket");
+        return texture.getString("mooshroom.type." + mooshroomType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getParrotItemModel(Parrot parrot) {
+        Parrot.Variant parrotType = parrot.getVariant();
+        String defaultTexture = texture.getString("parrot.default", "minecraft:bucket");
+        return texture.getString("parrot.type." + parrotType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getPigItemModel(Pig pig) {
+        EntityType pigType = pig.getType();
+        String defaultTexture = texture.getString("pig.default", "minecraft:bucket");
+        return texture.getString("pig.type." + pigType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getRabbitItemModel(Rabbit rabbit) {
+        Rabbit.Type rabbitType = rabbit.getRabbitType();
+        String defaultTexture = texture.getString("rabbit.default", "minecraft:bucket");
+        return texture.getString("rabbit.type." + rabbitType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getSheepItemModel(Sheep sheep) {
+        DyeColor sheepType = sheep.getColor();
+        String defaultTexture = texture.getString("sheep.default", "minecraft:bucket");
+        if (sheepType == null) return defaultTexture;
+        return texture.getString("sheep.type." + sheepType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getShulkerItemModel(Shulker shulker) {
+        DyeColor shulkerType = shulker.getColor();
+        String defaultTexture = texture.getString("shulker.default", "minecraft:bucket");
+        if (shulkerType == null) return defaultTexture;
+        return texture.getString("shulker.type." + shulkerType.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getTraderLlamaItemModel(TraderLlama traderLlama) {
+        Llama.Color llamaColor = traderLlama.getColor();
+        String defaultTexture = texture.getString("trader_llama.default", "minecraft:bucket");
+        return texture.getString("trader_llama.type." + llamaColor.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getVillagerItemModel(Villager villager) {
+        Villager.Profession villagerProfession = villager.getProfession();
+        String defaultTexture = texture.getString("villager.default", "minecraft:bucket");
+        return texture.getString("villager.type." + villagerProfession.toString().toLowerCase(), defaultTexture);
+    }
+
+    public String getWolfItemModel(Wolf wolf) {
+        Wolf.Variant wolfType = wolf.getVariant();
+        String defaultTexture = texture.getString("wolf.default", "minecraft:bucket");
+        return texture.getString("wolf.type." + wolfType.toString().toLowerCase(), defaultTexture);
     }
 
 }
diff --git a/src/main/java/simplexity/simplebucketmobs/listener/BucketHandler.java b/src/main/java/simplexity/simplebucketmobs/listener/BucketHandler.java
new file mode 100644
index 0000000..63fc978
--- /dev/null
+++ b/src/main/java/simplexity/simplebucketmobs/listener/BucketHandler.java
@@ -0,0 +1,88 @@
+package simplexity.simplebucketmobs.listener;
+
+import io.papermc.paper.datacomponent.DataComponentTypes;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import org.bukkit.Bukkit;
+import org.bukkit.NamespacedKey;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.persistence.PersistentDataType;
+import simplexity.simplebucketmobs.SimpleBucketMobs;
+import simplexity.simplebucketmobs.config.ConfigHandler;
+import simplexity.simplebucketmobs.config.Texture;
+
+import java.util.HashMap;
+
+@SuppressWarnings({"UnstableApiUsage", "deprecation"})
+public class BucketHandler {
+
+    private static final MiniMessage miniMessage = SimpleBucketMobs.getMiniMessage();
+
+    public static ItemStack getMobBucket(LivingEntity entity) {
+        ItemStack bucketStack = new ItemStack(ConfigHandler.getInstance().getMobBucketMaterial());
+        bucketStack.setData(DataComponentTypes.MAX_STACK_SIZE, 1);
+        Component nameComponent = getBucketName(entity);
+        bucketStack.setData(DataComponentTypes.CUSTOM_NAME, nameComponent);
+        bucketStack.setData(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, ConfigHandler.getInstance().isEnchantmentGlint());
+        byte[] serializedEntity = Bukkit.getUnsafe().serializeEntity(entity);
+        if (ConfigHandler.getInstance().isUsingResourcePack()) {
+            NamespacedKey modelKey = Texture.getInstance().getItemModel(entity);
+            bucketStack.setData(DataComponentTypes.ITEM_MODEL, modelKey);
+        }
+        bucketStack.editPersistentDataContainer(pdc -> pdc.set(InteractListeners.newMobTag, PersistentDataType.BYTE_ARRAY, serializedEntity));
+        return bucketStack;
+    }
+
+    public static void addMobBucketToInventory(Player player, ItemStack bucket) {
+        Inventory inventory = player.getInventory();
+        int amountOfBuckets = player.getInventory().getItemInMainHand().getAmount();
+        player.getInventory().getItemInMainHand().setAmount(amountOfBuckets - 1);
+        HashMap<Integer, ItemStack> leftoverItems = inventory.addItem(bucket);
+        if (leftoverItems.isEmpty()) return;
+        for (ItemStack leftover : leftoverItems.values()) {
+            player.getLocation().getWorld().dropItem(player.getLocation(), leftover);
+        }
+    }
+
+    private static Component getBucketName(LivingEntity entity) {
+        Component entityName = entity.customName();
+        if (entityName == null) entityName = entity.name();
+        String typeName = entity.getType().name();
+        String typeNameCased = nameCase(typeName);
+        String configName = ConfigHandler.getInstance().getBucketTitle();
+        return miniMessage.deserialize(configName,
+                Placeholder.component("display_name", entityName),
+                Placeholder.parsed("type", entity.getType().name()),
+                Placeholder.parsed("type_name_cased", typeNameCased));
+    }
+
+    /**
+     * 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)
+     */
+    private static String nameCase(String input) {
+        if (input == null || input.isBlank()) return input;
+        input = input.replace('_', ' ');
+        StringBuilder nameCased = new StringBuilder();
+        boolean toUpper = true;
+        for (char c : input.toCharArray()) {
+            if (Character.isSpaceChar(c)) toUpper = true;
+            else if (toUpper) {
+                c = Character.toTitleCase(c);
+                toUpper = false;
+            } else {
+                c = Character.toLowerCase(c);
+            }
+            nameCased.append(c);
+        }
+        return nameCased.toString();
+    }
+
+}
diff --git a/src/main/java/simplexity/simplebucketmobs/listener/BucketMob.java b/src/main/java/simplexity/simplebucketmobs/listener/BucketMob.java
deleted file mode 100644
index f6cb8de..0000000
--- a/src/main/java/simplexity/simplebucketmobs/listener/BucketMob.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package simplexity.simplebucketmobs.listener;
-
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.nbt.TagParser;
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
-import org.bukkit.Sound;
-import org.bukkit.block.Block;
-import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.entity.CraftLivingEntity;
-import org.bukkit.entity.ComplexEntityPart;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.EntityType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Monster;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.Action;
-import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.player.PlayerBucketFillEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.inventory.EquipmentSlot;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.persistence.PersistentDataContainer;
-import org.bukkit.persistence.PersistentDataType;
-import org.bukkit.util.BoundingBox;
-import simplexity.simplebucketmobs.SimpleBucketMobs;
-import simplexity.simplebucketmobs.config.Config;
-import simplexity.simplebucketmobs.config.Texture;
-import simplexity.simplebucketmobs.util.Message;
-import simplexity.simplebucketmobs.util.Permission;
-
-import java.io.IOException;
-
-public class BucketMob implements Listener {
-
-    public static final NamespacedKey mobNBTKey = new NamespacedKey(SimpleBucketMobs.getPlugin(), "mob_nbt");
-
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-    public void bucketMob(PlayerInteractEntityEvent event) {
-        if (event.getHand() != EquipmentSlot.HAND) return;
-        Player player = event.getPlayer();
-        if (!player.isSneaking()) return;
-        Entity clicked = event.getRightClicked();
-        if (clicked instanceof ComplexEntityPart part) clicked = part.getParent();
-        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)) {
-            player.sendMessage(Message.ERROR_BUCKET_HOSTILE_TARGETING.getParsedMessage());
-            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;
-        }
-        // TODO: Health Threshold Requirement / Health Check Bypass Permission (Per Mob)
-        // TODO: Check disallowed attributes.
-        ItemStack bucket = player.getEquipment().getItemInMainHand();
-        // TODO: Allow for different bucket types.
-        if (bucket.getType() != Material.BUCKET) return;
-        if (bucket.getItemMeta().getPersistentDataContainer().has(mobNBTKey)) {
-            event.setCancelled(true);
-            return;
-        }
-        ItemStack mobBucket = new ItemStack(Material.BUCKET);
-        Entity vehicle = entity.getVehicle();
-        if (vehicle != null) vehicle.removePassenger(entity);
-        CompoundTag tag = serializeNBT(entity);
-        String serializedNbt = tag.getAsString();
-
-        ItemMeta meta = mobBucket.getItemMeta();
-        PersistentDataContainer bucketPDC = meta.getPersistentDataContainer();
-        bucketPDC.set(mobNBTKey, PersistentDataType.STRING, serializedNbt);
-
-        String entityType = entity.getType().toString();
-        String entityTypeName = nameCase(entityType);
-        Component customName = entity.customName();
-        Component entityTypeComponent = SimpleBucketMobs.getPlainTextSerializer().deserialize(entityTypeName);
-        meta.displayName(SimpleBucketMobs.getMiniMessage().deserialize(
-                "<!i>" + Config.getInstance().getBucketTitle(),
-                Placeholder.parsed("type", entityType),
-                Placeholder.parsed("type_name_cased", entityTypeName),
-                Placeholder.component("display_name", customName != null ? customName : entityTypeComponent)
-        ));
-        if (Config.getInstance().isUseResourcePack()) {
-            Texture.getInstance().setCustomData(entity.getType(), meta, tag);
-        } else {
-            meta.setEnchantmentGlintOverride(true);
-        }
-        mobBucket.setItemMeta(meta);
-        if (player.getGameMode() != GameMode.CREATIVE) bucket.subtract();
-        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) {
-        }
-        entity.remove();
-    }
-
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-    public void unbucketMob(PlayerInteractEvent event) {
-        if (event.getHand() != EquipmentSlot.HAND) return;
-        if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return;
-        Block block = event.getClickedBlock();
-        if (block == null) return;
-        Location location = block.getRelative(event.getBlockFace()).getLocation().add(0.5, 0.0, 0.5);
-
-        Player player = event.getPlayer();
-        ItemStack bucket = player.getEquipment().getItemInMainHand();
-        if (bucket.getType() != Material.BUCKET) return;
-        if (!bucket.getItemMeta().getPersistentDataContainer().has(mobNBTKey)) return;
-
-        String serializedNbt = bucket.getItemMeta().getPersistentDataContainer().get(mobNBTKey, PersistentDataType.STRING);
-
-        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) {
-            player.sendMessage(Message.ERROR_NO_BUCKET_MOB.getParsedMessage());
-            e.printStackTrace();
-            return;
-        }
-
-        // TODO: Make configurable.
-        player.playSound(player.getLocation(), Sound.ITEM_BUCKET_FILL_POWDER_SNOW, 1.0f, 1.0f);
-
-        if (player.getGameMode() != GameMode.CREATIVE) {
-            bucket.subtract();
-            player.getInventory().addItem(new ItemStack(Material.BUCKET));
-        }
-    }
-
-    @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
-    public void noBucketLiquid(PlayerBucketFillEvent event) {
-        Player player = event.getPlayer();
-        ItemStack bucket = player.getEquipment().getItem(event.getHand());
-        if (bucket.getItemMeta().getPersistentDataContainer().has(mobNBTKey)) {
-            event.setCancelled(true);
-        }
-        // TODO: Make it so that when performing bucketMob and unbucketMob, the bucket does not collect liquid.
-    }
-
-    /**
-     * Serializes the NBT Data from the LivingEntity.
-     *
-     * @param e LivingEntity
-     * @return String serialization of the LivingEntity.
-     */
-    private CompoundTag serializeNBT(LivingEntity e) {
-        CompoundTag tag = new CompoundTag();
-        ((CraftLivingEntity) e).getHandle().save(tag);
-        return tag;
-    }
-
-    /**
-     * Deserializes the NBT Data into the LivingEntity.
-     *
-     * @param location      Location to spawn Mob.
-     * @param serializedNbt NBT as a String
-     * @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 = EntityType.valueOf(id);
-        Entity entity = location.getWorld().spawnEntity(location, mobType, CreatureSpawnEvent.SpawnReason.CUSTOM, spawned -> {
-            CompoundTag newLoc = new CompoundTag();
-            ((CraftLivingEntity) spawned).getHandle().save(newLoc);
-            tag.put("Motion", newLoc.get("Motion"));
-            tag.put("Pos", newLoc.get("Pos"));
-            tag.put("Rotation", newLoc.get("Rotation"));
-            tag.put("UUID", newLoc.get("UUID"));
-            ((CraftLivingEntity) spawned).getHandle().load(tag);
-        });
-        // TODO: Adjust Entity on Bounding Box -- entity.teleport(adjustLoc(location, face, entity.getBoundingBox()));
-    }
-
-    /**
-     * 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)
-     */
-    private String nameCase(String input) {
-        if (input == null || input.isBlank()) return input;
-        input = input.replace('_', ' ');
-        StringBuilder nameCased = new StringBuilder();
-        boolean toUpper = true;
-        for (char c : input.toCharArray()) {
-            if (Character.isSpaceChar(c)) toUpper = true;
-            else if (toUpper) {
-                c = Character.toTitleCase(c);
-                toUpper = false;
-            } else {
-                c = Character.toLowerCase(c);
-            }
-            nameCased.append(c);
-        }
-        return nameCased.toString();
-    }
-
-    /**
-     * Adjusts the location given
-     *
-     * @param interactionPoint Location of Interaction Point
-     * @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);
-        }
-        return interactionPoint;
-    }
-
-}
diff --git a/src/main/java/simplexity/simplebucketmobs/listener/BucketRule.java b/src/main/java/simplexity/simplebucketmobs/listener/BucketRule.java
new file mode 100644
index 0000000..510eae8
--- /dev/null
+++ b/src/main/java/simplexity/simplebucketmobs/listener/BucketRule.java
@@ -0,0 +1,15 @@
+package simplexity.simplebucketmobs.listener;
+
+public class BucketRule {
+    public final boolean allow;
+    public final boolean sneakRequired;
+    public final boolean pickupWhenAggro;
+    public final boolean requiresPermission;
+
+    public BucketRule(boolean allow, boolean sneakRequired, boolean pickupWhenAggro, boolean requiresPermission) {
+        this.allow = allow;
+        this.sneakRequired = sneakRequired;
+        this.pickupWhenAggro = pickupWhenAggro;
+        this.requiresPermission = requiresPermission;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/simplexity/simplebucketmobs/listener/CaptureItem.java b/src/main/java/simplexity/simplebucketmobs/listener/CaptureItem.java
new file mode 100644
index 0000000..ec11f35
--- /dev/null
+++ b/src/main/java/simplexity/simplebucketmobs/listener/CaptureItem.java
@@ -0,0 +1,20 @@
+package simplexity.simplebucketmobs.listener;
+
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+
+public class CaptureItem {
+    public final String itemName;
+    public final boolean enchantGlint;
+    public final NamespacedKey itemModel;
+    public final Material itemType;
+    public final Integer stackSize;
+
+    public CaptureItem(String itemName, boolean enchantGlint, NamespacedKey itemModel, Material itemType, Integer stackSize) {
+        this.itemName = itemName;
+        this.enchantGlint = enchantGlint;
+        this.itemModel = itemModel;
+        this.itemType = itemType;
+        this.stackSize = stackSize;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/simplexity/simplebucketmobs/listener/CapturedItem.java b/src/main/java/simplexity/simplebucketmobs/listener/CapturedItem.java
new file mode 100644
index 0000000..de03715
--- /dev/null
+++ b/src/main/java/simplexity/simplebucketmobs/listener/CapturedItem.java
@@ -0,0 +1,20 @@
+package simplexity.simplebucketmobs.listener;
+
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+
+public class CapturedItem {
+    public final String itemName;
+    public final String itemLore;
+    public final boolean enchantGlint;
+    public final NamespacedKey itemModel;
+    public final Material itemType;
+
+    public CapturedItem(String itemName, String itemLore, boolean enchantGlint, NamespacedKey itemModel, Material itemType) {
+        this.itemName = itemName;
+        this.itemLore = itemLore;
+        this.enchantGlint = enchantGlint;
+        this.itemModel = itemModel;
+        this.itemType = itemType;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/simplexity/simplebucketmobs/listener/EntityHandler.java b/src/main/java/simplexity/simplebucketmobs/listener/EntityHandler.java
new file mode 100644
index 0000000..6407ac2
--- /dev/null
+++ b/src/main/java/simplexity/simplebucketmobs/listener/EntityHandler.java
@@ -0,0 +1,102 @@
+package simplexity.simplebucketmobs.listener;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntitySnapshot;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.persistence.PersistentDataType;
+import org.slf4j.Logger;
+import simplexity.simplebucketmobs.SimpleBucketMobs;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+@SuppressWarnings({"UnstableApiUsage", "deprecation"})
+public class EntityHandler {
+
+    private static final Logger logger = SimpleBucketMobs.getPlugin().getSLF4JLogger();
+
+    private static final List<ItemStack> pleaseStopDuplicatingMobsThanks = new ArrayList<>();
+
+    // Cached reflection handles for NMS position setting (Paper 1.21+ Mojang mappings)
+    private static Method getHandleMethod;
+    private static Method setPosMethod;
+
+    static {
+        try {
+            // CraftEntity.getHandle() is public and accessible via reflection
+            Class<?> craftEntityClass = Class.forName("org.bukkit.craftbukkit.entity.CraftEntity");
+            getHandleMethod = craftEntityClass.getMethod("getHandle");
+            // net.minecraft.world.entity.Entity.setPos(double x, double y, double z)
+            Class<?> nmsEntityClass = Class.forName("net.minecraft.world.entity.Entity");
+            setPosMethod = nmsEntityClass.getMethod("setPos", double.class, double.class, double.class);
+        } catch (Exception e) {
+            logger.warn("Could not cache NMS position methods; mob release will fall back to teleport", e);
+        }
+    }
+
+    public static void handleMobSpawn(Player player, ItemStack itemStack, Block block) {
+        byte[] entityBytes = itemStack.getPersistentDataContainer().get(InteractListeners.newMobTag, PersistentDataType.BYTE_ARRAY);
+        if (entityBytes == null) return;
+        Entity deserializedEntity = Bukkit.getUnsafe().deserializeEntity(entityBytes, block.getWorld(), false, false);
+        if (!(deserializedEntity instanceof LivingEntity livingEntity)) {
+            logger.warn("Entity saved in this bucket was not a living entity, idk how you managed to do that but it's not gonna spawn. Entity info: {}", deserializedEntity);
+            return;
+        }
+        if (pleaseStopDuplicatingMobsThanks.contains(itemStack)) return;
+        pleaseStopDuplicatingMobsThanks.add(itemStack);
+        Bukkit.getScheduler().runTaskLater(SimpleBucketMobs.getPlugin(), () -> {
+            Location location = block.getLocation().toCenterLocation();
+            if (!block.isPassable()) location = location.add(0, 1, 0);
+            // Set the NMS position before addEntity() so the entity spawns directly at
+            // the release location rather than its stored (capture-time) position.
+            // This avoids force-loading the capture chunk and prevents teleport failures
+            // when that chunk is unloaded.
+            setNmsPosition(livingEntity, location);
+            location.getWorld().addEntity(livingEntity);
+            player.getInventory().setItemInMainHand(new ItemStack(Material.BUCKET));
+            pleaseStopDuplicatingMobsThanks.remove(itemStack);
+        }, 2L);
+    }
+
+    public static void handleLegacyMobSpawn(Player player, ItemStack itemStack, Block block) {
+        String nbt = itemStack.getPersistentDataContainer().get(InteractListeners.legacyMobTag, PersistentDataType.STRING);
+        if (nbt == null || nbt.isEmpty()) return;
+        if (pleaseStopDuplicatingMobsThanks.contains(itemStack)) return;
+        pleaseStopDuplicatingMobsThanks.add(itemStack);
+        Bukkit.getScheduler().runTaskLater(SimpleBucketMobs.getPlugin(), () -> {
+            Location location = block.getLocation().toCenterLocation();
+            if (!block.isPassable()) location = location.add(0, 1, 0);
+            EntitySnapshot entitySnapshot = Bukkit.getEntityFactory().createEntitySnapshot(nbt);
+            entitySnapshot.createEntity(location);
+            player.getInventory().setItemInMainHand(new ItemStack(Material.BUCKET));
+            pleaseStopDuplicatingMobsThanks.remove(itemStack);
+        }, 2L);
+    }
+
+    /**
+     * Sets the NMS entity's position directly before it is added to a world.
+     * {@code Entity.teleport()} requires the entity to already be in a world, so we reach
+     * into the NMS layer via reflection to update the position fields while the entity is
+     * still unspawned. Paper 1.21+ uses Mojang mappings at runtime, so the method name
+     * {@code setPos} is stable.
+     */
+    private static void setNmsPosition(Entity entity, Location location) {
+        if (getHandleMethod == null || setPosMethod == null) {
+            logger.warn("NMS position methods unavailable; mob may spawn at its capture location");
+            return;
+        }
+        try {
+            Object nmsEntity = getHandleMethod.invoke(entity);
+            setPosMethod.invoke(nmsEntity, location.getX(), location.getY(), location.getZ());
+        } catch (Exception e) {
+            logger.warn("Failed to set NMS entity position before spawn", e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/simplexity/simplebucketmobs/listener/InteractListeners.java b/src/main/java/simplexity/simplebucketmobs/listener/InteractListeners.java
new file mode 100644
index 0000000..ac110bd
--- /dev/null
+++ b/src/main/java/simplexity/simplebucketmobs/listener/InteractListeners.java
@@ -0,0 +1,101 @@
+package simplexity.simplebucketmobs.listener;
+
+import io.papermc.paper.persistence.PersistentDataContainerView;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.key.Key;
+import net.kyori.adventure.sound.Sound;
+import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Monster;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerBucketFillEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.ItemStack;
+import simplexity.simplebucketmobs.SimpleBucketMobs;
+import simplexity.simplebucketmobs.config.ConfigHandler;
+import simplexity.simplebucketmobs.util.BucketMobPermission;
+import simplexity.simplebucketmobs.util.Message;
+
+public class InteractListeners implements Listener {
+
+    public static final NamespacedKey legacyMobTag = new NamespacedKey(SimpleBucketMobs.getPlugin(), "mob_nbt");
+    public static final NamespacedKey newMobTag = new NamespacedKey(SimpleBucketMobs.getPlugin(), "serialized_mob_data");
+
+    @EventHandler(ignoreCancelled = true)
+    public void onBucketMob(PlayerInteractEntityEvent interactEvent) {
+        // Only process main-hand interactions so we don't act on off-hand triggers
+        if (!interactEvent.getHand().equals(EquipmentSlot.HAND)) return;
+        Entity entity = interactEvent.getRightClicked();
+        Player player = interactEvent.getPlayer();
+        if (!(entity instanceof LivingEntity livingEntity)) return;
+        EntityType type = livingEntity.getType();
+        if (!ConfigHandler.getInstance().bucketingAllowed(type)) return;
+        ItemStack itemInHand = player.getInventory().getItemInMainHand();
+        if (!itemInHand.getType().equals(Material.BUCKET)) return;
+        PersistentDataContainerView bucketPdcView = itemInHand.getPersistentDataContainer();
+        if (bucketPdcView.has(legacyMobTag) || bucketPdcView.has(newMobTag)) return;
+        // Permission failure falls back to vanilla — player can still interact normally (e.g. milk a cow)
+        if (ConfigHandler.getInstance().requiresExplicitPermission(type) &&
+            !player.hasPermission(BucketMobPermission.getBucketMobPermission(type))) {
+            player.sendRichMessage(Message.ERROR_BUCKET_NO_PERMISSION.getMessage(),
+                    Placeholder.parsed("prefix", Message.PREFIX.getMessage()));
+            return;
+        }
+        // From here the plugin owns the interaction; cancel so vanilla can't fire (e.g. cow milking sound)
+        interactEvent.setCancelled(true);
+        if (ConfigHandler.getInstance().isSneakRequired(type) && !player.isSneaking()) return;
+        if (livingEntity instanceof Monster monster) {
+            LivingEntity target = monster.getTarget();
+            // isAggressive() is unreliable for mobs like Slime/Spider — targeting the player is sufficient
+            if (target != null && !ConfigHandler.getInstance().canPickupWhenAggro(type) && target.equals(player)) {
+                player.sendRichMessage(Message.ERROR_BUCKET_HOSTILE_TARGETING.getMessage(),
+                        Placeholder.parsed("prefix", Message.PREFIX.getMessage()));
+                return;
+            }
+        }
+        ItemStack bucketItem = BucketHandler.getMobBucket(livingEntity);
+        BucketHandler.addMobBucketToInventory(player, bucketItem);
+        player.playSound(Sound.sound(Key.key("minecraft", "item.bucket.fill_fish"), Sound.Source.PLAYER, 1.0f, 1.0f));
+        livingEntity.remove();
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    public void onUnbucketMob(PlayerInteractEvent interactEvent) {
+        // Only process main-hand interactions; off-hand fires a duplicate event
+        EquipmentSlot hand = interactEvent.getHand();
+        if (hand == null || !hand.equals(EquipmentSlot.HAND)) return;
+        Player player = interactEvent.getPlayer();
+        ItemStack itemStack = player.getInventory().getItemInMainHand();
+        PersistentDataContainerView bucketPdc = itemStack.getPersistentDataContainer();
+        Block block = interactEvent.getClickedBlock();
+        if (interactEvent.getAction().isLeftClick()) return;
+        if (!interactEvent.hasBlock()) return;
+        if (block == null || block.getType().equals(Material.AIR)) return;
+        if (!(itemStack.getType().equals(Material.BUCKET) || itemStack.getType().equals(ConfigHandler.getInstance().getMobBucketMaterial()))) return;
+        if (!(bucketPdc.has(newMobTag) || bucketPdc.has(legacyMobTag))) return;
+        interactEvent.setCancelled(true);
+        if (bucketPdc.has(newMobTag)) EntityHandler.handleMobSpawn(player, itemStack, block);
+        if (bucketPdc.has(legacyMobTag)) EntityHandler.handleLegacyMobSpawn(player, itemStack, block);
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    public void onBlockBucketEvent(PlayerBucketFillEvent bucketFillEvent){
+        EquipmentSlot handUsed = bucketFillEvent.getHand();
+        ItemStack itemUsed;
+        if (handUsed.equals(EquipmentSlot.HAND)) {
+            itemUsed = bucketFillEvent.getPlayer().getInventory().getItemInMainHand();
+        } else {
+            itemUsed = bucketFillEvent.getPlayer().getInventory().getItemInOffHand();
+        }
+        if (itemUsed.getPersistentDataContainer().has(legacyMobTag) ||
+            itemUsed.getPersistentDataContainer().has(newMobTag)) bucketFillEvent.setCancelled(true);
+    }
+}
diff --git a/src/main/java/simplexity/simplebucketmobs/util/BucketMobPermission.java b/src/main/java/simplexity/simplebucketmobs/util/BucketMobPermission.java
new file mode 100644
index 0000000..fc33f16
--- /dev/null
+++ b/src/main/java/simplexity/simplebucketmobs/util/BucketMobPermission.java
@@ -0,0 +1,36 @@
+package simplexity.simplebucketmobs.util;
+
+import org.bukkit.entity.EntityType;
+import org.bukkit.permissions.Permission;
+import org.bukkit.permissions.PermissionDefault;
+import org.jetbrains.annotations.NotNull;
+
+public enum BucketMobPermission {
+    DEBUCKET_COMMAND("simplebucketmobs.debucket", "Display serialized mob data from a held Mob Bucket.", PermissionDefault.OP),
+    COMMAND_RELOAD("simplebucketmobs.reload", "Reload plugin configuration files.", PermissionDefault.OP),
+    BUCKET_MOB_BASE("simplebucketmobs.use", "Allows the user to bucket mobs.", PermissionDefault.TRUE);
+
+    private final String node;
+    private final Permission permission;
+
+    BucketMobPermission(@NotNull String node, @NotNull String description, @NotNull PermissionDefault permissionDefault) {
+        this.node = node;
+        this.permission = new Permission(node, description, permissionDefault);
+    }
+
+    @NotNull
+    public Permission getPermission() {
+        return permission;
+    }
+
+    @NotNull
+    public String getNode() {
+        return node;
+    }
+
+    @NotNull
+    public static Permission getBucketMobPermission(@NotNull EntityType type) {
+        String permName = BUCKET_MOB_BASE.node + "." + type.toString().toLowerCase();
+        return new Permission(permName, PermissionDefault.OP);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/simplexity/simplebucketmobs/util/Message.java b/src/main/java/simplexity/simplebucketmobs/util/Message.java
index 341bd9d..d343401 100644
--- a/src/main/java/simplexity/simplebucketmobs/util/Message.java
+++ b/src/main/java/simplexity/simplebucketmobs/util/Message.java
@@ -8,9 +8,6 @@ public enum Message {
 
     PREFIX("<white>[<aqua>SimpleBucketMobs</aqua>]</white> <gray>»</gray> "),
 
-    LOGGER_INVALID_LOCALE_KEY("Invalid Key in locale.yml: "),
-    LOGGER_INVALID_MOB_TYPE("Invalid Mob Type in config.yml: "),
-
     ERROR_NOT_A_PLAYER("<prefix><red>This command can only be executed by a player.</red>"),
     ERROR_NO_BUCKET_MOB("<prefix><red>This is not a bucket mob, please report this to a server admin.</red>"),
     ERROR_FAILED_DESERIALIZATION("<prefix><red>Failed to deserialize mob, please report this to a server admin.</red>"),
diff --git a/src/main/java/simplexity/simplebucketmobs/util/Permission.java b/src/main/java/simplexity/simplebucketmobs/util/Permission.java
deleted file mode 100644
index 6b29aa1..0000000
--- a/src/main/java/simplexity/simplebucketmobs/util/Permission.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package simplexity.simplebucketmobs.util;
-
-public enum Permission {
-
-    COMMAND_DEBUCKET("simplebucketmobs.debucket"),
-    COMMAND_RELOAD("simplebucketmobs.reload"),
-
-    BUCKET_MOB("simplebucketmobs.bucket."),
-    BUCKET_ALL("simplebucketmobs.bucket.all");
-
-    final String permission;
-
-    Permission(String permission) {
-        this.permission = permission;
-    }
-
-    public String get() { return this.permission; }
-
-}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 7a36628..4c0e944 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,21 +1,51 @@
 # <type>: Returns the literal type of the entity (ie: SHEEP)
 # <type_name_cased>: Returns the literal type of the entity but not screaming (ie: Sheep)
 # <display_name>: Returns the display name or the type_name_cased if it is not named (ie: _jeb)
-bucket-title: "<aqua><display_name> in a Bucket"
+
+capture-tool-style:
+  default:
+    name: default
+    enchantment-glint: false
+    item-model: "minecraft:bucket"
+    item-type: BUCKET
+    stack-size: default
+mob-bucket-style:
+  use-resource-pack: false
+  default:
+    item-type: BUCKET
+    item-model: "minecraft:bucket"
+    name: "<aqua><display_name> in a Bucket"
+    lore:
+      - "<gray>A <type_name_cased> sits in the bucket</gray>"
+    enchantment-glint: true
 # Whether the plugin should set the textures to the ones specified in texture.yml, defaults are from
 # https://modrinth.com/resourcepack/bucket-mobs-resources/versions
-use-resource-pack: true
-
-# Hostile mobs cannot be bucketed if they are targeting you.
-no-hostile-targeting: true
-# The allowed types of entities that the bucket can be used on.
+# The settings for the bucket-able mobs, or non-bucketable mobs. Fields left empty or non-existent will fall back to default
+# And if there is not a default, will default to 'false'
 # List of Entity Types here: https://purpurmc.org/javadoc/org/bukkit/entity/EntityType.html
-# Only LivingEntity types can be used (unless it's an Armor Stand / Player, it will not work).
-#   Fun fact: Armor Stand is a "Living Entity".
-allowed-types:
-  - SHEEP
-  - COW
-  - PIG
-# If true, the above list will be the types that are not allowed to be picked up.
-# Note, mobs that can already be picked up with a bucket are disabled by default.
-list-is-blacklist: false
\ No newline at end of file
+bucket-type-settings:
+  default:
+    allow: false
+    capture-tool: default
+    mob-bucket: default
+    sneak-required: false
+    pickup-when-aggro: false
+    requires-permission: false
+  types:
+    VILLAGER:
+      allow: true
+      sneak-required: true
+      requires-permission: true
+    SLIME:
+      allow: true
+      pickup-when-aggro: true
+    SHEEP:
+      allow: true
+    COW:
+      allow: true
+      sneak-required: true
+    PIG:
+      allow: true
+    MOOSHROOM:
+      allow: true
+      sneak-required: true
\ No newline at end of file
diff --git a/src/main/resources/locale.yml b/src/main/resources/locale.yml
index afb21ca..da8f93f 100644
--- a/src/main/resources/locale.yml
+++ b/src/main/resources/locale.yml
@@ -1,8 +1,5 @@
 PREFIX: "<white>[<aqua>SimpleBucketMobs</aqua>]</white> <gray>»</gray> "
 
-LOGGER_INVALID_LOCALE_KEY: "Invalid Key in locale.yml: "
-LOGGER_INVALID_MOB_TYPE: "Invalid Mob Type in config.yml: "
-
 ERROR_NOT_A_PLAYER: "<prefix><red>This command can only be executed by a player.</red>"
 ERROR_NO_BUCKET_MOB: "<prefix><red>This is not a bucket mob, please report this to a server admin.</red>"
 ERROR_FAILED_DESERIALIZATION: "<prefix><red>Failed to deserialize mob, please report this to a server admin.</red>"
diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml
new file mode 100644
index 0000000..86d14e4
--- /dev/null
+++ b/src/main/resources/paper-plugin.yml
@@ -0,0 +1,8 @@
+name: SimpleBucketMobs
+version: "${version}"
+main: simplexity.simplebucketmobs.SimpleBucketMobs
+api-version: "1.21"
+description: "Shove your mobs into buckets like Axolotls! :D"
+authors:
+  - Rhythmic
+  - Peashooter101
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
deleted file mode 100644
index 822cdfd..0000000
--- a/src/main/resources/plugin.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: SimpleBucketMobs
-group: simplexity
-version: "${version}"
-main: simplexity.simplebucketmobs.SimpleBucketMobs
-api-version: "1.20"
-authors: [ Rhythmic, Peashooter101 ]
-description: Shove your mobs into buckets like Axolotls! :D
-commands:
-  simplebucketmobs:
-    description: "SimpleBucketMobs Base Command."
-    aliases: ["sbm", "simplebucketmob"]
-permissions:
-  simplebucketmobs.bucket.<mob>:
-    description: "Allows the user to bucket the specified mob."
-    default: false
-  simplebucketmobs.bucket.all:
-    description: "Allows the user to bucket all enabled mobs."
-    default: op
-  simplebucketmobs.reload:
-    description: "Reload plugin configuration files."
-    default: op
-  simplebucketmobs.debucket:
-    description: "Dump saved mob NBT data from Mob Bucket to chat."
\ No newline at end of file
diff --git a/src/main/resources/texture.yml b/src/main/resources/texture.yml
index 69a97f0..64b532a 100644
--- a/src/main/resources/texture.yml
+++ b/src/main/resources/texture.yml
@@ -10,326 +10,332 @@
 #     ...
 #     {nbtValue}: {custom model data}
 ###
-ALLAY:
+allay:
   default: "simplexity:bucket_mobs/misc/allay"
-ARMADILLO:
+armadillo:
   default: "simplexity:bucket_mobs/misc/armadillo"
-BAT:
+bat:
   default: "simplexity:bucket_mobs/misc/bat"
-BEE:
+bee:
   default: "simplexity:bucket_mobs/misc/bee"
-BLAZE:
+blaze:
   default: "simplexity:bucket_mobs/misc/blaze"
-BOGGED:
+bogged:
   default: "simplexity:bucket_mobs/skeleton/bogged"
-BREEZE:
+breeze:
   default: "simplexity:bucket_mobs/misc/breeze"
-CAMEL:
+camel:
   default: "simplexity:bucket_mobs/misc/camel"
-CAT:
+cat:
   default: "simplexity:bucket_mobs/cat/black"
-  variant:
-    "minecraft:tabby": "simplexity:bucket_mobs/cat/tabby"
-    "minecraft:black": "simplexity:bucket_mobs/cat/black"
-    "minecraft:red": "simplexity:bucket_mobs/cat/red"
-    "minecraft:siamese": "simplexity:bucket_mobs/cat/siamese"
-    "minecraft:british_shorthair": "simplexity:bucket_mobs/cat/british_shorthair"
-    "minecraft:calico": "simplexity:bucket_mobs/cat/calico"
-    "minecraft:persian": "simplexity:bucket_mobs/cat/persian"
-    "minecraft:ragdoll": "simplexity:bucket_mobs/cat/ragdoll"
-    "minecraft:white": "simplexity:bucket_mobs/cat/white"
-    "minecraft:jellie": "simplexity:bucket_mobs/cat/jellie"
-    "minecraft:all_black": "simplexity:bucket_mobs/cat/all_black"
-CAVE_SPIDER:
+  type:
+    tabby: "simplexity:bucket_mobs/cat/tabby"
+    black: "simplexity:bucket_mobs/cat/black"
+    red: "simplexity:bucket_mobs/cat/red"
+    siamese: "simplexity:bucket_mobs/cat/siamese"
+    british_shorthair: "simplexity:bucket_mobs/cat/british_shorthair"
+    calico: "simplexity:bucket_mobs/cat/calico"
+    persian: "simplexity:bucket_mobs/cat/persian"
+    ragdoll: "simplexity:bucket_mobs/cat/ragdoll"
+    white: "simplexity:bucket_mobs/cat/white"
+    jellie: "simplexity:bucket_mobs/cat/jellie"
+    all_black: "simplexity:bucket_mobs/cat/all_black"
+cave_spider:
   default: "simplexity:bucket_mobs/misc/cave_spider"
-CHICKEN:
-  default: "simplexity:bucket_mobs/misc/chicken"
-COW:
-  default: "simplexity:bucket_mobs/cow/cow"
-CREAKING:
+chicken:
+  default: "simplexity:bucket_mobs/chicken/temperate"
+  type:
+    cold: "simplexity:bucket_mobs/chicken/cold"
+    temperate: "simplexity:bucket_mobs/chicken/temperate"
+    warm: "simplexity:bucket_mobs/chicken/warm"
+cow:
+  default: "simplexity:bucket_mobs/cow/temperate"
+  type:
+    cold: "simplexity:bucket_mobs/cow/cold"
+    temperate: "simplexity:bucket_mobs/cow/temperate"
+    warm: "simplexity:bucket_mobs/cow/warm"
+creaking:
   default: "simplexity:bucket_mobs/misc/creaking"
-CREEPER:
+creeper:
   default: "simplexity:bucket_mobs/misc/creeper"
-  powered:
-    1b: "simplexity:bucket_mobs/misc/charged_creeper"
-DOLPHIN:
+  type:
+    powered: "simplexity:bucket_mobs/misc/charged_creeper"
+dolphin:
   default: "simplexity:bucket_mobs/misc/dolphin"
-DONKEY:
+donkey:
   default: "simplexity:bucket_mobs/horse/donkey_default"
-DROWNED:
+drowned:
   default: "simplexity:bucket_mobs/zombie/drowned"
-ELDER_GUARDIAN:
+elder_guardian:
   default: "simplexity:bucket_mobs/misc/elder_guardian"
-ENDER_DRAGON:
+ender_dragon:
   default: "simplexity:bucket_mobs/misc/ender_dragon"
-ENDERMAN:
+enderman:
   default: "simplexity:bucket_mobs/misc/enderman"
-ENDERMITE:
+endermite:
   default: "simplexity:bucket_mobs/misc/endermite"
-EVOKER:
+evoker:
   default: "simplexity:bucket_mobs/illager/evoker"
-FOX:
+fox:
   default: "simplexity:bucket_mobs/misc/fox"
-  Type:
+  type:
     red: "simplexity:bucket_mobs/misc/fox"
     snow: "simplexity:bucket_mobs/misc/snow_fox"
-FROG:
+frog:
   default: "simplexity:bucket_mobs/frog/cold"
-  variant:
-    "minecraft:cold": "simplexity:bucket_mobs/frog/cold"
-    "minecraft:temperate": "simplexity:bucket_mobs/frog/temperate"
-    "minecraft:warm": "simplexity:bucket_mobs/frog/warm"
-GHAST:
+  type:
+    cold: "simplexity:bucket_mobs/frog/cold"
+    temperate: "simplexity:bucket_mobs/frog/temperate"
+    warm: "simplexity:bucket_mobs/frog/warm"
+ghast:
   default: "simplexity:bucket_mobs/misc/ghast"
-GLOW_SQUID:
+glow_squid:
   default: "simplexity:bucket_mobs/misc/glow_squid"
-GOAT:
+goat:
   default: "simplexity:bucket_mobs/misc/goat"
-GIANT:
+giant:
   default: "simplexity:bucket_mobs/zombie/zombie"
-GUARDIAN:
+guardian:
   default: "simplexity:bucket_mobs/misc/guardian"
-HOGLIN:
+hoglin:
   default: "simplexity:bucket_mobs/misc/hoglin"
-HORSE:
+horse:
   default: "simplexity:bucket_mobs/horse/brown_default"
-  Variant:
-    0: "simplexity:bucket_mobs/horse/white_default"
-    1: "simplexity:bucket_mobs/horse/creamy_default"
-    2: "simplexity:bucket_mobs/horse/chestnut_default"
-    3: "simplexity:bucket_mobs/horse/brown_default"
-    4: "simplexity:bucket_mobs/horse/black_default"
-    5: "simplexity:bucket_mobs/horse/gray_default"
-    6: "simplexity:bucket_mobs/horse/dark_brown_default"
-    256: "simplexity:bucket_mobs/horse/white_white_stockings_and_blaze"
-    257: "simplexity:bucket_mobs/horse/creamy_white_stockings_and_blaze"
-    258: "simplexity:bucket_mobs/horse/chestnut_white_stockings_and_blaze"
-    259: "simplexity:bucket_mobs/horse/brown_white_stockings_and_blaze"
-    260: "simplexity:bucket_mobs/horse/black_white_stockings_and_blaze"
-    261: "simplexity:bucket_mobs/horse/gray_white_stockings_and_blaze"
-    262: "simplexity:bucket_mobs/horse/dark_brown_white_stockings_and_blaze"
-    512: "simplexity:bucket_mobs/horse/white_white_field"
-    513: "simplexity:bucket_mobs/horse/creamy_white_field"
-    514: "simplexity:bucket_mobs/horse/chestnut_white_field"
-    515: "simplexity:bucket_mobs/horse/brown_white_field"
-    516: "simplexity:bucket_mobs/horse/black_white_field"
-    517: "simplexity:bucket_mobs/horse/gray_white_field"
-    518: "simplexity:bucket_mobs/horse/dark_brown_white_field"
-    768: "simplexity:bucket_mobs/horse/white_white_spots"
-    769: "simplexity:bucket_mobs/horse/creamy_white_spots"
-    770: "simplexity:bucket_mobs/horse/chestnut_white_spots"
-    771: "simplexity:bucket_mobs/horse/brown_white_spots"
-    772: "simplexity:bucket_mobs/horse/black_white_spots"
-    773: "simplexity:bucket_mobs/horse/gray_white_spots"
-    774: "simplexity:bucket_mobs/horse/dark_brown_spots"
-    1024: "simplexity:bucket_mobs/horse/white_default"
-    1025: "simplexity:bucket_mobs/horse/creamy_default"
-    1026: "simplexity:bucket_mobs/horse/chestnut_default"
-    1027: "simplexity:bucket_mobs/horse/brown_default"
-    1028: "simplexity:bucket_mobs/horse/black_default"
-    1029: "simplexity:bucket_mobs/horse/gray_default"
-    1030: "simplexity:bucket_mobs/horse/dark_brown_default"
-HUSK:
+  type:
+    white_none: "simplexity:bucket_mobs/horse/white_default"
+    creamy_none: "simplexity:bucket_mobs/horse/creamy_default"
+    chestnut_none: "simplexity:bucket_mobs/horse/chestnut_default"
+    brown_none: "simplexity:bucket_mobs/horse/brown_default"
+    black_none: "simplexity:bucket_mobs/horse/black_default"
+    gray_none: "simplexity:bucket_mobs/horse/gray_default"
+    dark_brown_none: "simplexity:bucket_mobs/horse/dark_brown_default"
+    white_white_stockings: "simplexity:bucket_mobs/horse/white_white_stockings_and_blaze"
+    creamy_white_stockings: "simplexity:bucket_mobs/horse/creamy_white_stockings_and_blaze"
+    chestnut_white_stockings: "simplexity:bucket_mobs/horse/chestnut_white_stockings_and_blaze"
+    brown_white_stockings: "simplexity:bucket_mobs/horse/brown_white_stockings_and_blaze"
+    black_white_stockings: "simplexity:bucket_mobs/horse/black_white_stockings_and_blaze"
+    gray_white_stockings: "simplexity:bucket_mobs/horse/gray_white_stockings_and_blaze"
+    dark_brown_white_stockings: "simplexity:bucket_mobs/horse/dark_brown_white_stockings_and_blaze"
+    white_white_field: "simplexity:bucket_mobs/horse/white_white_field"
+    creamy_white_field: "simplexity:bucket_mobs/horse/creamy_white_field"
+    chestnut_white_field: "simplexity:bucket_mobs/horse/chestnut_white_field"
+    brown_white_field: "simplexity:bucket_mobs/horse/brown_white_field"
+    black_white_field: "simplexity:bucket_mobs/horse/black_white_field"
+    gray_white_field: "simplexity:bucket_mobs/horse/gray_white_field"
+    dark_brown_white_field: "simplexity:bucket_mobs/horse/dark_brown_white_field"
+    white_spots: "simplexity:bucket_mobs/horse/white_white_spots"
+    creamy_spots: "simplexity:bucket_mobs/horse/creamy_white_spots"
+    chestnut_spots: "simplexity:bucket_mobs/horse/chestnut_white_spots"
+    brown_spots: "simplexity:bucket_mobs/horse/brown_white_spots"
+    black_spots: "simplexity:bucket_mobs/horse/black_white_spots"
+    gray_spots: "simplexity:bucket_mobs/horse/gray_white_spots"
+    dark_brown_spots: "simplexity:bucket_mobs/horse/dark_brown_spots"
+husk:
   default: "simplexity:bucket_mobs/zombie/husk"
-ILLUSIONER:
+illusioner:
   default: "simplexity:bucket_mobs/illager/illusioner"
-IRON_GOLEM:
+iron_golem:
   default: "simplexity:bucket_mobs/misc/iron_golem"
-LLAMA:
+llama:
   default: "simplexity:bucket_mobs/llama/brown_default"
-  Variant:
-    0: "simplexity:bucket_mobs/llama/creamy_default"    # Creamy
-    1: "simplexity:bucket_mobs/llama/white_default"    # White
-    2: "simplexity:bucket_mobs/llama/brown_default"    # Brown
-    3: "simplexity:bucket_mobs/llama/gray_default"    # Gray
-MAGMA_CUBE:
+  type:
+    creamy: "simplexity:bucket_mobs/llama/creamy_default"
+    white: "simplexity:bucket_mobs/llama/white_default"
+    brown: "simplexity:bucket_mobs/llama/brown_default"
+    gray: "simplexity:bucket_mobs/llama/gray_default"
+magma_cube:
   default: "simplexity:bucket_mobs/misc/magma_cube"
-MULE:
+mule:
   default: "simplexity:bucket_mobs/horse/mule_default"
-MUSHROOM_COW:
+mushroom_cow:
   default: "simplexity:bucket_mobs/cow/mooshroom"
-  Type:
+  type:
     red: "simplexity:bucket_mobs/cow/mooshroom"
     brown: "simplexity:bucket_mobs/cow/brown_mooshroom"
-OCELOT:
+ocelot:
   default: "simplexity:bucket_mobs/cat/ocelot"
-PANDA:
+panda:
   default: "simplexity:bucket_mobs/panda/panda"
-PARROT:
+parrot:
   default: "simplexity:bucket_mobs/parrot/red_blue"
-  Variant:
-    0: "simplexity:bucket_mobs/parrot/red_blue"    # Red Blue
-    1: "simplexity:bucket_mobs/parrot/blue"   # Blue
-    2: "simplexity:bucket_mobs/parrot/green"    # Green
-    3: "simplexity:bucket_mobs/parrot/yellow_blue"   # Yellow Blue
-    4: "simplexity:bucket_mobs/parrot/gray"    # Gray
-PHANTOM:
+  type:
+    red: "simplexity:bucket_mobs/parrot/red_blue"
+    blue: "simplexity:bucket_mobs/parrot/blue"
+    green: "simplexity:bucket_mobs/parrot/green"
+    cyan: "simplexity:bucket_mobs/parrot/yellow_blue"
+    gray: "simplexity:bucket_mobs/parrot/gray"
+phantom:
   default: "simplexity:bucket_mobs/misc/phantom"
-PIG:
-  default: "simplexity:bucket_mobs/misc/pig"
-PIGLIN_BRUTE:
+pig:
+  default: "simplexity:bucket_mobs/pig/temperate"
+  type:
+    cold: "simplexity:bucket_mobs/pig/cold"
+    temperate: "simplexity:bucket_mobs/pig/temperate"
+    warm: "simplexity:bucket_mobs/pig/warm"
+piglin_brute:
   default: "simplexity:bucket_mobs/piglin/piglin_brute"
-PIGLIN:
+piglin:
   default: "simplexity:bucket_mobs/piglin/piglin"
-PILLAGER:
+pillager:
   default: "simplexity:bucket_mobs/illager/pillager"
-POLAR_BEAR:
+polar_bear:
   default: "simplexity:bucket_mobs/misc/polar_bear"
-RABBIT:
+rabbit:
   default: "simplexity:bucket_mobs/rabbit/brown"
-  RabbitType:
-    0: "simplexity:bucket_mobs/rabbit/brown"    # Brown
-    1: "simplexity:bucket_mobs/rabbit/white"    # White
-    2: "simplexity:bucket_mobs/rabbit/black"    # Black
-    3: "simplexity:bucket_mobs/rabbit/white_splotched"    # White Splotched
-    4: "simplexity:bucket_mobs/rabbit/gold"    # Gold
-    5: "simplexity:bucket_mobs/rabbit/toast"    # Salt and Pepper
-    99: "simplexity:bucket_mobs/rabbit/caerbannog"   # Evil / Killer
-RAVAGER:
+  type:
+    brown: "simplexity:bucket_mobs/rabbit/brown"
+    white: "simplexity:bucket_mobs/rabbit/white"
+    black: "simplexity:bucket_mobs/rabbit/black"
+    black_and_white: "simplexity:bucket_mobs/rabbit/white_splotched"
+    gold: "simplexity:bucket_mobs/rabbit/gold"
+    salt_and_pepper: "simplexity:bucket_mobs/rabbit/toast"
+    the_killer_bunny: "simplexity:bucket_mobs/rabbit/caerbannog"
+ravager:
   default: "simplexity:bucket_mobs/illager/ravager"
-SHEEP:
+sheep:
   default: "simplexity:bucket_mobs/sheep/white"
-  Color:
-    0b: "simplexity:bucket_mobs/sheep/white"      # White
-    1b: "simplexity:bucket_mobs/sheep/orange"     # Orange
-    2b: "simplexity:bucket_mobs/sheep/magenta"    # Magenta
-    3b: "simplexity:bucket_mobs/sheep/light_blue" # Light Blue
-    4b: "simplexity:bucket_mobs/sheep/yellow"     # Yellow
-    5b: "simplexity:bucket_mobs/sheep/lime"       # Lime
-    6b: "simplexity:bucket_mobs/sheep/pink"       # Pink
-    7b: "simplexity:bucket_mobs/sheep/gray"       # Gray
-    8b: "simplexity:bucket_mobs/sheep/light_gray" # Light Gray
-    9b: "simplexity:bucket_mobs/sheep/cyan"       # Cyan
-    10b: "simplexity:bucket_mobs/sheep/purple"    # Purple
-    11b: "simplexity:bucket_mobs/sheep/blue"      # Blue
-    12b: "simplexity:bucket_mobs/sheep/brown"     # Brown
-    13b: "simplexity:bucket_mobs/sheep/green"     # Green
-    14b: "simplexity:bucket_mobs/sheep/red"       # Red
-    15b: "simplexity:bucket_mobs/sheep/black"     # Black
-SHULKER:
+  type:
+    white: "simplexity:bucket_mobs/sheep/white"
+    orange: "simplexity:bucket_mobs/sheep/orange"
+    magenta: "simplexity:bucket_mobs/sheep/magenta"
+    light_blue: "simplexity:bucket_mobs/sheep/light_blue"
+    yellow: "simplexity:bucket_mobs/sheep/yellow"
+    lime: "simplexity:bucket_mobs/sheep/lime"
+    pink: "simplexity:bucket_mobs/sheep/pink"
+    gray: "simplexity:bucket_mobs/sheep/gray"
+    light_gray: "simplexity:bucket_mobs/sheep/light_gray"
+    cyan: "simplexity:bucket_mobs/sheep/cyan"
+    purple: "simplexity:bucket_mobs/sheep/purple"
+    blue: "simplexity:bucket_mobs/sheep/blue"
+    brown: "simplexity:bucket_mobs/sheep/brown"
+    green: "simplexity:bucket_mobs/sheep/green"
+    red: "simplexity:bucket_mobs/sheep/red"
+    black: "simplexity:bucket_mobs/sheep/black"
+shulker:
   default: "simplexity:bucket_mobs/shulker/default"
-  Color:
-    0b: "simplexity:bucket_mobs/shulker/white"      # White
-    1b: "simplexity:bucket_mobs/shulker/orange"     # Orange
-    2b: "simplexity:bucket_mobs/shulker/magenta"    # Magenta
-    3b: "simplexity:bucket_mobs/shulker/light_blue" # Light Blue
-    4b: "simplexity:bucket_mobs/shulker/yellow"     # Yellow
-    5b: "simplexity:bucket_mobs/shulker/lime"       # Lime
-    6b: "simplexity:bucket_mobs/shulker/pink"       # Pink
-    7b: "simplexity:bucket_mobs/shulker/gray"       # Gray
-    8b: "simplexity:bucket_mobs/shulker/light_gray" # Light Gray
-    9b: "simplexity:bucket_mobs/shulker/cyan"       # Cyan
-    10b: "simplexity:bucket_mobs/shulker/purple"    # Purple
-    11b: "simplexity:bucket_mobs/shulker/blue"      # Blue
-    12b: "simplexity:bucket_mobs/shulker/brown"     # Brown
-    13b: "simplexity:bucket_mobs/shulker/green"     # Green
-    14b: "simplexity:bucket_mobs/shulker/red"       # Red
-    15b: "simplexity:bucket_mobs/shulker/black"     # Black
-    16b: "simplexity:bucket_mobs/shulker/default"
-SILVERFISH:
+  type:
+    white: "simplexity:bucket_mobs/shulker/white"
+    orange: "simplexity:bucket_mobs/shulker/orange"
+    magenta: "simplexity:bucket_mobs/shulker/magenta"
+    light_blue: "simplexity:bucket_mobs/shulker/light_blue"
+    yellow: "simplexity:bucket_mobs/shulker/yellow"
+    lime: "simplexity:bucket_mobs/shulker/lime"
+    pink: "simplexity:bucket_mobs/shulker/pink"
+    gray: "simplexity:bucket_mobs/shulker/gray"
+    light_gray: "simplexity:bucket_mobs/shulker/light_gray"
+    cyan: "simplexity:bucket_mobs/shulker/cyan"
+    purple: "simplexity:bucket_mobs/shulker/purple"
+    blue: "simplexity:bucket_mobs/shulker/blue"
+    brown: "simplexity:bucket_mobs/shulker/brown"
+    green: "simplexity:bucket_mobs/shulker/green"
+    red: "simplexity:bucket_mobs/shulker/red"
+    black: "simplexity:bucket_mobs/shulker/black"
+    default: "simplexity:bucket_mobs/shulker/default"
+silverfish:
   default: "simplexity:bucket_mobs/misc/silver_fish"
-SKELETON:
+skeleton:
   default: "simplexity:bucket_mobs/skeleton/skeleton"
-SKELETON_HORSE:
+skeleton_horse:
   default: "simplexity:bucket_mobs/horse/skeleton_default"
-SLIME:
+slime:
   default: "simplexity:bucket_mobs/misc/slime"
-SNIFFER:
+sniffer:
   default: "simplexity:bucket_mobs/misc/sniffer"
-SNOWMAN:
+snowman:
   default: "simplexity:bucket_mobs/misc/pumpkin_golem"
-SPIDER:
+spider:
   default: "simplexity:bucket_mobs/misc/spider"
-SQUID:
+squid:
   default: "simplexity:bucket_mobs/misc/squid"
-STRAY:
+stray:
   default: "simplexity:bucket_mobs/skeleton/stray"
-STRIDER:
+strider:
   default: "simplexity:bucket_mobs/misc/warm_strider"
-TRADER_LLAMA:
+trader_llama:
   default: "simplexity:bucket_mobs/llama/brown_trader"
-  Variant:
-    0: "simplexity:bucket_mobs/llama/creamy_trader"    # Creamy
-    1: "simplexity:bucket_mobs/llama/white_trader"    # White
-    2: "simplexity:bucket_mobs/llama/brown_trader"    # Brown
-    3: "simplexity:bucket_mobs/llama/gray_trader"    # Gray
-TURTLE:
+  type:
+    creamy: "simplexity:bucket_mobs/llama/creamy_trader"    # Creamy
+    white: "simplexity:bucket_mobs/llama/white_trader"    # White
+    brown: "simplexity:bucket_mobs/llama/brown_trader"    # Brown
+    gray: "simplexity:bucket_mobs/llama/gray_trader"    # Gray
+turtle:
   default: "simplexity:bucket_mobs/misc/turtle"
-VEX:
+vex:
   default: "simplexity:bucket_mobs/misc/vex"
-VILLAGER:
+villager:
   default: "simplexity:bucket_mobs/villager/default_default"
-  VillagerData:
-    profession:
-      "minecraft:armorer": "simplexity:bucket_mobs/villager/armorer"
-      "minecraft:butcher": "simplexity:bucket_mobs/villager/butcher"
-      "minecraft:cartographer": "simplexity:bucket_mobs/villager/default_default"
-      "minecraft:cleric": "simplexity:bucket_mobs/villager/default_cleric"
-      "minecraft:farmer": "simplexity:bucket_mobs/villager/default_farmer"
-      "minecraft:fisherman": "simplexity:bucket_mobs/villager/default_fisherman"
-      "minecraft:fletcher": "simplexity:bucket_mobs/villager/default_fletcher"
-      "minecraft:leatherworker": "simplexity:bucket_mobs/villager/default_default"
-      "minecraft:librarian": "simplexity:bucket_mobs/villager/default_librarian"
-      "minecraft:nitwit": "simplexity:bucket_mobs/villager/default_default"
-      "minecraft:none": "simplexity:bucket_mobs/villager/default_default"
-      "minecraft:mason": "simplexity:bucket_mobs/villager/default_default"
-      "minecraft:shepherd": "simplexity:bucket_mobs/villager/default_shepherd"
-      "minecraft:toolsmith": "simplexity:bucket_mobs/villager/default_default"
-      "minecraft:weaponsmith": "simplexity:bucket_mobs/villager/default_weaponsmith"
-VINDICATOR:
+  type:
+    armorer: "simplexity:bucket_mobs/villager/armorer"
+    butcher: "simplexity:bucket_mobs/villager/butcher"
+    cartographer: "simplexity:bucket_mobs/villager/default_default"
+    cleric: "simplexity:bucket_mobs/villager/default_cleric"
+    farmer: "simplexity:bucket_mobs/villager/default_farmer"
+    fisherman: "simplexity:bucket_mobs/villager/default_fisherman"
+    fletcher: "simplexity:bucket_mobs/villager/default_fletcher"
+    leatherworker: "simplexity:bucket_mobs/villager/default_default"
+    librarian: "simplexity:bucket_mobs/villager/default_librarian"
+    nitwit: "simplexity:bucket_mobs/villager/default_default"
+    none: "simplexity:bucket_mobs/villager/default_default"
+    mason: "simplexity:bucket_mobs/villager/default_default"
+    shepherd: "simplexity:bucket_mobs/villager/default_shepherd"
+    toolsmith: "simplexity:bucket_mobs/villager/default_default"
+    weaponsmith: "simplexity:bucket_mobs/villager/default_weaponsmith"
+vindicator:
   default: "simplexity:bucket_mobs/illager/vindicator"
-WANDERING_TRADER:
+wandering_trader:
   default: "simplexity:bucket_mobs/misc/wandering_trader"
-WARDEN:
+warden:
   default: "simplexity:bucket_mobs/misc/warden"
-WITCH:
+witch:
   default: "simplexity:bucket_mobs/misc/witch"
-WITHER:
+wither:
   default: "simplexity:bucket_mobs/misc/wither"
-WITHER_SKELETON:
+wither_skeleton:
   default: "simplexity:bucket_mobs/skeleton/wither_skeleton"
-WOLF:
+wolf:
   default: "simplexity:bucket_mobs/wolf/pale_default"
-  variant:
-    "minecraft:ashen": "simplexity:bucket_mobs/wolf/ashen_default"
-    "minecraft:black": "simplexity:bucket_mobs/wolf/black_default"
-    "minecraft:chestnut" : "simplexity:bucket_mobs/wolf/chestnut_default"
-    "minecraft:pale" : "simplexity:bucket_mobs/wolf/pale_default"
-    "minecraft:rusty" : "simplexity:bucket_mobs/wolf/rusty_default"
-    "minecraft:snowy" : "simplexity:bucket_mobs/wolf/snowy_default"
-    "minecraft:spotted" : "simplexity:bucket_mobs/wolf/spotted_default"
-    "minecraft:striped" : "simplexity:bucket_mobs/wolf/striped_default"
-    "minecraft:woods" : "simplexity:bucket_mobs/wolf/woods_default"
-  # Tamed Wolf is temporarily in "special" (22049).
-ZOMBIE:
+  type:
+    ashen: "simplexity:bucket_mobs/wolf/ashen_default"
+    ashen_tamed: "simplexity:bucket_mobs/wolf/ashen_tamed"
+    black: "simplexity:bucket_mobs/wolf/black_default"
+    black_tamed: "simplexity:bucket_mobs/wolf/black_tamed"
+    chestnut: "simplexity:bucket_mobs/wolf/chestnut_default"
+    chestnut_tamed: "simplexity:bucket_mobs/wolf/chestnut_tamed"
+    pale: "simplexity:bucket_mobs/wolf/pale_default"
+    pale_tamed: "simplexity:bucket_mobs/wolf/pale_tamed"
+    rusty: "simplexity:bucket_mobs/wolf/rusty_default"
+    rusty_tamed: "simplexity:bucket_mobs/wolf/rusty_tamed"
+    snowy: "simplexity:bucket_mobs/wolf/snowy_default"
+    snowy_tamed: "simplexity:bucket_mobs/wolf/snowy_tamed"
+    spotted: "simplexity:bucket_mobs/wolf/spotted_default"
+    spotted_tamed: "simplexity:bucket_mobs/wolf/spotted_tamed"
+    striped: "simplexity:bucket_mobs/wolf/striped_default"
+    striped_tamed: "simplexity:bucket_mobs/wolf/striped_tamed"
+    woods: "simplexity:bucket_mobs/wolf/woods_default"
+    woods_tamed: "simplexity:bucket_mobs/wolf/woods_tamed"
+zombie:
   default: "simplexity:bucket_mobs/zombie/zombie"
-ZOMBIE_VILLAGER:
+zombie_villager:
   default: "simplexity:bucket_mobs/zombie_villager/default_default"
-  VillagerData:
-    profession:
-      "minecraft:armorer": "simplexity:bucket_mobs/zombie_villager/armorer"
-      "minecraft:butcher": "simplexity:bucket_mobs/zombie_villager/butcher"
-      "minecraft:cartographer": "simplexity:bucket_mobs/zombie_villager/default_default"
-      "minecraft:cleric": "simplexity:bucket_mobs/zombie_villager/default_cleric"
-      "minecraft:farmer": "simplexity:bucket_mobs/zombie_villager/default_farmer"
-      "minecraft:fisherman": "simplexity:bucket_mobs/zombie_villager/default_fisherman"
-      "minecraft:fletcher": "simplexity:bucket_mobs/zombie_villager/default_fletcher"
-      "minecraft:leatherworker": "simplexity:bucket_mobs/zombie_villager/default_default"
-      "minecraft:librarian": "simplexity:bucket_mobs/zombie_villager/default_librarian"
-      "minecraft:nitwit": "simplexity:bucket_mobs/zombie_villager/default_default"
-      "minecraft:none": "simplexity:bucket_mobs/zombie_villager/default_default"
-      "minecraft:mason": "simplexity:bucket_mobs/zombie_villager/default_default"
-      "minecraft:shepherd": "simplexity:bucket_mobs/zombie_villager/default_shepherd"
-      "minecraft:toolsmith": "simplexity:bucket_mobs/zombie_villager/default_default"
-      "minecraft:weaponsmith": "simplexity:bucket_mobs/zombie_villager/default_weaponsmith"
-ZOMBIE_HORSE:
+  type:
+    armorer: "simplexity:bucket_mobs/zombie_villager/armorer"
+    butcher: "simplexity:bucket_mobs/zombie_villager/butcher"
+    cartographer: "simplexity:bucket_mobs/zombie_villager/default_default"
+    cleric: "simplexity:bucket_mobs/zombie_villager/default_cleric"
+    farmer: "simplexity:bucket_mobs/zombie_villager/default_farmer"
+    fisherman: "simplexity:bucket_mobs/zombie_villager/default_fisherman"
+    fletcher: "simplexity:bucket_mobs/zombie_villager/default_fletcher"
+    leatherworker: "simplexity:bucket_mobs/zombie_villager/default_default"
+    librarian: "simplexity:bucket_mobs/zombie_villager/default_librarian"
+    nitwit: "simplexity:bucket_mobs/zombie_villager/default_default"
+    none: "simplexity:bucket_mobs/zombie_villager/default_default"
+    mason: "simplexity:bucket_mobs/zombie_villager/default_default"
+    shepherd: "simplexity:bucket_mobs/zombie_villager/default_shepherd"
+    toolsmith: "simplexity:bucket_mobs/zombie_villager/default_default"
+    weaponsmith: "simplexity:bucket_mobs/zombie_villager/default_weaponsmith"
+zombie_horse:
   default: "simplexity:bucket_mobs/horse/zombie_default"
-ZOGLIN:
+zoglin:
   default: "simplexity:bucket_mobs/misc/zombified_hoglin"
-ZOMBIFIED_PIGLIN:
+zombified_piglin:
   default: "simplexity:bucket_mobs/piglin/zombified_piglin"
-
-special:
-  fried: "simplexity:bucket_mobs/misc/chicken"
-  tamed_wolf: "simplexity:bucket_mobs/wolf/pale_default"
-  toast: "simplexity:bucket_mobs/rabbit/toast"   # Currently does not work.
\ No newline at end of file