From 052aa44d128456ac8c15b889fdcbe67611b68c72 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sun, 19 Jan 2020 07:41:43 +0100 Subject: [PATCH] Removing pair completly --- .../src/de/steamwar/inventory/SWListInv.java | 46 ------------------- 1 file changed, 46 deletions(-) diff --git a/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java b/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java index 42b708b..f13de17 100644 --- a/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java +++ b/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java @@ -2,7 +2,6 @@ package de.steamwar.inventory; import de.steamwar.sql.Schematic; import de.steamwar.sql.SchematicType; -import javafx.util.Pair; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -16,17 +15,6 @@ public class SWListInv extends SWInventory { private List> elements; private int page; - @Deprecated - public SWListInv(Player p, String t, ListCallback c, List> l) { - super(p, (l.size()>45) ? 54 : (l.size() + 9-l.size()%9), t); - callback = c; - //Only here for backwards compatibility - elements = new LinkedList<>(); - for(Pair pair : l) - elements.add(new SWListEntry<>(pair.getKey(), pair.getValue())); - page = 0; - } - public SWListInv(Player p, String t, List> l, ListCallback c){ super(p, (l.size()>45) ? 54 : (l.size() + 9-l.size()%9), t); callback = c; @@ -79,18 +67,6 @@ public class SWListInv extends SWInventory { void clicked(ClickType click, T element); } - @Deprecated - public static List> createPlayerList(Player without){ - List> onlinePlayers = new ArrayList<>(); - for(Player player : Bukkit.getOnlinePlayers()){ - if(without != null && player.getUniqueId().equals(without.getUniqueId())) - continue; - - onlinePlayers.add(new Pair<>(SWItem.getPlayerSkull(player), player.getUniqueId())); - } - return onlinePlayers; - } - public static List> createPlayerList(UUID without){ List> onlinePlayers = new ArrayList<>(); for(Player player : Bukkit.getOnlinePlayers()){ @@ -102,28 +78,6 @@ public class SWListInv extends SWInventory { return onlinePlayers; } - @Deprecated - public static List> getSchemList(int warkingUserId, SchematicType type){ - List> schemList = new ArrayList<>(); - - List schems; - if(type == null) - schems = Schematic.getSchemsAccessibleByUser(warkingUserId); - else - schems = Schematic.getSchemsOfType(warkingUserId, type); - - for(Schematic s : schems){ - Material m; - if(s.getItem().isEmpty()) - m = SWItem.getMaterial("CAULDRON_ITEM"); - else - m = SWItem.getMaterial(s.getItem()); - SWItem item = new SWItem(m,"§e" + s.getSchemName()); - schemList.add(new Pair<>(item, s)); - } - return schemList; - } - public static List> getSchemList(SchematicType type, int steamwarUserId){ List> schemList = new ArrayList<>();