better defaults, add minecraft:any and minecraft:unspecified types

Author: Grabsky

src/main/java/cloud/grabsky/heads/object/EntityLootEntry.java

@@ -60,6 +60,12 @@ public class EntityLootEntry {
     @Getter(AccessLevel.PUBLIC)
     private @UnknownNullability ItemStack item;
 
+    // This NamespacedKey is used to match any attacker or damage type.
+    private static final NamespacedKey ANY = new NamespacedKey("minecraft", "any");
+
+    // This NamespacedKey is used to match unspecified / null attacker or damage type.
+    private static final NamespacedKey UNSPECIFIED = new NamespacedKey("minecraft", "unspecified");
+
     @Accessors(fluent = true)
     @NoArgsConstructor(access = AccessLevel.PROTECTED)
     public static class Chance {
@@ -92,8 +98,8 @@ public static class Matcher {
 
         public boolean matches(final @Nullable String variant, final @Nullable NamespacedKey attacker, final @Nullable NamespacedKey damageType) {
             final boolean isVariantMatch = (this.variant == null) || Objects.equals(this.variant, variant);
-            final boolean isAttackerMatch = (attackers == null || attacker == null) || attackers.contains(attacker);
-            final boolean isDamageMatch = (damageTypes == null || damageType == null) || damageTypes.contains(damageType);
+            final boolean isAttackerMatch = (this.attackers != null) && ((this.attackers.contains(ANY) == true || this.attackers.contains(attacker) == true) || (this.attackers.contains(UNSPECIFIED) == false && attacker == null));
+            final boolean isDamageMatch = (this.damageTypes != null) && ((this.damageTypes.contains(ANY) == true || this.damageTypes.contains(damageType) == true) || (this.damageTypes.contains(UNSPECIFIED) == false && damageType == null));
             // Returning whether provided values match.
             return isVariantMatch && isAttackerMatch && isDamageMatch;
         }

src/main/resources/aggressive.json

@@ -8,13 +8,13 @@
     "default_matcher": {
         // Default variant to match. Omitting this field or setting to null will match any variant.
         "variant": null,
-        // Default list of attackers that can initiate the head drop. Omitting this field or setting to null will match any attacker.
-        "attackers": null,
-        // Default list of damages that can initiate the head drop. Omitting this field or setting to an null will match any damage type.
-        "damage_types": null
+        // Default list of attackers that can initiate the head drop.
+        "attackers": ["minecraft:player"],
+        // Default list of damages that can initiate the head drop.
+        "damage_types": ["minecraft:any"]
     },
     // Default permission required to initiate the head drop. Setting to "" will disable the condition check.
-    "permission": "heads.plugin.can_receive_drops",
+    "permission": "",
     // Default message that will be sent to the player when they receive a head.
     "message": "<dark_gray>› <green>Congrats! <gray>You received <item><reset><gray> from the killed mob.",
     // List of entity definitions defined within this group.
@@ -69,6 +69,8 @@
         ],
         "minecraft:creaking": [
             {
+                // Creaking death might not be caused by a player.
+                "matcher": { "attackers": ["minecraft:any"] },
                 "item": {
                     "material": "minecraft:player_head",
                     "meta": {

src/main/resources/passive.json

@@ -8,13 +8,13 @@
     "default_matcher": {
         // Default variant to match. Omitting this field or setting to null will match any variant.
         "variant": null,
-        // Default list of attackers that can initiate the head drop. Omitting this field or setting to null will match any attacker.
-        "attackers": null,
-        // Default list of damages that can initiate the head drop. Omitting this field or setting to an null will match any damage type.
-        "damage_types": null
+        // Default list of attackers that can initiate the head drop.
+        "attackers": ["minecraft:player"],
+        // Default list of damages that can initiate the head drop.
+        "damage_types": ["minecraft:any"]
     },
     // Default permission required to initiate the head drop. Setting to "" will disable the condition check.
-    "permission": "heads.plugin.can_receive_drops",
+    "permission": "",
     // Default message that will be sent to the player when they receive a head.
     "message": "<dark_gray>› <green>Congrats! <gray>You received <item><reset><gray> from the killed mob.",
     // List of entity definitions defined within this group.

src/main/resources/player.json

@@ -6,15 +6,13 @@
         "per_looting_level": 0.0
     },
     "default_matcher": {
-        // Default variant to match. Omitting this field or setting to null will match any variant.
-        "variant": null,
-        // Default list of attackers that can initiate the head drop. Omitting this field or setting to null will match any attacker.
+        // Default list of attackers that can initiate the head drop.
         "attackers": ["minecraft:player"],
-        // Default list of damages that can initiate the head drop. Omitting this field or setting to an null will match any damage type.
+        // Default list of damages that can initiate the head drop.
         "damage_types": ["minecraft:player_attack"]
     },
     // Default permission required to initiate the head drop. Setting to "" will disable the condition check.
-    "permission": "heads.plugin.can_receive_drops",
+    "permission": "",
     // Default message that will be sent to the player when they receive a head.
     "message": "<dark_gray>› <green>Congrats! <gray>You received <item><reset><gray> from the killed player.",
     // List of entity definitions defined within this group.