Preliminary trader view support for /npc shop

main/src/main/java/net/citizensnpcs/trait/ShopTrait.java

@@ -13,10 +13,19 @@ import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.inventory.InventoryType.SlotType;
+import org.bukkit.event.inventory.TradeSelectEvent;
 import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.Merchant;
+import org.bukkit.inventory.MerchantRecipe;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import com.google.common.base.Joiner;
@@ -31,6 +40,7 @@ import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.gui.CitizensInventoryClickEvent;
 import net.citizensnpcs.api.gui.ClickHandler;
 import net.citizensnpcs.api.gui.InputMenus;
+import net.citizensnpcs.api.gui.InputMenus.Choice;
 import net.citizensnpcs.api.gui.InventoryMenu;
 import net.citizensnpcs.api.gui.InventoryMenuPage;
 import net.citizensnpcs.api.gui.InventoryMenuPattern;
@@ -91,7 +101,6 @@ public class ShopTrait extends Trait {
 
     @Override
     public void onRemove() {
-        Messaging.debug("Removing", npc, "default shop due to onRemove");
         shops.deleteShop(getDefaultShop());
     }
 
@@ -113,6 +122,8 @@ public class ShopTrait extends Trait {
         @Persist
         private String title;
         @Persist
+        private ShopType type = ShopType.DEFAULT;
+        @Persist
         private String viewPermission;
 
         private NPCShop() {
@@ -138,7 +149,11 @@ public class ShopTrait extends Trait {
                 Messaging.sendError(sender, "Empty shop");
                 return;
             }
-            InventoryMenu.createSelfRegistered(new NPCShopViewer(this, sender)).present(sender);
+            if (type == ShopType.TRADER) {
+                CitizensAPI.registerEvents(new NPCTraderShopViewer(this, sender));
+            } else {
+                InventoryMenu.createSelfRegistered(new NPCShopViewer(this, sender)).present(sender);
+            }
         }
 
         public void displayEditor(ShopTrait trait, Player sender) {
@@ -160,6 +175,14 @@ public class ShopTrait extends Trait {
             return viewPermission;
         }
 
+        public ShopType getShopType() {
+            return type;
+        }
+
+        public String getTitle() {
+            return title == null ? "" : title;
+        }
+
         public void removePage(int index) {
             for (int i = 0; i < pages.size(); i++) {
                 if (pages.get(i).index == index) {
@@ -177,6 +200,14 @@ public class ShopTrait extends Trait {
                 viewPermission = null;
             }
         }
+
+        public void setShopType(ShopType type) {
+            this.type = type;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
     }
 
     @Menu(title = "NPC Shop Contents Editor", type = InventoryType.CHEST, dimensions = { 5, 9 })
@@ -233,11 +264,12 @@ public class ShopTrait extends Trait {
                     }));
                 });
             }
-            InventoryMenuSlot prev = ctx.getSlot(4 * 9 + 3);
+            InventoryMenuSlot prev = ctx.getSlot(shop.getShopType().prevSlotIndex);
-            InventoryMenuSlot edit = ctx.getSlot(4 * 9 + 4);
+            InventoryMenuSlot edit = ctx.getSlot(shop.getShopType().editSlotIndex);
-            InventoryMenuSlot next = ctx.getSlot(4 * 9 + 5);
+            InventoryMenuSlot next = ctx.getSlot(shop.getShopType().nextSlotIndex);
             if (page > 0) {
-                prev.setItemStack(shopPage.getNextPageItem(null, 4 * 9 + 3), "Previous page (" + newPage + ")");
+                prev.setItemStack(shopPage.getNextPageItem(null, shop.getShopType().prevSlotIndex),
+                        "Previous page (" + newPage + ")");
                 Consumer<CitizensInventoryClickEvent> prevItemEditor = prev.getClickHandlers().get(0);
                 prev.setClickHandler(evt -> {
                     if (evt.isShiftClick()) {
@@ -248,7 +280,7 @@ public class ShopTrait extends Trait {
                     changePage(page - 1);
                 });
             }
-            next.setItemStack(shopPage.getNextPageItem(null, 4 * 9 + 5),
+            next.setItemStack(shopPage.getNextPageItem(null, shop.getShopType().nextSlotIndex),
                     page + 1 >= shop.pages.size() ? "New page" : "Next page (" + (newPage + 1) + ")");
             Consumer<CitizensInventoryClickEvent> nextItemEditor = next.getClickHandlers().get(0);
             next.setClickHandler(evt -> {
@@ -271,6 +303,11 @@ public class ShopTrait extends Trait {
             });
         }
 
+        @Override
+        public Inventory createInventory(String title) {
+            return Bukkit.createInventory(null, shop.getShopType().inventorySize, "NPC Shop Contents Editor");
+        }
+
         @Override
         public void initialise(MenuContext ctx) {
             this.ctx = ctx;
@@ -395,23 +432,22 @@ public class ShopTrait extends Trait {
             }
         }
 
-        public void onClick(NPCShop shop, InventoryClickEvent event, boolean secondClick) {
+        public void onClick(NPCShop shop, Player player, boolean shiftClick, boolean secondClick) {
-            Player player = (Player) event.getWhoClicked();
             if (purchases.containsKey(player.getUniqueId()) && timesPurchasable > 0
                     && purchases.get(player.getUniqueId()) == timesPurchasable) {
                 if (alreadyPurchasedMessage != null) {
-                    Messaging.sendColorless(event.getWhoClicked(), placeholders(alreadyPurchasedMessage, player));
+                    Messaging.sendColorless(player, placeholders(alreadyPurchasedMessage, player));
                 }
                 return;
             }
             if (clickToConfirmMessage != null && !secondClick) {
-                Messaging.sendColorless(event.getWhoClicked(), placeholders(clickToConfirmMessage, player));
+                Messaging.sendColorless(player, placeholders(clickToConfirmMessage, player));
                 return;
             }
             int max = Integer.MAX_VALUE;
-            if (maxRepeatsOnShiftClick && event.isShiftClick()) {
+            if (maxRepeatsOnShiftClick && shiftClick) {
                 for (NPCShopAction action : cost) {
-                    int r = action.getMaxRepeats(event.getWhoClicked());
+                    int r = action.getMaxRepeats(player);
                     if (r != -1) {
                         max = Math.min(max, r);
                     }
@@ -420,19 +456,19 @@ public class ShopTrait extends Trait {
                     return;
             }
             int repeats = max == Integer.MAX_VALUE ? 1 : max;
-            List<Transaction> take = apply(cost, action -> action.take(event.getWhoClicked(), repeats));
+            List<Transaction> take = apply(cost, action -> action.take(player, repeats));
             if (take == null) {
                 if (costMessage != null) {
-                    Messaging.sendColorless(event.getWhoClicked(), placeholders(costMessage, player));
+                    Messaging.sendColorless(player, placeholders(costMessage, player));
                 }
                 return;
             }
-            if (apply(result, action -> action.grant(event.getWhoClicked(), repeats)) == null) {
+            if (apply(result, action -> action.grant(player, repeats)) == null) {
                 take.forEach(Transaction::rollback);
                 return;
             }
             if (resultMessage != null) {
-                Messaging.sendColorless(event.getWhoClicked(), placeholders(resultMessage, player));
+                Messaging.sendColorless(player, placeholders(resultMessage, player));
             }
             if (timesPurchasable > 0) {
                 int timesPurchasedAlready = purchases.get(player.getUniqueId()) == null ? 0
@@ -714,7 +750,7 @@ public class ShopTrait extends Trait {
             this.ctx = ctx;
             ctx.getSlot(0)
                     .setDescription("<f>Edit permission required to view shop<br>" + shop.getRequiredPermission());
-            ctx.getSlot(4).setDescription("<f>Edit shop title<br>" + shop.title);
+            ctx.getSlot(4).setDescription("<f>Edit shop title<br>" + shop.getTitle());
             if (trait != null) {
                 ctx.getSlot(6).setDescription(
                         "<f>Show shop on right click<br>" + shop.getName().equals(trait.rightClickShop));
@@ -731,9 +767,23 @@ public class ShopTrait extends Trait {
             ctx.getMenu().transition(InputMenus.stringSetter(shop::getRequiredPermission, shop::setPermission));
         }
 
+        @MenuSlot(slot = { 0, 8 }, material = Material.CHEST, amount = 1, title = "<f>Set shop type")
+        public void onSetInventoryType(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
+            ctx.getMenu()
+                    .transition(InputMenus.picker("Set shop type",
+                            (Choice<ShopType> choice) -> shop.setShopType(choice.getValue()),
+                            Choice.of(ShopType.DEFAULT, Material.CHEST, "Default (5x9 chest)",
+                                    shop.type == ShopType.DEFAULT),
+                            Choice.of(ShopType.CHEST_4X9, Material.CHEST, "4x9 chest", shop.type == ShopType.CHEST_4X9),
+                            Choice.of(ShopType.CHEST_3X9, Material.CHEST, "3x9 chest", shop.type == ShopType.CHEST_3X9),
+                            Choice.of(ShopType.CHEST_2X9, Material.CHEST, "2x9 chest", shop.type == ShopType.CHEST_2X9),
+                            Choice.of(ShopType.CHEST_1X9, Material.CHEST, "1x9 chest", shop.type == ShopType.CHEST_1X9),
+                            Choice.of(ShopType.TRADER, Material.EMERALD, "Trader", shop.type == ShopType.TRADER)));
+        }
+
         @MenuSlot(slot = { 0, 4 }, material = Material.NAME_TAG, amount = 1)
         public void onSetTitle(InventoryMenuSlot slot, CitizensInventoryClickEvent event) {
-            ctx.getMenu().transition(InputMenus.stringSetter(() -> shop.title, newTitle -> shop.title = newTitle));
+            ctx.getMenu().transition(InputMenus.stringSetter(shop::getTitle, shop::setTitle));
         }
 
         @MenuSlot(slot = { 0, 6 }, compatMaterial = { "COMMAND_BLOCK", "COMMAND" }, amount = 1)
@@ -782,15 +832,16 @@ public class ShopTrait extends Trait {
                 ctx.getSlot(i).setItemStack(item.getDisplayItem(player));
                 ctx.getSlot(i).setClickHandler(evt -> {
                     evt.setCancelled(true);
-                    item.onClick(shop, evt, lastClickedItem == item);
+                    item.onClick(shop, (Player) evt.getWhoClicked(), evt.isShiftClick(), lastClickedItem == item);
                     lastClickedItem = item;
                 });
             }
-            InventoryMenuSlot prev = ctx.getSlot(4 * 9 + 3);
+            InventoryMenuSlot prev = ctx.getSlot(shop.getShopType().prevSlotIndex);
-            InventoryMenuSlot next = ctx.getSlot(4 * 9 + 5);
+            InventoryMenuSlot next = ctx.getSlot(shop.getShopType().nextSlotIndex);
             if (currentPage > 0) {
                 prev.clear();
-                prev.setItemStack(page.getPreviousPageItem(player, 4 * 9 + 3), "Previous page (" + newPage + ")");
+                prev.setItemStack(page.getPreviousPageItem(player, shop.getShopType().prevSlotIndex),
+                        "Previous page (" + newPage + ")");
                 prev.setClickHandler(evt -> {
                     evt.setCancelled(true);
                     changePage(currentPage - 1);
@@ -798,7 +849,8 @@ public class ShopTrait extends Trait {
             }
             if (currentPage + 1 < shop.pages.size()) {
                 next.clear();
-                next.setItemStack(page.getNextPageItem(player, 4 * 9 + 5), "Next page (" + (newPage + 1) + ")");
+                next.setItemStack(page.getNextPageItem(player, shop.getShopType().nextSlotIndex),
+                        "Next page (" + (newPage + 1) + ")");
                 next.setClickHandler(evt -> {
                     evt.setCancelled(true);
                     changePage(currentPage + 1);
@@ -808,8 +860,8 @@ public class ShopTrait extends Trait {
 
         @Override
         public Inventory createInventory(String title) {
-            return Bukkit.createInventory(null, 45, shop.title == null || shop.title.isEmpty() ? "Shop"
+            return Bukkit.createInventory(null, shop.getShopType().inventorySize, shop.getTitle().isEmpty() ? "Shop"
-                    : Messaging.parseComponents(Placeholders.replace(shop.title, player)));
+                    : Messaging.parseComponents(Placeholders.replace(shop.getTitle(), player)));
         }
 
         @Override
@@ -819,6 +871,99 @@ public class ShopTrait extends Trait {
         }
     }
 
+    public static class NPCTraderShopViewer implements Listener {
+        private int lastClickedTrade = -1;
+        private final Player player;
+        private int selectedTrade = -1;
+        private final NPCShop shop;
+        private final Map<Integer, NPCShopItem> trades;
+        private final InventoryView view;
+
+        public NPCTraderShopViewer(NPCShop shop, Player player) {
+            this.shop = shop;
+            this.player = player;
+            Map<Integer, NPCShopItem> tradesMap = Maps.newHashMap();
+            Merchant merchant = Bukkit.createMerchant(shop.getTitle());
+            List<MerchantRecipe> recipes = Lists.newArrayList();
+            for (NPCShopPage page : shop.pages) {
+                for (NPCShopItem item : page.items.values()) {
+                    ItemStack result = item.getDisplayItem(player);
+                    if (result == null)
+                        continue;
+                    MerchantRecipe recipe = new MerchantRecipe(result.clone(), 100000000);
+                    for (NPCShopAction action : item.cost) {
+                        if (action instanceof ItemAction) {
+                            for (ItemStack stack : ((ItemAction) action).items) {
+                                recipe.addIngredient(stack.clone());
+                                if (recipe.getIngredients().size() == 2)
+                                    break;
+                            }
+                        }
+                    }
+                    if (recipe.getIngredients().size() == 0)
+                        continue;
+                    tradesMap.put(recipes.size(), item);
+                    recipes.add(recipe);
+                }
+            }
+            merchant.setRecipes(recipes);
+            trades = tradesMap;
+            view = player.openMerchant(merchant, true);
+        }
+
+        @EventHandler
+        public void onInventoryClick(InventoryClickEvent evt) {
+            if (!evt.getView().equals(view))
+                return;
+            evt.setCancelled(true);
+            if (evt.getSlotType() != SlotType.RESULT)
+                return;
+            trades.get(selectedTrade).onClick(shop, player, evt.getClick().isShiftClick(),
+                    lastClickedTrade == selectedTrade);
+            lastClickedTrade = selectedTrade;
+        }
+
+        @EventHandler
+        public void onInventoryClose(InventoryCloseEvent evt) {
+            if (!evt.getPlayer().equals(player))
+                return;
+            HandlerList.unregisterAll(this);
+        }
+
+        @EventHandler
+        public void onTradeSelect(TradeSelectEvent evt) {
+            if (!evt.getView().equals(view))
+                return;
+            selectedTrade = evt.getIndex();
+            lastClickedTrade = -1;
+        }
+    }
+
+    public enum ShopType {
+        CHEST_1X9(1 * 9, 7, 6, 8),
+        CHEST_2X9(2 * 9),
+        CHEST_3X9(3 * 9),
+        CHEST_4X9(4 * 9),
+        DEFAULT(5 * 9),
+        TRADER(5 * 9);
+
+        private final int editSlotIndex;
+        private final int inventorySize;
+        private final int nextSlotIndex;
+        private final int prevSlotIndex;
+
+        ShopType(int inventorySize) {
+            this(inventorySize, inventorySize - 9 + 3, inventorySize - 9 + 4, inventorySize - 9 + 5);
+        }
+
+        ShopType(int inventorySize, int prevSlotIndex, int editSlotIndex, int nextSlotIndex) {
+            this.inventorySize = inventorySize;
+            this.prevSlotIndex = prevSlotIndex;
+            this.editSlotIndex = editSlotIndex;
+            this.nextSlotIndex = nextSlotIndex;
+        }
+    }
+
     static {
         NPCShopAction.register(ItemAction.class, "items", new ItemActionGUI());
         NPCShopAction.register(PermissionAction.class, "permissions", new PermissionActionGUI());

main/src/main/java/net/citizensnpcs/trait/shop/ItemAction.java

@@ -56,18 +56,18 @@ public class ItemAction extends NPCShopAction {
         ItemStack[] contents = source.getContents();
         for (int i = 0; i < contents.length; i++) {
             ItemStack toMatch = contents[i];
-            if (toMatch == null || toMatch.getType() == Material.AIR || tooDamaged(toMatch)) {
+            if (toMatch == null || toMatch.getType() == Material.AIR || tooDamaged(toMatch))
                 continue;
-            }
+
             toMatch = toMatch.clone();
             for (int j = 0; j < items.size(); j++) {
-                if (toMatch == null) {
+                if (toMatch == null)
                     break;
-                }
+
                 ItemStack item = items.get(j);
-                if (req.get(j) <= 0 || !matches(item, toMatch)) {
+                if (req.get(j) <= 0 || !matches(item, toMatch))
                     continue;
-                }
+
                 int remaining = req.get(j);
                 int taken = toMatch.getAmount() > remaining ? remaining : toMatch.getAmount();
 

main/src/main/java/net/citizensnpcs/util/NMS.java

@@ -716,7 +716,7 @@ public class NMS {
     }
 
     public static void openHorseScreen(Tameable horse, Player equipper) {
-        BRIDGE.openHorseScreen(horse, equipper);
+        BRIDGE.openHorseInventory(horse, equipper);
     }
 
     public static void playAnimation(PlayerAnimation animation, Player player, Iterable<Player> to) {
@@ -986,9 +986,6 @@ public class NMS {
         } catch (ClassNotFoundException e) {
             PAPER_KNOCKBACK_EVENT_EXISTS = false;
         }
-    }
-
-    static {
         giveReflectiveAccess(Field.class, NMS.class);
         MODIFIERS_FIELD = NMS.getField(Field.class, "modifiers", false);
     }

main/src/main/java/net/citizensnpcs/util/NMSBridge.java

@@ -151,7 +151,7 @@ public interface NMSBridge {
 
     public InventoryView openAnvilInventory(Player player, Inventory anvil, String title);
 
-    public void openHorseScreen(Tameable horse, Player equipper);
+    public void openHorseInventory(Tameable horse, Player equipper);
 
     public void playAnimation(PlayerAnimation animation, Player player, Iterable<Player> to);
 

v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java

@@ -949,7 +949,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) horse);
         EntityLiving equipperHandle = NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java

@@ -1002,7 +1002,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) horse);
         EntityLiving equipperHandle = NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java

@@ -1009,7 +1009,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) horse);
         EntityLiving equipperHandle = NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java

@@ -1045,7 +1045,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) horse);
         EntityLiving equipperHandle = NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java

@@ -1106,7 +1106,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) horse);
         EntityLiving equipperHandle = NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java

@@ -1123,7 +1123,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         EntityLiving handle = NMSImpl.getHandle(horse);
         EntityHuman equipperHandle = (EntityHuman) NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java

@@ -1147,7 +1147,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         EntityLiving handle = NMSImpl.getHandle(horse);
         EntityHuman equipperHandle = (EntityHuman) NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java

@@ -1153,7 +1153,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         LivingEntity handle = NMSImpl.getHandle(horse);
         ServerPlayer equipperHandle = (ServerPlayer) NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java

@@ -1162,7 +1162,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         LivingEntity handle = NMSImpl.getHandle(horse);
         ServerPlayer equipperHandle = (ServerPlayer) NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java

@@ -1289,7 +1289,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         LivingEntity handle = getHandle(horse);
         ServerPlayer equipperHandle = (ServerPlayer) getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/util/NMSImpl.java

@@ -1260,7 +1260,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         LivingEntity handle = getHandle(horse);
         ServerPlayer equipperHandle = (ServerPlayer) getHandle(equipper);
         if (handle == null || equipperHandle == null)

v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java

@@ -885,7 +885,7 @@ public class NMSImpl implements NMSBridge {
     }
 
     @Override
-    public void openHorseScreen(Tameable horse, Player equipper) {
+    public void openHorseInventory(Tameable horse, Player equipper) {
         EntityLiving handle = NMSImpl.getHandle((LivingEntity) horse);
         EntityLiving equipperHandle = NMSImpl.getHandle(equipper);
         if (handle == null || equipperHandle == null)