Fix wolf heads + reload stability + bump rss pack version

Author: EvModder

DropHeads_v3.9.6.jar renamed to DropHeads_v3.9.7.jar

@@ -241,7 +241,8 @@ death-listener-priority: LOW
 # The head on the left is replaced with the one on the right when updated
 replace-heads:
   'PIG_ZOMBIE': 'ZOMBIFIED_PIGLIN'
-#  'ILLUSIONER': 'VILLAGER|FLETCHER|SWAMP'
+#  'WOLF': 'WOLF|PALE'
+#  'WOLF|GRUMM': 'WOLF|PALE|GRUMM'
 
 # Whether to send usage statistics to bStats
 bstats-enabled: true

config.yml

@@ -1,6 +1,6 @@
 {
   "pack": {
-    "pack_format": 32,
+    "pack_format": 34,
     "description": {"text":"DropHeads Localization","color":"gray"}
   }
 }

dh-localization/pack.mcmeta

@@ -5,8 +5,8 @@ description: Heads for every mob and player.
 website: https://dev.bukkit.org/projects/dropheads
 #3=major rewrite
 #9=Reorganized texture file downloads, global click-info cooldown
-#6=1.21 EntityType name changes, added grumms, collared-wolf-variants, fixed looting, better texture-file downloading, legacy head stacking fix config option
-version: 3.9.6
+#7=fixed wolf heads not dropping
+version: 3.9.7
 api-version: 1.13
 softdepend: [HeadDatabase, Essentials, VanishNoPacket]
 

plugin.yml

@@ -25,7 +25,7 @@
 import net.evmodder.EvLib.FileIO;
 import net.evmodder.EvLib.Updater;
 
-//TODO:
+//TODO:MurilinHN
 // * /dropheads reload
 // * improve textures listed at the bottom of head-textures.txt
 // * move textures to DropHeads/textures/MOB_NAME.txt => "SHEEP|RED: value \n SHEEP|BLUE: value ..."?

src/net/evmodder/DropHeads/DropHeads.java

@@ -1,6 +1,7 @@
 package net.evmodder.DropHeads;
 
 import java.io.File;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -202,11 +203,11 @@ void loadTextures(String headsList, boolean logMissingEntities, boolean logUnkno
 		PREFER_VANILLA_HEADS = pl.getConfig().getBoolean("prefer-vanilla-heads", true);
 
 		//---------- <Load translations> ----------------------------------------------------------------------
-		translationsFile = FileIO.loadConfig(pl, "translations.yml",
-				getClass().getResourceAsStream("/translations.yml"), /*notifyIfNew=*/false);
-		Configuration embeddedTranslationsFile = YamlConfiguration.loadConfiguration(
-				new InputStreamReader(getClass().getResourceAsStream("/translations.yml")));
-		translationsFile.setDefaults(embeddedTranslationsFile);
+		translationsFile = FileIO.loadConfig(pl, "translations.yml", getClass().getResourceAsStream("/translations.yml"), /*notifyIfNew=*/false);
+		final InputStream translationsIS = getClass().getResourceAsStream("/translations.yml");  // Can't reuse InputStreams
+		if(translationsIS != null){  // getResourceAsStream() returns null after a plugin reload
+			translationsFile.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(translationsIS)));
+		}
 		// See if we can use the 1.19.4+ "fallback" feature
 		USE_TRANSLATE_FALLBACKS = translationsFile.getBoolean("use-translation-fallbacks", false) && Bukkit.getBukkitVersion().compareTo("1.19.4") >= 0;
 

src/net/evmodder/DropHeads/HeadAPI.java

@@ -128,6 +128,7 @@ public final static double getSpawnCauseMult(Entity e){
 
 	@SuppressWarnings("deprecation")
 	public final static int getLootingLevel(ItemStack item){
+		if(item == null) return 0;
 		Enchantment ench = Enchantment.getByName("LOOTING");
 		if(ench == null) ench = Enchantment.getByName("LOOT_BONUS_MOBS");
 		return item.getEnchantmentLevel(ench);

src/net/evmodder/DropHeads/JunkUtils.java

@@ -1,6 +1,7 @@
 package net.evmodder.DropHeads;
 
 import org.bukkit.DyeColor;
+import org.bukkit.Keyed;
 import org.bukkit.Location;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Creeper;
@@ -189,7 +190,7 @@ public static String getTextureKey(Entity entity){
 						((Wolf)entity).isAngry() ? "|ANGRY" : "";
 				if(ReflectionUtils.getServerVersionString().compareTo("v1_20_5") < 0) return "WOLF"+tameAndCollarOrAngry;
 				if(mWolfGetVariant == null) mWolfGetVariant = ReflectionUtils.getRefClass("org.bukkit.entity.Wolf").getMethod("getVariant");
-				return "WOLF|"+((Enum)mWolfGetVariant.of(entity).call()).name()+tameAndCollarOrAngry;
+				return "WOLF|"+((Keyed)mWolfGetVariant.of(entity).call()).getKey().getKey().toUpperCase()+tameAndCollarOrAngry;
 			}
 			case "CHEST_BOAT":
 				if(mChestBoatGetType == null) mChestBoatGetType = ReflectionUtils.getRefClass("org.bukkit.entity.ChestBoat").getMethod("getBoatType");