From 732afde5864db9733a8899e66f040d19576a40d4 Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Sun, 5 Jan 2020 16:48:12 -0800 Subject: [PATCH] huge pile of cleanups semi-automated --- .../events/entity/HorseJumpsScriptEvent.java | 8 +---- .../player/PlayerBreaksBlockScriptEvent.java | 4 +-- .../player/PlayerDragsInInvScriptEvent.java | 2 +- .../PlayerRightClicksEntityScriptEvent.java | 2 +- .../denizen/nms/abstracts/ProfileEditor.java | 4 +-- .../denizen/nms/interfaces/EntityHelper.java | 5 +-- .../denizen/npc/actions/ActionHandler.java | 5 --- .../denizen/npc/speech/DenizenChat.java | 5 +-- .../denizen/npc/traits/AssignmentTrait.java | 2 +- .../denizen/npc/traits/ConstantsTrait.java | 4 +-- .../denizen/npc/traits/MobproxTrait.java | 7 ++-- .../denizen/objects/ChunkTag.java | 11 +++--- .../denizen/objects/EntityTag.java | 2 +- .../denizen/objects/InventoryTag.java | 12 ------- .../denizen/objects/ItemTag.java | 12 +++---- .../denizen/objects/LocationTag.java | 6 ++-- .../denizen/objects/MaterialTag.java | 15 ++++---- .../denizen/objects/PlayerTag.java | 2 +- .../bukkit/BukkitQueueProperties.java | 14 ++------ .../entity/EntityAreaEffectCloud.java | 2 +- .../properties/entity/EntityBoundingBox.java | 4 +-- .../properties/entity/EntityCustomName.java | 8 +---- .../properties/entity/EntitySpeed.java | 35 +++---------------- .../properties/inventory/InventoryHolder.java | 3 -- .../scripts/commands/entity/HeadCommand.java | 2 +- .../scripts/commands/item/ScribeCommand.java | 2 +- .../scripts/commands/item/TakeCommand.java | 4 +-- .../commands/player/SidebarCommand.java | 4 +-- .../commands/server/ExecuteCommand.java | 4 +-- .../scripts/triggers/AbstractTrigger.java | 32 ----------------- .../scripts/triggers/core/ChatTrigger.java | 3 +- .../scripts/triggers/core/ClickTrigger.java | 2 +- .../scripts/triggers/core/DamageTrigger.java | 2 +- .../denizen/tags/BukkitTagContext.java | 2 +- .../denizen/tags/core/ServerTagBase.java | 10 ++---- .../utilities/blocks/CuboidBlockSet.java | 10 +++--- .../command/manager/CommandManager.java | 5 +-- .../utilities/command/manager/Injector.java | 12 +------ .../implementation/BukkitScriptEntryData.java | 2 +- .../utilities/midi/NoteBlockReceiver.java | 4 +-- .../utilities/packets/ItemChangeMessage.java | 4 +-- .../nms/v1_12/helpers/BlockHelperImpl.java | 9 ++--- .../nms/v1_12/helpers/EntityHelperImpl.java | 5 +-- .../nms/v1_12/impl/blocks/BlockDataImpl.java | 2 +- .../nms/v1_13/helpers/BlockHelperImpl.java | 9 ++--- .../nms/v1_13/helpers/EntityHelperImpl.java | 5 +-- .../nms/v1_13/helpers/ItemHelperImpl.java | 10 +++--- .../nms/v1_13/impl/jnbt/CompoundTagImpl.java | 2 +- .../nms/v1_14/helpers/EntityHelperImpl.java | 5 +-- .../nms/v1_14/helpers/ItemHelperImpl.java | 7 ++-- .../nms/v1_15/helpers/EntityHelperImpl.java | 5 +-- .../nms/v1_15/helpers/ItemHelperImpl.java | 7 ++-- 52 files changed, 99 insertions(+), 245 deletions(-) diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java index 646c3e9065..44d3aff568 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/HorseJumpsScriptEvent.java @@ -29,7 +29,6 @@ public class HorseJumpsScriptEvent extends BukkitScriptEvent implements Listener // @Context // returns the EntityTag of the horse. // returns an ElementTag of the horse's color. - // returns an ElementTag of the horse's variant. // returns an ElementTag(Decimal) of the jump's power. // // @Determine @@ -44,7 +43,6 @@ public HorseJumpsScriptEvent() { public static HorseJumpsScriptEvent instance; public EntityTag entity; public ElementTag color; - public ElementTag variant; public Float power; public HorseJumpEvent event; @@ -61,7 +59,7 @@ public boolean matches(ScriptPath path) { String arg2 = path.eventArgLowerAt(1); String tamed = arg2.equals("jumps") ? arg1 : arg2; - if (!tryEntity(entity, tamed) || !tamed.equals(CoreUtilities.toLowerCase(variant.toString()))) { + if (!tryEntity(entity, tamed)) { return false; } @@ -98,9 +96,6 @@ public ObjectTag getContext(String name) { else if (name.equals("color")) { return color; } - else if (name.equals("variant")) { - return variant; - } else if (name.equals("power")) { return new ElementTag(power); } @@ -112,7 +107,6 @@ public void onHorseJumps(HorseJumpEvent event) { if (event.getEntity() instanceof Horse) { entity = new EntityTag(event.getEntity()); color = new ElementTag(((Horse) event.getEntity()).getColor().name()); - variant = new ElementTag(event.getEntity().getVariant().name()); power = event.getPower(); this.event = event; fire(event); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java index 0b0240ea96..4755284252 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksBlockScriptEvent.java @@ -70,12 +70,12 @@ public boolean matches(ScriptPath path) { if (!runInCheck(path, location)) { return false; } - if (!runWithCheck(path, new ItemTag(event.getPlayer().getItemInHand()))) { + if (!runWithCheck(path, new ItemTag(event.getPlayer().getEquipment().getItemInMainHand()))) { return false; } // Deprecated in favor of with: format if (path.eventArgLowerAt(3).equals("with") - && !tryItem(new ItemTag(event.getPlayer().getItemInHand()), path.eventArgLowerAt(4))) { + && !tryItem(new ItemTag(event.getPlayer().getEquipment().getItemInMainHand()), path.eventArgLowerAt(4))) { return false; } return super.matches(path); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java index 2fce2993df..23b5f33910 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerDragsInInvScriptEvent.java @@ -137,7 +137,7 @@ public void onPlayerDragsInInv(InventoryDragEvent event) { @Override public void run() { entity.getPlayerEntity().updateInventory(); - if (holder != null && holder instanceof Player) { + if (holder instanceof Player) { ((Player) holder).updateInventory(); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java index c91527b8d6..082e6787b2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerRightClicksEntityScriptEvent.java @@ -114,7 +114,7 @@ public void playerRightClicksEntityHandler(PlayerInteractEntityEvent event) { return; } entity = new EntityTag(event.getRightClicked()); - item = new ItemTag(event.getPlayer().getItemInHand()); + item = new ItemTag(event.getPlayer().getEquipment().getItemInMainHand()); this.event = event; fire(event); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/abstracts/ProfileEditor.java b/plugin/src/main/java/com/denizenscript/denizen/nms/abstracts/ProfileEditor.java index 03cf8a6ee8..cfd924fb5a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/nms/abstracts/ProfileEditor.java +++ b/plugin/src/main/java/com/denizenscript/denizen/nms/abstracts/ProfileEditor.java @@ -74,9 +74,7 @@ private static class PlayerProfileEditorListener implements Listener { @EventHandler public void onPlayerQuit(PlayerQuitEvent event) { UUID uuid = event.getPlayer().getUniqueId(); - if (fakeProfiles.containsKey(uuid)) { - fakeProfiles.remove(uuid); - } + fakeProfiles.remove(uuid); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java index 589866b97b..56a3f0f6d7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/EntityHelper.java @@ -3,6 +3,7 @@ import com.denizenscript.denizen.nms.NMSHandler; import com.denizenscript.denizen.nms.util.BoundingBox; import com.denizenscript.denizen.nms.util.jnbt.CompoundTag; +import com.denizenscript.denizen.utilities.DenizenAPI; import com.denizenscript.denizencore.utilities.debugging.Debug; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -103,8 +104,8 @@ public class EnforcePlayerHides implements Listener { public void onPlayerJoin(PlayerJoinEvent event) { for (UUID id : hiddenByDefaultPlayers) { Entity pTarget = Bukkit.getEntity(id); - if (pTarget != null && pTarget instanceof Player) { - event.getPlayer().hidePlayer((Player) pTarget); + if (pTarget instanceof Player) { + event.getPlayer().hidePlayer(DenizenAPI.getCurrentInstance(), (Player) pTarget); } } final Player pl = event.getPlayer(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/actions/ActionHandler.java b/plugin/src/main/java/com/denizenscript/denizen/npc/actions/ActionHandler.java index 21f63ff003..e17be1d255 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/actions/ActionHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/actions/ActionHandler.java @@ -27,11 +27,6 @@ public ActionHandler(Denizen denizen) { this.denizen = denizen; } - public String doAction(String actionName, NPCTag npc, PlayerTag player, AssignmentScriptContainer assignment) { - return doAction(actionName, npc, player, assignment, null); - } - - public String doAction(String actionName, NPCTag npc, PlayerTag player, AssignmentScriptContainer assignment, Map context) { if (context == null) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/speech/DenizenChat.java b/plugin/src/main/java/com/denizenscript/denizen/npc/speech/DenizenChat.java index 7b9d051b77..bc4eceaa0c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/speech/DenizenChat.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/speech/DenizenChat.java @@ -13,7 +13,6 @@ import net.citizensnpcs.npc.ai.speech.TalkableEntity; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; -import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.Iterator; @@ -136,9 +135,7 @@ private void talkToBystanders(Talkable talkable, String text, DenizenSpeechConte double range = context.getChatRange(); List bystanderEntities = new ArrayList<>(); if (range == 0D) { - for (Player player : Bukkit.getServer().getOnlinePlayers()) { - bystanderEntities.add(player); - } + bystanderEntities.addAll(Bukkit.getServer().getOnlinePlayers()); } else { bystanderEntities = talkable.getEntity().getNearbyEntities(range, range, range); diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/AssignmentTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/AssignmentTrait.java index 415c091a92..01417d4d42 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/AssignmentTrait.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/AssignmentTrait.java @@ -274,7 +274,7 @@ public void onDeath(EntityDeathEvent deathEvent) { } else if (killerEntity instanceof Projectile) { ProjectileSource shooter = ((Projectile) killerEntity).getShooter(); - if (shooter != null && shooter instanceof LivingEntity) { + if (shooter instanceof LivingEntity) { context.put("shooter", new EntityTag((LivingEntity) shooter).getDenizenObject()); if (shooter instanceof Player) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/ConstantsTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/ConstantsTrait.java index 650dc6dde4..51c76a784e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/ConstantsTrait.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/ConstantsTrait.java @@ -108,9 +108,7 @@ public void setConstant(String name, String value) { * @param name name of the constant, case in-sensitive */ public void removeConstant(String name) { - if (constants.containsKey(CoreUtilities.toLowerCase(name))) { - constants.remove(CoreUtilities.toLowerCase(name)); - } + constants.remove(CoreUtilities.toLowerCase(name)); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MobproxTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MobproxTrait.java index 36985810f6..f78a718c08 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MobproxTrait.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MobproxTrait.java @@ -49,14 +49,11 @@ public void run() { int range = frange.getLast().asInteger(); boolean acceptnpc = facceptnpc.getLast().asBoolean(); List nearby = liveEnt.getNearbyEntities(range, range, range); - List removeme = new ArrayList<>(); - removeme.addAll(inrange); + List removeme = new ArrayList<>(inrange); for (Entity ent : nearby) { if (ent instanceof LivingEntity && (!(ent instanceof Player) || EntityTag.isCitizensNPC(ent)) && (acceptnpc || (!EntityTag.isCitizensNPC(ent)))) { - if (removeme.contains(ent)) { - removeme.remove(ent); - } + removeme.remove(ent); if (!inrange.contains(ent)) { inrange.add(ent); callAction("enter", ent); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java index 58e1d60b16..a548aab618 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java @@ -268,9 +268,8 @@ public static void registerTags() { } int x = Integer.parseInt(coords.get(0)); int z = Integer.parseInt(coords.get(1)); - ChunkTag chunk = object; - return new ChunkTag(chunk.world, chunk.chunkX + x, chunk.chunkZ + z); + return new ChunkTag(object.world, object.chunkX + x, object.chunkZ + z); }); @@ -296,9 +295,8 @@ public static void registerTags() { } int x = Integer.parseInt(coords.get(0)); int z = Integer.parseInt(coords.get(1)); - ChunkTag chunk = object; - return new ChunkTag(chunk.world, chunk.chunkX - x, chunk.chunkZ - z); + return new ChunkTag(object.world, object.chunkX - x, object.chunkZ - z); }); @@ -349,9 +347,8 @@ public static void registerTags() { // Returns a cuboid of this chunk. // --> registerTag("cuboid", (attribute, object) -> { - ChunkTag chunk = object; - return new CuboidTag(new Location(chunk.getWorld(), chunk.getX() * 16, 0, chunk.getZ() * 16), - new Location(chunk.getWorld(), chunk.getX() * 16 + 15, 255, chunk.getZ() * 16 + 15)); + return new CuboidTag(new Location(object.getWorld(), object.getX() * 16, 0, object.getZ() * 16), + new Location(object.getWorld(), object.getX() * 16 + 15, 255, object.getZ() * 16 + 15)); }); // <--[tag] diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java index 54b29b6a4a..c9c419a6db 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java @@ -133,7 +133,7 @@ public static NPCTag getNPCFrom(Entity entity) { } public static boolean isPlayer(Entity entity) { - return entity != null && entity instanceof Player && !isNPC(entity); + return entity instanceof Player && !isNPC(entity); } public static PlayerTag getPlayerFrom(Entity entity) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java index 79c3f6358b..243c6810b3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java @@ -2118,9 +2118,6 @@ else if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName // --> registerTag("location", (attribute, object) -> { LocationTag location = object.getLocation(); - if (location == null) { - return null; - } return location; }); @@ -2250,9 +2247,6 @@ else if (slot > object.getInventory().getSize() - 1) { // --> registerTag("equipment", (attribute, object) -> { ListTag equipment = object.getEquipment(); - if (equipment == null) { - return null; - } return equipment; }); @@ -2353,9 +2347,6 @@ else if ((object.inventory instanceof FurnaceInventory)) { // --> registerTag("fuel", (attribute, object) -> { ItemTag fuel = object.getFuel(); - if (fuel == null) { - return null; - } return fuel; }); @@ -2368,9 +2359,6 @@ else if ((object.inventory instanceof FurnaceInventory)) { // --> registerTag("input", (attribute, object) -> { ItemTag smelting = object.getInput(); - if (smelting == null) { - return null; - } return smelting; }); registerTag("smelting", tagProcessor.registeredObjectTags.get("input")); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java index efe4e67c36..a884efcebf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java @@ -789,12 +789,11 @@ public static void registerTags() { if (attribute.getAttribute(2).equals("formatted")) { return object; } - ItemTag item = object; if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13) && - item.getItemStack().hasItemMeta() && item.getItemStack().getItemMeta() instanceof BlockStateMeta) { - return new MaterialTag(new ModernBlockData(((BlockStateMeta) item.getItemStack().getItemMeta()).getBlockState())); + object.getItemStack().hasItemMeta() && object.getItemStack().getItemMeta() instanceof BlockStateMeta) { + return new MaterialTag(new ModernBlockData(((BlockStateMeta) object.getItemStack().getItemMeta()).getBlockState())); } - return item.getMaterial(); + return object.getMaterial(); }); // <--[tag] @@ -858,10 +857,9 @@ public static void registerTags() { // --> registerTag("recipe_ids", (attribute, object) -> { String type = attribute.hasContext(1) ? CoreUtilities.toLowerCase(attribute.getContext(1)) : null; - ItemTag item = object; - ItemScriptContainer container = item.isItemscript() ? ItemScriptHelper.getItemScriptContainer(item.getItemStack()) : null; + ItemScriptContainer container = object.isItemscript() ? ItemScriptHelper.getItemScriptContainer(object.getItemStack()) : null; ListTag list = new ListTag(); - for (Recipe recipe : Bukkit.getRecipesFor(item.getItemStack())) { + for (Recipe recipe : Bukkit.getRecipesFor(object.getItemStack())) { if (!Utilities.isRecipeOfType(recipe, type)) { continue; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java index bb01f6dba1..b2e42ab9d4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java @@ -271,13 +271,12 @@ else if (split.size() == 5) // x,y,z,pitch,yaw { try { - LocationTag output = new LocationTag(null, + return new LocationTag(null, Double.valueOf(split.get(0)), Double.valueOf(split.get(1)), Double.valueOf(split.get(2)), Float.valueOf(split.get(3)), Float.valueOf(split.get(4))); - return output; } catch (Exception e) { if (context == null || context.debug) { @@ -1044,8 +1043,7 @@ public static void registerTags() { if (!object.isChunkLoadedSafe()) { return null; } - ObjectTag obj = ElementTag.handleNull(object.identify() + ".inventory", object.getInventory(), "InventoryTag", attribute.hasAlternative()); - return obj; + return ElementTag.handleNull(object.identify() + ".inventory", object.getInventory(), "InventoryTag", attribute.hasAlternative()); }); // <--[tag] diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java index acd723ee74..b652447c83 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java @@ -800,12 +800,11 @@ public static void registerTags() { // Returns the explosion resistance for all blocks of this material type. // --> registerTag("block_resistance", (attribute, object) -> { - MaterialTag material = object; - if (!NMSHandler.getBlockHelper().hasBlock(material.getMaterial())) { + if (!NMSHandler.getBlockHelper().hasBlock(object.getMaterial())) { Debug.echoError("Provided material does not have a placeable block."); return null; } - return new ElementTag(NMSHandler.getBlockHelper().getBlockResistance(material.getMaterial())); + return new ElementTag(NMSHandler.getBlockHelper().getBlockResistance(object.getMaterial())); }); // <--[tag] @@ -815,12 +814,11 @@ public static void registerTags() { // Returns the value representing how hard a material, used as a basis for calculating the time it takes to break. // --> registerTag("hardness", (attribute, object) -> { - MaterialTag material = object; - if (!material.getMaterial().isBlock()) { + if (!object.getMaterial().isBlock()) { Debug.echoError("Provided material does not have a placeable block."); return null; } - return new ElementTag(material.getMaterial().getHardness()); + return new ElementTag(object.getMaterial().getHardness()); }); // <--[tag] @@ -892,11 +890,10 @@ public static void registerTags() { // Returns an item of the material. // --> registerTag("item", (attribute, object) -> { - MaterialTag material = object; - ItemTag item = new ItemTag(material, 1); + ItemTag item = new ItemTag(object, 1); if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13)) { if (item.getItemStack().hasItemMeta() && item.getItemStack().getItemMeta() instanceof BlockStateMeta) { - ((BlockStateMeta) item.getItemStack().getItemMeta()).setBlockState(material.modernData.getBlockState()); + ((BlockStateMeta) item.getItemStack().getItemMeta()).setBlockState(object.modernData.getBlockState()); } } return item; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java index 6d9bc7bb29..ce4a03f613 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java @@ -2725,7 +2725,7 @@ public void adjust(Mechanism mechanism) { // --> if (mechanism.matches("attack_cooldown") && mechanism.requireObject(DurationTag.class)) { NMSHandler.getPlayerHelper().setAttackCooldown(getPlayerEntity(), - mechanism.getValue().asType(DurationTag.class).getTicksAsInt()); + mechanism.getValue().asType(DurationTag.class, mechanism.context).getTicksAsInt()); } // <--[mechanism] diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitQueueProperties.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitQueueProperties.java index bd857cf6b1..034ac116c7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitQueueProperties.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitQueueProperties.java @@ -57,12 +57,7 @@ else if (object.queue.getEntries().size() > 0) { else if (!attribute.hasAlternative()) { Debug.echoError(object.queue, "Can't determine a linked NPC."); } - if (npc == null) { - return null; - } - else { - return npc; - } + return npc; }); // <--[tag] @@ -83,12 +78,7 @@ else if (object.queue.getEntries().size() > 0) { else { Debug.echoError(object.queue, "Can't determine a linked player."); } - if (player == null) { - return null; - } - else { - return player; - } + return player; }); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java index d8308c3139..93f8226b68 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAreaEffectCloud.java @@ -281,7 +281,7 @@ public ObjectTag getObjectAttribute(Attribute attribute) { // --> if (attribute.startsWith("source")) { ProjectileSource shooter = getHelper().getSource(); - if (shooter != null && shooter instanceof LivingEntity) { + if (shooter instanceof LivingEntity) { return new EntityTag((LivingEntity) shooter) .getObjectAttribute(attribute.fulfill(1)); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java index 72eff61f15..deae60445a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityBoundingBox.java @@ -43,9 +43,7 @@ public static EntityBoundingBox getFrom(ObjectTag object) { private static Set modifiedBoxes = new HashSet<>(); public static void remove(UUID uuid) { - if (modifiedBoxes.contains(uuid)) { - modifiedBoxes.remove(uuid); - } + modifiedBoxes.remove(uuid); } private EntityBoundingBox(EntityTag entity) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityCustomName.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityCustomName.java index eb57da76da..2b17715572 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityCustomName.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityCustomName.java @@ -36,13 +36,7 @@ private EntityCustomName(EntityTag ent) { @Override public String getPropertyString() { - String name = entity.getBukkitEntity().getCustomName(); - if (name == null) { - return null; - } - else { - return name; - } + return entity.getBukkitEntity().getCustomName(); } @Override diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java index 5370663b12..d03b275d81 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpeed.java @@ -8,7 +8,6 @@ import com.denizenscript.denizencore.objects.properties.Property; import com.denizenscript.denizencore.tags.Attribute; import org.bukkit.entity.Boat; -import org.bukkit.entity.EntityType; import org.bukkit.entity.Minecart; public class EntitySpeed implements Property { @@ -21,17 +20,7 @@ public static boolean describes(ObjectTag entity) { if (ent.isLivingEntity()) { return true; } - else { - EntityType entityType = ent.getBukkitEntityType(); - return entityType == EntityType.BOAT - || entityType == EntityType.MINECART - || entityType == EntityType.MINECART_CHEST - || entityType == EntityType.MINECART_COMMAND - || entityType == EntityType.MINECART_FURNACE - || entityType == EntityType.MINECART_HOPPER - || entityType == EntityType.MINECART_MOB_SPAWNER - || entityType == EntityType.MINECART_TNT; - } + return ent.getBukkitEntity() instanceof Boat || ent.getBukkitEntity() instanceof Minecart; } public static EntitySpeed getFrom(ObjectTag entity) { @@ -72,17 +61,10 @@ public ElementTag getSpeed() { return new ElementTag(NMSHandler.getEntityHelper().getSpeed(entity.getBukkitEntity())); } else { - EntityType entityType = entity.getBukkitEntityType(); - if (entityType == EntityType.BOAT) { + if (entity.getBukkitEntity() instanceof Boat) { return new ElementTag(((Boat) entity.getBukkitEntity()).getMaxSpeed()); } - else if (entityType == EntityType.MINECART - || entityType == EntityType.MINECART_CHEST - || entityType == EntityType.MINECART_COMMAND - || entityType == EntityType.MINECART_FURNACE - || entityType == EntityType.MINECART_HOPPER - || entityType == EntityType.MINECART_MOB_SPAWNER - || entityType == EntityType.MINECART_TNT) { + else if (entity.getBukkitEntity() instanceof Minecart) { return new ElementTag(((Minecart) entity.getBukkitEntity()).getMaxSpeed()); } } @@ -130,17 +112,10 @@ public void adjust(Mechanism mechanism) { NMSHandler.getEntityHelper().setSpeed(entity.getBukkitEntity(), value); } else { - EntityType entityType = entity.getBukkitEntityType(); - if (entityType == EntityType.BOAT) { + if (entity.getBukkitEntity() instanceof Boat) { ((Boat) entity.getBukkitEntity()).setMaxSpeed(value); } - else if (entityType == EntityType.MINECART - || entityType == EntityType.MINECART_CHEST - || entityType == EntityType.MINECART_COMMAND - || entityType == EntityType.MINECART_FURNACE - || entityType == EntityType.MINECART_HOPPER - || entityType == EntityType.MINECART_MOB_SPAWNER - || entityType == EntityType.MINECART_TNT) { + else if (entity.getBukkitEntity() instanceof Minecart) { ((Minecart) entity.getBukkitEntity()).setMaxSpeed(value); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java index 2967bed58a..20618c2d3a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryHolder.java @@ -157,9 +157,6 @@ public static void registerTags() { // --> PropertyParser.registerTag("id_holder", (attribute, object) -> { ObjectTag holder = object.holder; - if (holder == null) { - return null; - } return holder; }); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HeadCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HeadCommand.java index 4e883b4218..a6844b6d73 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HeadCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HeadCommand.java @@ -109,7 +109,7 @@ public void execute(ScriptEntry scriptEntry) { if (skin != null) { item = MaterialCompat.createPlayerHead(); ItemMeta itemMeta = item.getItemMeta(); - ((SkullMeta) itemMeta).setOwner(skin.asString().replaceAll("[pP]@", "")); // TODO: 1.12 and up - switch to setOwningPlayer? + ((SkullMeta) itemMeta).setOwner(skin.asString()); item.setItemMeta(itemMeta); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/ScribeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/ScribeCommand.java index 4dc3b395e0..82f1e66ad4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/ScribeCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/ScribeCommand.java @@ -140,7 +140,7 @@ private void giveBook(Player player, ItemStack book) { } private void equipBook(Player player, ItemStack book) { - ItemStack currItem = player.getItemInHand(); + ItemStack currItem = player.getEquipment().getItemInMainHand(); Inventory inv = player.getInventory(); int emptySpot = inv.firstEmpty(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java index 4320488111..03e02d3855 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/TakeCommand.java @@ -198,7 +198,7 @@ public void execute(ScriptEntry scriptEntry) { } case ITEMINHAND: { - int inHandAmt = Utilities.getEntryPlayer(scriptEntry).getPlayerEntity().getItemInHand().getAmount(); + int inHandAmt = Utilities.getEntryPlayer(scriptEntry).getPlayerEntity().getEquipment().getItemInMainHand().getAmount(); int theAmount = (int) qty.asDouble(); ItemStack newHandItem = new ItemStack(Material.AIR); if (theAmount > inHandAmt) { @@ -213,7 +213,7 @@ public void execute(ScriptEntry scriptEntry) { } else { // amount is less than what's in hand, need to make a new itemstack of what's left... - newHandItem = Utilities.getEntryPlayer(scriptEntry).getPlayerEntity().getItemInHand().clone(); + newHandItem = Utilities.getEntryPlayer(scriptEntry).getPlayerEntity().getEquipment().getItemInMainHand().clone(); newHandItem.setAmount(inHandAmt - theAmount); Utilities.getEntryPlayer(scriptEntry).getPlayerEntity().setItemInHand(newHandItem); Utilities.getEntryPlayer(scriptEntry).getPlayerEntity().updateInventory(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/SidebarCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/SidebarCommand.java index 9e02d9dde7..e290787b1b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/SidebarCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/SidebarCommand.java @@ -491,9 +491,7 @@ public static class SidebarEvents implements Listener { @EventHandler public void onPlayerQuit(PlayerQuitEvent event) { UUID uuid = event.getPlayer().getUniqueId(); - if (sidebars.containsKey(uuid)) { - sidebars.remove(uuid); - } + sidebars.remove(uuid); } } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java index 471d30405c..9745cb4dee 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java @@ -194,7 +194,7 @@ public void execute(ScriptEntry scriptEntry) { Debug.echoError(scriptEntry.getResidingQueue(), "Cannot EXECUTE AS_NPC unless the NPC is Player-Type."); return; } - ((Player) Utilities.getEntryNPC(scriptEntry).getEntity()).setOp(true); + Utilities.getEntryNPC(scriptEntry).getEntity().setOp(true); try { ((Player) Utilities.getEntryNPC(scriptEntry).getEntity()).performCommand(command); } @@ -202,7 +202,7 @@ public void execute(ScriptEntry scriptEntry) { Debug.echoError(scriptEntry.getResidingQueue(), "Exception while executing command as NPC-OP."); Debug.echoError(scriptEntry.getResidingQueue(), e); } - ((Player) Utilities.getEntryNPC(scriptEntry).getEntity()).setOp(false); + Utilities.getEntryNPC(scriptEntry).getEntity().setOp(false); break; case AS_SERVER: diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/AbstractTrigger.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/AbstractTrigger.java index 46e7b4f685..a70945ab27 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/AbstractTrigger.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/AbstractTrigger.java @@ -74,11 +74,6 @@ public AbstractTrigger activate() { } - public boolean parse(NPCTag npc, PlayerTag player, InteractScriptContainer script) { - return parse(npc, player, script, null, null); - } - - public boolean parse(NPCTag npc, PlayerTag player, InteractScriptContainer script, String id) { return parse(npc, player, script, id, null); } @@ -122,31 +117,4 @@ public boolean parse(NPCTag npc, PlayerTag player, InteractScriptContainer scrip return true; } - - /** - * This method will find all NPCs within a certain range of a location that - * have a trigger, and the trigger is enabled. - * - * @param location the location to search around - * @param maxRange how far to search - * @return The Set of NPCs that are - */ - // TODO: Delete? - public Set getActiveNPCsWithinRangeWithTrigger(Location location, int maxRange) { - Set closestNPCs = new HashSet<>(); - - Iterator it = CitizensAPI.getNPCRegistry().iterator(); - while (it.hasNext()) { - NPC npc = it.next(); - if (npc.isSpawned() - && npc.getEntity().getLocation().getWorld().equals(location.getWorld()) - && npc.getEntity().getLocation().distance(location) < maxRange - && npc.hasTrait(TriggerTrait.class) - && npc.getTrait(TriggerTrait.class).isEnabled(name)) { - closestNPCs.add(npc); - } - } - - return closestNPCs; - } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java index dca1e9f69c..a036c9564e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ChatTrigger.java @@ -262,8 +262,7 @@ public ChatContext process(Player player, String message) { String messageLow = CoreUtilities.toLowerCase(message); // Use TreeMap to sort chat triggers alphabetically - TreeMap idMap = new TreeMap<>(); - idMap.putAll(script.getIdMapFor(ChatTrigger.class, denizenPlayer)); + TreeMap idMap = new TreeMap<>(script.getIdMapFor(ChatTrigger.class, denizenPlayer)); if (!idMap.isEmpty()) { // Iterate through the different id entries in the step's chat trigger diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ClickTrigger.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ClickTrigger.java index a9a07bad4f..b427371832 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ClickTrigger.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ClickTrigger.java @@ -134,7 +134,7 @@ public void clickTrigger(NPCRightClickEvent event) { if (item == null) { Debug.echoError("Invalid click trigger in script '" + script.getName() + "' (null trigger item)!"); } - if (item != null && item.comparesTo(player.getPlayerEntity().getItemInHand()) >= 0) { + if (item != null && item.comparesTo(player.getPlayerEntity().getEquipment().getItemInMainHand()) >= 0) { id = entry.getKey(); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/DamageTrigger.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/DamageTrigger.java index 0e45e87919..99289ada16 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/DamageTrigger.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/DamageTrigger.java @@ -135,7 +135,7 @@ public void damageTrigger(EntityDamageByEntityEvent event) { if (!idMap.isEmpty()) { for (Map.Entry entry : idMap.entrySet()) { String entry_value = TagManager.tag(entry.getValue(), new BukkitTagContext(dplayer, npc, false, null, false, new ScriptTag(script))); - if (ItemTag.valueOf(entry_value, script).comparesTo(dplayer.getPlayerEntity().getItemInHand()) >= 0) { + if (ItemTag.valueOf(entry_value, script).comparesTo(dplayer.getPlayerEntity().getEquipment().getItemInMainHand()) >= 0) { id = entry.getKey(); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/BukkitTagContext.java b/plugin/src/main/java/com/denizenscript/denizen/tags/BukkitTagContext.java index 01da0b2466..19b9436055 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/tags/BukkitTagContext.java +++ b/plugin/src/main/java/com/denizenscript/denizen/tags/BukkitTagContext.java @@ -29,7 +29,7 @@ public BukkitTagContext(PlayerTag player, NPCTag npc, boolean instant, ScriptEnt } public BukkitTagContext(ScriptEntry entry, boolean instant) { - super(instant, entry != null ? entry.shouldDebug() : true, entry, entry != null ? entry.getScript() : null); + super(instant, entry == null || entry.shouldDebug(), entry, entry != null ? entry.getScript() : null); player = entry != null ? ((BukkitScriptEntryData) entry.entryData).getPlayer() : null; npc = entry != null ? ((BukkitScriptEntryData) entry.entryData).getNPC() : null; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java index 3705b6ca9a..fb8d766129 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java +++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java @@ -477,10 +477,7 @@ else if (recipe instanceof CookingRecipe) { // Returns a list of all registered command names in Bukkit. // --> if (attribute.startsWith("list_commands")) { - ListTag list = new ListTag(); - for (String cmd : CommandScriptHelper.knownCommands.keySet()) { - list.add(cmd); - } + ListTag list = new ListTag(CommandScriptHelper.knownCommands.keySet()); event.setReplaced(list.getAttribute(attribute.fulfill(1))); return; } @@ -1915,10 +1912,7 @@ else if (attribute.startsWith("npc_is_valid") // Returns a list of all currently active boss bar IDs. // --> else if (attribute.startsWith("current_bossbars")) { - ListTag dl = new ListTag(); - for (String str : BossBarCommand.bossBarMap.keySet()) { - dl.add(str); - } + ListTag dl = new ListTag(BossBarCommand.bossBarMap.keySet()); event.setReplaced(dl.getAttribute(attribute.fulfill(1))); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/CuboidBlockSet.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/CuboidBlockSet.java index c62d73d06a..5fe26e902d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/CuboidBlockSet.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/CuboidBlockSet.java @@ -26,7 +26,7 @@ public CuboidBlockSet(CuboidTag cuboid, Location center) { center_x = (int) (center.getX() - low.getX()); center_y = (int) (center.getY() - low.getY()); center_z = (int) (center.getZ() - low.getZ()); - blocks = new BlockData[(int) (x_width * y_length * z_height)]; + blocks = new BlockData[(x_width * y_length * z_height)]; int index = 0; for (int x = 0; x < x_width; x++) { for (int y = 0; y < y_length; y++) { @@ -170,7 +170,7 @@ public void rotateOne() { center_z = cx; for (int x = 0; x < z_height; x++) { for (int y = 0; y < y_length; y++) { - for (int z = (int) x_width - 1; z >= 0; z--) { + for (int z = x_width - 1; z >= 0; z--) { bd[index++] = blockAt(z, y, x); } } @@ -185,7 +185,7 @@ public void flipX() { BlockData[] bd = new BlockData[blocks.length]; int index = 0; center_x = x_width - center_x; - for (int x = (int) x_width - 1; x >= 0; x--) { + for (int x = x_width - 1; x >= 0; x--) { for (int y = 0; y < y_length; y++) { for (int z = 0; z < z_height; z++) { bd[index++] = blockAt(x, y, z); @@ -200,7 +200,7 @@ public void flipY() { int index = 0; center_x = x_width - center_x; for (int x = 0; x < x_width; x++) { - for (int y = (int) y_length - 1; y >= 0; y--) { + for (int y = y_length - 1; y >= 0; y--) { for (int z = 0; z < z_height; z++) { bd[index++] = blockAt(x, y, z); } @@ -215,7 +215,7 @@ public void flipZ() { center_x = x_width - center_x; for (int x = 0; x < x_width; x++) { for (int y = 0; y < y_length; y++) { - for (int z = (int) z_height - 1; z >= 0; z--) { + for (int z = z_height - 1; z >= 0; z--) { bd[index++] = blockAt(x, y, z); } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandManager.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandManager.java index 1a30bbc99c..e66f7b4b03 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandManager.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandManager.java @@ -139,10 +139,7 @@ private void executeMethod(String[] args, CommandSender sender, Object[] methodA try { method.invoke(instance, methodArgs); } - catch (IllegalArgumentException e) { - Debug.echoError(e); - } - catch (IllegalAccessException e) { + catch (IllegalArgumentException | IllegalAccessException e) { Debug.echoError(e); } catch (InvocationTargetException e) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/Injector.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/Injector.java index 2c8c1d2c3d..afcdd9445c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/Injector.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/Injector.java @@ -34,17 +34,7 @@ public Object getInstance(Class clazz) { return null; } } - catch (InvocationTargetException e) { - Debug.echoError("Error initializing commands class " + clazz + ": "); - Debug.echoError(e); - return null; - } - catch (InstantiationException e) { - Debug.echoError("Error initializing commands class " + clazz + ": "); - Debug.echoError(e); - return null; - } - catch (IllegalAccessException e) { + catch (InvocationTargetException | IllegalAccessException | InstantiationException e) { Debug.echoError("Error initializing commands class " + clazz + ": "); Debug.echoError(e); return null; diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/BukkitScriptEntryData.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/BukkitScriptEntryData.java index 1f2bd361e1..4b418e75ee 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/BukkitScriptEntryData.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/implementation/BukkitScriptEntryData.java @@ -71,7 +71,7 @@ public void transferDataFrom(ScriptEntryData scriptEntryData) { @Override public TagContext getTagContext() { return new BukkitTagContext(player, npc, false, scriptEntry, - scriptEntry != null ? scriptEntry.shouldDebug() : true, + scriptEntry == null || scriptEntry.shouldDebug(), scriptEntry != null ? scriptEntry.getScript() : null); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java index bd7349cf72..5e85c520b5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/midi/NoteBlockReceiver.java @@ -150,9 +150,7 @@ public void close() { } closing = true; Bukkit.getScheduler().scheduleSyncDelayedTask(DenizenAPI.getCurrentInstance(), () -> { - if (MidiUtil.receivers.containsKey(key)) { - MidiUtil.receivers.remove(key); - } + MidiUtil.receivers.remove(key); if (sequencer != null) { sequencer.close(); sequencer = null; diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/ItemChangeMessage.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/ItemChangeMessage.java index 33cee435f5..47e8877e86 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/ItemChangeMessage.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/packets/ItemChangeMessage.java @@ -78,7 +78,7 @@ public void inventoryOpen(InventoryOpenEvent event) { @EventHandler public void blockBreak(BlockBreakEvent event) { Player player = event.getPlayer(); - if (player != null && slotChanged.containsKey(player.getUniqueId())) { + if (player != null) { slotChanged.remove(player.getUniqueId()); } } @@ -86,7 +86,7 @@ public void blockBreak(BlockBreakEvent event) { @EventHandler public void playerInteract(PlayerInteractEvent event) { Player player = event.getPlayer(); - if (player != null && slotChanged.containsKey(player.getUniqueId())) { + if (player != null) { slotChanged.remove(player.getUniqueId()); } } diff --git a/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/BlockHelperImpl.java b/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/BlockHelperImpl.java index 6e577e77fb..9df3e13062 100644 --- a/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/BlockHelperImpl.java +++ b/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/BlockHelperImpl.java @@ -52,10 +52,7 @@ public T getTE(CraftBlockEntityState cbs) { f.setAccessible(true); return (T) f.get(cbs); } - catch (IllegalAccessException e) { - Debug.echoError(e); - } - catch (NoSuchFieldException e) { + catch (IllegalAccessException | NoSuchFieldException e) { Debug.echoError(e); } return null; @@ -100,7 +97,7 @@ public void setPlayerProfile(Skull skull, PlayerProfile playerProfile) { @Override public CompoundTag getNbtData(Block block) { - TileEntity tileEntity = getTE((CraftBlockEntityState) (CraftBlockState) block.getState()); + TileEntity tileEntity = getTE((CraftBlockEntityState) block.getState()); if (tileEntity == null) { return null; } @@ -109,7 +106,7 @@ public CompoundTag getNbtData(Block block) { @Override public void setNbtData(Block block, CompoundTag compoundTag) { - TileEntity tileEntity = getTE((CraftBlockEntityState) (CraftBlockState) block.getState()); + TileEntity tileEntity = getTE((CraftBlockEntityState) block.getState()); if (tileEntity == null) { return; } diff --git a/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/EntityHelperImpl.java b/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/EntityHelperImpl.java index 7a3f8b95e4..239ca1a7fb 100644 --- a/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/EntityHelperImpl.java +++ b/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/helpers/EntityHelperImpl.java @@ -6,6 +6,7 @@ import com.denizenscript.denizen.nms.interfaces.EntityHelper; import com.denizenscript.denizen.nms.util.BoundingBox; import com.denizenscript.denizen.nms.util.jnbt.CompoundTag; +import com.denizenscript.denizen.utilities.DenizenAPI; import com.denizenscript.denizen.utilities.Utilities; import net.minecraft.server.v1_12_R1.*; import org.bukkit.Location; @@ -389,7 +390,7 @@ public void run() { public void sendHidePacket(Player pl, Entity entity) { if (entity instanceof Player) { ensurePlayerHiding(); - pl.hidePlayer((Player) entity); + pl.hidePlayer(DenizenAPI.getCurrentInstance(), (Player) entity); return; } CraftPlayer craftPlayer = (CraftPlayer) pl; @@ -407,7 +408,7 @@ public void sendHidePacket(Player pl, Entity entity) { @Override public void sendShowPacket(Player pl, Entity entity) { if (entity instanceof Player) { - pl.showPlayer((Player) entity); + pl.showPlayer(DenizenAPI.getCurrentInstance(), (Player) entity); return; } CraftPlayer craftPlayer = (CraftPlayer) pl; diff --git a/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/impl/blocks/BlockDataImpl.java b/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/impl/blocks/BlockDataImpl.java index 9ee24b3db4..b161c7dc12 100644 --- a/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/impl/blocks/BlockDataImpl.java +++ b/v1_12/src/main/java/com/denizenscript/denizen/nms/v1_12/impl/blocks/BlockDataImpl.java @@ -37,7 +37,7 @@ public BlockDataImpl(Block block) { } public void setBlock(Block block, boolean physics) { - block.setTypeIdAndData(material.getId(), (byte) data, physics); + block.setTypeIdAndData(material.getId(), data, physics); if (ctag != null) { CompoundTagBuilder builder = ctag.createBuilder(); builder.putInt("x", block.getX()); diff --git a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/BlockHelperImpl.java b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/BlockHelperImpl.java index f48383d43c..705064527b 100644 --- a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/BlockHelperImpl.java +++ b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/BlockHelperImpl.java @@ -54,10 +54,7 @@ public T getTE(CraftBlockEntityState cbs) { f.setAccessible(true); return (T) f.get(cbs); } - catch (IllegalAccessException e) { - Debug.echoError(e); - } - catch (NoSuchFieldException e) { + catch (IllegalAccessException | NoSuchFieldException e) { Debug.echoError(e); } return null; @@ -107,7 +104,7 @@ public void setPlayerProfile(Skull skull, PlayerProfile playerProfile) { @Override public CompoundTag getNbtData(Block block) { - TileEntity tileEntity = getTE((CraftBlockEntityState) (CraftBlockState) block.getState()); + TileEntity tileEntity = getTE((CraftBlockEntityState) block.getState()); if (tileEntity == null) { return null; } @@ -116,7 +113,7 @@ public CompoundTag getNbtData(Block block) { @Override public void setNbtData(Block block, CompoundTag compoundTag) { - TileEntity tileEntity = getTE((CraftBlockEntityState) (CraftBlockState) block.getState()); + TileEntity tileEntity = getTE((CraftBlockEntityState) block.getState()); if (tileEntity == null) { return; } diff --git a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/EntityHelperImpl.java b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/EntityHelperImpl.java index cde3d3dd3f..4b7dae55fc 100644 --- a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/EntityHelperImpl.java +++ b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/EntityHelperImpl.java @@ -8,6 +8,7 @@ import com.denizenscript.denizen.nms.util.jnbt.CompoundTag; import com.denizenscript.denizen.nms.v1_13.impl.blocks.BlockDataImpl; import com.denizenscript.denizen.nms.v1_13.impl.jnbt.CompoundTagImpl; +import com.denizenscript.denizen.utilities.DenizenAPI; import com.denizenscript.denizen.utilities.Utilities; import net.minecraft.server.v1_13_R2.*; import org.bukkit.Bukkit; @@ -399,7 +400,7 @@ public void run() { public void sendHidePacket(Player pl, Entity entity) { if (entity instanceof Player) { ensurePlayerHiding(); - pl.hidePlayer((Player) entity); + pl.hidePlayer(DenizenAPI.getCurrentInstance(), (Player) entity); return; } CraftPlayer craftPlayer = (CraftPlayer) pl; @@ -417,7 +418,7 @@ public void sendHidePacket(Player pl, Entity entity) { @Override public void sendShowPacket(Player pl, Entity entity) { if (entity instanceof Player) { - pl.showPlayer((Player) entity); + pl.showPlayer(DenizenAPI.getCurrentInstance(), (Player) entity); return; } CraftPlayer craftPlayer = (CraftPlayer) pl; diff --git a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/ItemHelperImpl.java b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/ItemHelperImpl.java index ba9c6f7a62..c13e894293 100644 --- a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/ItemHelperImpl.java +++ b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/helpers/ItemHelperImpl.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.stream.Stream; public class ItemHelperImpl extends ItemHelper { @@ -35,10 +36,7 @@ public static IRecipe getNMSRecipe(NamespacedKey key) { MinecraftKey nmsKey = CraftNamespacedKey.toMinecraft(key); Object2ObjectLinkedOpenHashMap recipeMap = ((CraftServer) Bukkit.getServer()).getServer().getCraftingManager().recipes; IRecipe recipe = recipeMap.get(nmsKey); - if (recipe != null) { - return recipe; - } - return null; + return recipe; } @Override @@ -80,7 +78,7 @@ public void setShapedRecipeIngredient(ShapedRecipe recipe, char c, ItemStack ite @Override public void registerFurnaceRecipe(String keyName, String group, ItemStack result, ItemStack ingredient, float exp, int time, String type, boolean exact) { MinecraftKey key = new MinecraftKey("denizen", keyName); - RecipeItemStack itemRecipe = new RecipeItemStack(Arrays.asList(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient))).stream()); + RecipeItemStack itemRecipe = new RecipeItemStack(Stream.of(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient)))); itemRecipe.exact = exact; FurnaceRecipe recipe = new FurnaceRecipe(key, group, itemRecipe, CraftItemStack.asNMSCopy(result), exp, time); ((CraftServer) Bukkit.getServer()).getServer().getCraftingManager().a(recipe); @@ -91,7 +89,7 @@ public void registerShapelessRecipe(String keyName, String group, ItemStack resu MinecraftKey key = new MinecraftKey("denizen", keyName); ArrayList ingredientList = new ArrayList<>(); for (int i = 0; i < ingredients.length; i++) { - RecipeItemStack itemRecipe = new RecipeItemStack(Arrays.asList(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredients[i]))).stream()); + RecipeItemStack itemRecipe = new RecipeItemStack(Stream.of(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredients[i])))); itemRecipe.exact = exact[i]; ingredientList.add(itemRecipe); } diff --git a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/impl/jnbt/CompoundTagImpl.java b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/impl/jnbt/CompoundTagImpl.java index b47559f93c..885ebf57fd 100644 --- a/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/impl/jnbt/CompoundTagImpl.java +++ b/v1_13/src/main/java/com/denizenscript/denizen/nms/v1_13/impl/jnbt/CompoundTagImpl.java @@ -102,7 +102,7 @@ else if (base instanceof NBTTagShort) { tags.put(key, new ShortTag(((NBTTagShort) base).asShort())); } else if (base instanceof NBTTagString) { - tags.put(key, new StringTag(((NBTTagString) base).asString())); + tags.put(key, new StringTag(base.asString())); } else if (base instanceof NBTTagList) { NBTTagList list = (NBTTagList) base; diff --git a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java index b362a91fae..e05dfe2a99 100644 --- a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java +++ b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/EntityHelperImpl.java @@ -8,6 +8,7 @@ import com.denizenscript.denizen.nms.interfaces.EntityHelper; import com.denizenscript.denizen.nms.util.BoundingBox; import com.denizenscript.denizen.nms.util.jnbt.CompoundTag; +import com.denizenscript.denizen.utilities.DenizenAPI; import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizen.utilities.debugging.Debug; import net.minecraft.server.v1_14_R1.*; @@ -439,7 +440,7 @@ public void run() { public void sendHidePacket(Player pl, Entity entity) { if (entity instanceof Player) { ensurePlayerHiding(); - pl.hidePlayer((Player) entity); + pl.hidePlayer(DenizenAPI.getCurrentInstance(), (Player) entity); return; } CraftPlayer craftPlayer = (CraftPlayer) pl; @@ -458,7 +459,7 @@ public void sendHidePacket(Player pl, Entity entity) { @Override public void sendShowPacket(Player pl, Entity entity) { if (entity instanceof Player) { - pl.showPlayer((Player) entity); + pl.showPlayer(DenizenAPI.getCurrentInstance(), (Player) entity); return; } CraftPlayer craftPlayer = (CraftPlayer) pl; diff --git a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/ItemHelperImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/ItemHelperImpl.java index 4ce1d9e4dc..54d1b9e205 100644 --- a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/ItemHelperImpl.java +++ b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/ItemHelperImpl.java @@ -28,6 +28,7 @@ import org.bukkit.potion.PotionEffectType; import java.util.*; +import java.util.stream.Stream; public class ItemHelperImpl extends ItemHelper { @@ -83,7 +84,7 @@ public void setShapedRecipeIngredient(ShapedRecipe recipe, char c, ItemStack ite @Override public void registerFurnaceRecipe(String keyName, String group, ItemStack result, ItemStack ingredient, float exp, int time, String type, boolean exact) { MinecraftKey key = new MinecraftKey("denizen", keyName); - RecipeItemStack itemRecipe = new RecipeItemStack(Arrays.asList(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient))).stream()); + RecipeItemStack itemRecipe = new RecipeItemStack(Stream.of(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient)))); itemRecipe.exact = exact; RecipeCooking recipe; if (type.equalsIgnoreCase("smoker")) { @@ -104,7 +105,7 @@ else if (type.equalsIgnoreCase("campfire")) { @Override public void registerStonecuttingRecipe(String keyName, String group, ItemStack result, ItemStack ingredient, boolean exact) { MinecraftKey key = new MinecraftKey("denizen", keyName); - RecipeItemStack itemRecipe = new RecipeItemStack(Arrays.asList(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient))).stream()); + RecipeItemStack itemRecipe = new RecipeItemStack(Stream.of(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient)))); itemRecipe.exact = exact; RecipeStonecutting recipe = new RecipeStonecutting(key, group, itemRecipe, CraftItemStack.asNMSCopy(result)); ((CraftServer) Bukkit.getServer()).getServer().getCraftingManager().addRecipe(recipe); @@ -115,7 +116,7 @@ public void registerShapelessRecipe(String keyName, String group, ItemStack resu MinecraftKey key = new MinecraftKey("denizen", keyName); ArrayList ingredientList = new ArrayList<>(); for (int i = 0; i < ingredients.length; i++) { - RecipeItemStack itemRecipe = new RecipeItemStack(Arrays.asList(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredients[i]))).stream()); + RecipeItemStack itemRecipe = new RecipeItemStack(Stream.of(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredients[i])))); itemRecipe.exact = exact[i]; ingredientList.add(itemRecipe); } diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java index 3c784e01bb..752eb588cc 100644 --- a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java +++ b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/EntityHelperImpl.java @@ -8,6 +8,7 @@ import com.denizenscript.denizen.nms.interfaces.EntityHelper; import com.denizenscript.denizen.nms.util.BoundingBox; import com.denizenscript.denizen.nms.util.jnbt.CompoundTag; +import com.denizenscript.denizen.utilities.DenizenAPI; import com.denizenscript.denizen.utilities.Utilities; import com.denizenscript.denizen.utilities.debugging.Debug; import net.minecraft.server.v1_15_R1.*; @@ -439,7 +440,7 @@ public void run() { public void sendHidePacket(Player pl, Entity entity) { if (entity instanceof Player) { ensurePlayerHiding(); - pl.hidePlayer((Player) entity); + pl.hidePlayer(DenizenAPI.getCurrentInstance(), (Player) entity); return; } CraftPlayer craftPlayer = (CraftPlayer) pl; @@ -458,7 +459,7 @@ public void sendHidePacket(Player pl, Entity entity) { @Override public void sendShowPacket(Player pl, Entity entity) { if (entity instanceof Player) { - pl.showPlayer((Player) entity); + pl.showPlayer(DenizenAPI.getCurrentInstance(), (Player) entity); return; } CraftPlayer craftPlayer = (CraftPlayer) pl; diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/ItemHelperImpl.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/ItemHelperImpl.java index d8aea51a3b..7cd8ac1b95 100644 --- a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/ItemHelperImpl.java +++ b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/ItemHelperImpl.java @@ -28,6 +28,7 @@ import org.bukkit.potion.PotionEffectType; import java.util.*; +import java.util.stream.Stream; public class ItemHelperImpl extends ItemHelper { @@ -83,7 +84,7 @@ public void setShapedRecipeIngredient(ShapedRecipe recipe, char c, ItemStack ite @Override public void registerFurnaceRecipe(String keyName, String group, ItemStack result, ItemStack ingredient, float exp, int time, String type, boolean exact) { MinecraftKey key = new MinecraftKey("denizen", keyName); - RecipeItemStack itemRecipe = new RecipeItemStack(Arrays.asList(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient))).stream()); + RecipeItemStack itemRecipe = new RecipeItemStack(Stream.of(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient)))); itemRecipe.exact = exact; RecipeCooking recipe; if (type.equalsIgnoreCase("smoker")) { @@ -104,7 +105,7 @@ else if (type.equalsIgnoreCase("campfire")) { @Override public void registerStonecuttingRecipe(String keyName, String group, ItemStack result, ItemStack ingredient, boolean exact) { MinecraftKey key = new MinecraftKey("denizen", keyName); - RecipeItemStack itemRecipe = new RecipeItemStack(Arrays.asList(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient))).stream()); + RecipeItemStack itemRecipe = new RecipeItemStack(Stream.of(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredient)))); itemRecipe.exact = exact; RecipeStonecutting recipe = new RecipeStonecutting(key, group, itemRecipe, CraftItemStack.asNMSCopy(result)); ((CraftServer) Bukkit.getServer()).getServer().getCraftingManager().addRecipe(recipe); @@ -115,7 +116,7 @@ public void registerShapelessRecipe(String keyName, String group, ItemStack resu MinecraftKey key = new MinecraftKey("denizen", keyName); ArrayList ingredientList = new ArrayList<>(); for (int i = 0; i < ingredients.length; i++) { - RecipeItemStack itemRecipe = new RecipeItemStack(Arrays.asList(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredients[i]))).stream()); + RecipeItemStack itemRecipe = new RecipeItemStack(Stream.of(new RecipeItemStack.StackProvider(CraftItemStack.asNMSCopy(ingredients[i])))); itemRecipe.exact = exact[i]; ingredientList.add(itemRecipe); }