From 509ac682adef8ec64fde0912722bd688e430a9ff Mon Sep 17 00:00:00 2001 From: Zrips Date: Thu, 15 Jul 2021 11:40:33 +0300 Subject: [PATCH] No more legacy data load --- .../java/com/gamingmesh/jobs/actions/ItemActionInfo.java | 4 +++- .../java/com/gamingmesh/jobs/commands/list/editjobs.java | 5 +++-- .../java/com/gamingmesh/jobs/commands/list/editquests.java | 4 ++-- .../java/com/gamingmesh/jobs/commands/list/iteminfo.java | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/actions/ItemActionInfo.java b/src/main/java/com/gamingmesh/jobs/actions/ItemActionInfo.java index 09527561..88ad9e9b 100644 --- a/src/main/java/com/gamingmesh/jobs/actions/ItemActionInfo.java +++ b/src/main/java/com/gamingmesh/jobs/actions/ItemActionInfo.java @@ -22,9 +22,11 @@ import org.bukkit.inventory.ItemStack; import com.gamingmesh.jobs.container.ActionType; +import net.Zrips.CMILib.Version.Version; + public class ItemActionInfo extends MaterialActionInfo { @SuppressWarnings("deprecation") public ItemActionInfo(ItemStack items, ActionType type) { - super(items.getType(), items.getData().getData(), type); + super(items.getType(), Version.isCurrentEqualOrHigher(Version.v1_13_R1) ? 0 : items.getData().getData(), type); } } diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java b/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java index c6ca7f8b..49393890 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/editjobs.java @@ -20,6 +20,7 @@ import net.Zrips.CMILib.Colors.CMIChatColor; import net.Zrips.CMILib.Container.PageInfo; import net.Zrips.CMILib.Items.CMIItemStack; import net.Zrips.CMILib.RawMessages.RawMessage; +import net.Zrips.CMILib.Version.Version; public class editjobs implements Cmd { @@ -338,11 +339,11 @@ public class editjobs implements Cmd { switch (args[3]) { case "hand": ItemStack item = CMIItemStack.getItemInMainHand(player); - key = item.getType().name() + "-" + item.getData().getData(); + key = item.getType().name() + "-" + (Version.isCurrentEqualOrHigher(Version.v1_13_R1) ? 0 : item.getData().getData()); break; case "offhand": item = CMIItemStack.getItemInOffHand(player); - key = item.getType().name() + "-" + item.getData().getData(); + key = item.getType().name() + "-" + (Version.isCurrentEqualOrHigher(Version.v1_13_R1) ? 0 : item.getData().getData()); break; case "looking": case "lookingat": diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/editquests.java b/src/main/java/com/gamingmesh/jobs/commands/list/editquests.java index 1c763243..39a1257c 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/editquests.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/editquests.java @@ -320,11 +320,11 @@ public class editquests implements Cmd { switch (args[4]) { case "hand": ItemStack item = CMIItemStack.getItemInMainHand(player); - key = item.getType().name() + "-" + item.getData().getData(); + key = item.getType().name() + "-" + (Version.isCurrentEqualOrHigher(Version.v1_13_R1) ? 0 : item.getData().getData()); break; case "offhand": item = CMIItemStack.getItemInOffHand(player); - key = item.getType().name() + "-" + item.getData().getData(); + key = item.getType().name() + "-" + (Version.isCurrentEqualOrHigher(Version.v1_13_R1) ? 0 : item.getData().getData()); break; case "looking": case "lookingat": diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/iteminfo.java b/src/main/java/com/gamingmesh/jobs/commands/list/iteminfo.java index 321621b7..ce36950f 100644 --- a/src/main/java/com/gamingmesh/jobs/commands/list/iteminfo.java +++ b/src/main/java/com/gamingmesh/jobs/commands/list/iteminfo.java @@ -40,7 +40,7 @@ public class iteminfo implements Cmd { EnchantmentTarget.FISHING_ROD.includes(iih)) tool = true; - byte data = iih.getData().getData(); + byte data = (Version.isCurrentEqualOrHigher(Version.v1_13_R1) ? 0 : iih.getData().getData()); String dataString = data == 0 ? "" : "-" + data; sender.sendMessage(Jobs.getLanguage().getMessage("general.info.separator"));