diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index c72469d..073d773 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.pretzel.dev VillagerTradeLimiter - 1.5.9 + 1.6.0 src diff --git a/pom.xml b/pom.xml index f28eea3..1e90936 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.pretzel.dev VillagerTradeLimiter - 1.5.9 + 1.6.0 1.8 diff --git a/src/com/pretzel/dev/villagertradelimiter/VillagerTradeLimiter.java b/src/com/pretzel/dev/villagertradelimiter/VillagerTradeLimiter.java index 9a1180c..bbf98c2 100644 --- a/src/com/pretzel/dev/villagertradelimiter/VillagerTradeLimiter.java +++ b/src/com/pretzel/dev/villagertradelimiter/VillagerTradeLimiter.java @@ -12,6 +12,7 @@ import com.pretzel.dev.villagertradelimiter.lib.Util; import com.pretzel.dev.villagertradelimiter.listeners.PlayerListener; import com.pretzel.dev.villagertradelimiter.settings.Lang; import com.pretzel.dev.villagertradelimiter.settings.Settings; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/com/pretzel/dev/villagertradelimiter/listeners/PlayerListener.java b/src/com/pretzel/dev/villagertradelimiter/listeners/PlayerListener.java index a8b1367..b1fc5fd 100644 --- a/src/com/pretzel/dev/villagertradelimiter/listeners/PlayerListener.java +++ b/src/com/pretzel/dev/villagertradelimiter/listeners/PlayerListener.java @@ -48,7 +48,7 @@ public class PlayerListener implements Listener { if(instance.getCfg().getStringList("DisableWorlds").contains(villager.getWorld().getName())) return; //Skips when player is holding an ignored item - ItemStack heldItem = player.getInventory().getItem(event.getHand()); + ItemStack heldItem = player.getInventory().getItem(event.getHand().ordinal()); if(heldItem != null) { Material heldItemType = heldItem.getType(); for(String ignoredType : instance.getCfg().getStringList("IgnoreHeldItems")) { @@ -78,7 +78,7 @@ public class PlayerListener implements Listener { } //Cancel the original event, and open the adjusted trade view - event.setCancelled(true); + //event.setCancelled(true); if(!instance.getPlayerData().containsKey(player.getUniqueId())) { instance.getPlayerData().put(player.getUniqueId(), new PlayerData()); } diff --git a/src/com/pretzel/dev/villagertradelimiter/wrappers/VillagerWrapper.java b/src/com/pretzel/dev/villagertradelimiter/wrappers/VillagerWrapper.java index 6bb30d7..aac5d73 100644 --- a/src/com/pretzel/dev/villagertradelimiter/wrappers/VillagerWrapper.java +++ b/src/com/pretzel/dev/villagertradelimiter/wrappers/VillagerWrapper.java @@ -3,6 +3,7 @@ package com.pretzel.dev.villagertradelimiter.wrappers; import de.tr7zw.changeme.nbtapi.NBTCompound; import de.tr7zw.changeme.nbtapi.NBTCompoundList; import de.tr7zw.changeme.nbtapi.NBTEntity; +import de.tr7zw.changeme.nbtapi.iface.ReadWriteNBT; import org.bukkit.entity.Villager; import org.bukkit.inventory.ItemStack; import org.checkerframework.checker.nullness.qual.NonNull; @@ -34,8 +35,8 @@ public class VillagerWrapper { final NBTCompound offers = entity.getCompound("Offers"); if(offers == null) return recipes; final NBTCompoundList nbtRecipes = offers.getCompoundList("Recipes"); - for(NBTCompound nbtRecipe : nbtRecipes) { - recipes.add(new RecipeWrapper(nbtRecipe)); + for(ReadWriteNBT nbtRecipe : nbtRecipes) { + recipes.add(new RecipeWrapper((NBTCompound)nbtRecipe)); } return recipes; } @@ -43,12 +44,12 @@ public class VillagerWrapper { /** @return A list of wrapped gossips for the villager */ private List getGossips() { final List gossips = new ArrayList<>(); - if(!entity.hasKey("Gossips")) return gossips; + if(!entity.hasTag("Gossips")) return gossips; //Add the gossips from the villager's NBT data into a list of wrapped gossips final NBTCompoundList nbtGossips = entity.getCompoundList("Gossips"); - for(NBTCompound nbtGossip : nbtGossips) { - gossips.add(new GossipWrapper(nbtGossip)); + for(ReadWriteNBT nbtGossip : nbtGossips) { + gossips.add(new GossipWrapper((NBTCompound) nbtGossip)); } return gossips; } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 90f0d6e..1512d37 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ name: VillagerTradeLimiter author: PretzelJohn main: com.pretzel.dev.villagertradelimiter.VillagerTradeLimiter -version: 1.5.9 +version: 1.6.0 api-version: 1.14 commands: