update for api changes: max_health and sounds to use registry

steve4744 · Nov 23, 2024 · 027900c · 027900c
1 parent 54228a9
commit 027900c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/tntrun/arena/handlers/SoundHandler.java b/src/main/java/tntrun/arena/handlers/SoundHandler.java
@@ -17,11 +17,11 @@
 
 package tntrun.arena.handlers;
 
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
-import com.google.common.base.Enums;
-
 import tntrun.TNTRun;
 import tntrun.utils.Sounds;
 
@@ -35,7 +35,8 @@ public SoundHandler (TNTRun plugin) {
 
 	@Override
 	public void NOTE_PLING(Player p, float volume, float pitch) {
-		p.playSound(p.getLocation(), Sound.valueOf("BLOCK_NOTE_BLOCK_PLING"), volume, pitch);
+		NamespacedKey key = NamespacedKey.minecraft("BLOCK_NOTE_BLOCK_PLING");
+		p.playSound(p.getLocation(), Registry.SOUNDS.get(key), volume, pitch);
 	}
 
 	@Override
@@ -73,7 +74,8 @@ public void BLOCK_BREAK(Block fblock) {
 	 * @return sound
 	 */
 	private Sound getSound(String path) {
-		return Enums.getIfPresent(Sound.class, plugin.getConfig().getString("sounds." + path + ".sound")).orNull();
+		NamespacedKey key = NamespacedKey.minecraft(plugin.getConfig().getString("sounds." + path + ".sound"));
+		return Registry.SOUNDS.get(key);
 	}
 
 	/**

diff --git a/src/main/java/tntrun/datahandler/PlayerDataStore.java b/src/main/java/tntrun/datahandler/PlayerDataStore.java
@@ -112,7 +112,7 @@ public void storePlayerHealth(Player player) {
 		LivingEntity le = (LivingEntity) player;
 		plhealth.put(player.getName(), le.getHealth());
 		if (plugin.getConfig().getBoolean("onjoin.fillhealth")) {
-			le.setHealth(le.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue());
+			le.setHealth(le.getAttribute(Attribute.MAX_HEALTH).getValue());
 		}
 	}
 
@@ -154,7 +154,7 @@ public void restorePlayerLevel(Player player) {
 
 	public void restorePlayerHealth(Player player) {
 		LivingEntity le = (LivingEntity) player;
-		le.setHealth(Math.min(le.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(), plhealth.remove(player.getName())));
+		le.setHealth(Math.min(le.getAttribute(Attribute.MAX_HEALTH).getValue(), plhealth.remove(player.getName())));
 	}
 
 	public void saveDoubleJumpsToFile(OfflinePlayer player, int amount) {

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -2,7 +2,7 @@ name: TNTRun_reloaded
 main: tntrun.TNTRun
 softdepend: [WorldEdit, Vault, HeadsPlus, mcMMO, PlaceholderAPI, Parties]
 version: ${project.version}
-api-version: 1.20.6
+api-version: 1.21.3
 author: [steve4744]
 commands:
   tntrunsetup: