1.20 support

Took 49 minutes
Tweetzy · Jun 16, 2023 · d52ccbb · d52ccbb
1 parent e005006
commit d52ccbb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/src/main/java/ca/tweetzy/skulls/commands/InspectCommand.java b/src/main/java/ca/tweetzy/skulls/commands/InspectCommand.java
@@ -21,8 +21,8 @@
 import ca.tweetzy.flight.command.AllowedExecutor;
 import ca.tweetzy.flight.command.Command;
 import ca.tweetzy.flight.command.ReturnType;
-import ca.tweetzy.flight.comp.NBTEditor;
 import ca.tweetzy.flight.comp.enums.CompMaterial;
+import ca.tweetzy.flight.nbtapi.NBT;
 import ca.tweetzy.flight.settings.TranslationManager;
 import ca.tweetzy.flight.utils.Common;
 import ca.tweetzy.flight.utils.PlayerUtil;
@@ -60,8 +60,8 @@ protected ReturnType execute(CommandSender sender, String... args) {
 				skullId = placedSkull.getSkullId();
 			}
 		} else {
-			if (NBTEditor.contains(hand, "Skulls:ID")) {
-				final String skullIdString = NBTEditor.getString(hand, "Skulls:ID");
+			if (NBT.get(hand, nbt -> nbt.hasTag("Skulls:ID"))) {
+				final String skullIdString = NBT.get(hand, nbt -> nbt.getString("Skulls:ID"));
 				skullId = Integer.parseInt(skullIdString);
 			}
 		}

diff --git a/src/main/java/ca/tweetzy/skulls/impl/TexturedSkull.java b/src/main/java/ca/tweetzy/skulls/impl/TexturedSkull.java
@@ -18,8 +18,8 @@
 
 package ca.tweetzy.skulls.impl;
 
-import ca.tweetzy.flight.comp.NBTEditor;
 import ca.tweetzy.flight.settings.TranslationManager;
+import ca.tweetzy.flight.utils.Common;
 import ca.tweetzy.flight.utils.QuickItem;
 import ca.tweetzy.skulls.Skulls;
 import ca.tweetzy.skulls.api.interfaces.Skull;
@@ -98,15 +98,10 @@ public void setPrice(double price) {
 
 	@Override
 	public ItemStack getItemStack() {
-
-//		 final SkullMeta meta = (SkullMeta) head.getItemMeta();
-//
-//		if (meta != null) {
-//			SkullUtils.applySkin(meta, this.texture);
-//			head.setItemMeta(meta);
-//		}
-
-		return QuickItem.of(NBTEditor.getHead(this.texture)).name(TranslationManager.string(Translations.SKULL_TITLE, "skull_name", this.name)).tag("Skulls:ID", String.valueOf(this.id)).make();
+		return QuickItem
+				.of(this.texture)
+				.name(TranslationManager.string(Translations.SKULL_TITLE, "skull_name", this.name))
+				.tag("Skulls:ID", String.valueOf(this.id)).make();
 	}
 
 	@Override

diff --git a/src/main/java/ca/tweetzy/skulls/listeners/SkullBlockListener.java b/src/main/java/ca/tweetzy/skulls/listeners/SkullBlockListener.java
@@ -18,8 +18,9 @@
 
 package ca.tweetzy.skulls.listeners;
 
-import ca.tweetzy.flight.comp.NBTEditor;
 import ca.tweetzy.flight.comp.enums.CompMaterial;
+import ca.tweetzy.flight.nbtapi.NBT;
+import ca.tweetzy.flight.utils.Common;
 import ca.tweetzy.flight.utils.PlayerUtil;
 import ca.tweetzy.skulls.Skulls;
 import ca.tweetzy.skulls.api.interfaces.PlacedSkull;
@@ -47,13 +48,13 @@ public void onSkullPlace(final BlockPlaceEvent event) {
 		}
 
 		final ItemStack item = PlayerUtil.getHand(event.getPlayer());
-		if (!NBTEditor.contains(item, "Skulls:ID")) {
+		if (!NBT.get(item, nbt -> nbt.hasTag("Skulls:ID"))) {
 			return;
 		}
 
 		final Block block = event.getBlockPlaced();
 		if (block.getType() == CompMaterial.PLAYER_HEAD.parseMaterial() || block.getType() == CompMaterial.PLAYER_WALL_HEAD.parseMaterial()) {
-			final int skullId = Integer.parseInt(NBTEditor.getString(item, "Skulls:ID"));
+			final int skullId = Integer.parseInt(NBT.get(item, nbt -> nbt.getString("Skulls:ID")));
 			Skulls.getSkullManager().addPlacedSkull(new PlacedSkullLocation(UUID.randomUUID(), skullId, block.getLocation()));
 		}