From 4c52a6da6eb3750667515b32fb14e024bcec189f Mon Sep 17 00:00:00 2001 From: Alex 'mcmonkey' Goodwin Date: Wed, 8 Jan 2020 17:03:19 -0800 Subject: [PATCH] remove a ton of pointless multinewlines --- plugin/src/javadoc/stylesheet.css | 4 ---- .../com/denizenscript/denizen/Denizen.java | 2 -- .../core/CuboidEnterExitSmartEvent.java | 4 ---- .../denizen/events/core/FlagSmartEvent.java | 4 ---- .../events/core/NPCNavigationSmartEvent.java | 4 ---- .../entity/EntityDespawnScriptEvent.java | 1 - .../events/entity/EntityTamesScriptEvent.java | 1 - .../entity/EntityUnleashedScriptEvent.java | 1 - .../events/entity/HorseJumpsScriptEvent.java | 1 - .../entity/ProjectileHitsScriptEvent.java | 1 - .../events/entity/SlimeSplitsScriptEvent.java | 1 - .../player/PlayerBreaksItemScriptEvent.java | 1 - .../PlayerEmptiesBucketScriptEvent.java | 2 -- .../player/PlayerFillsBucketScriptEvent.java | 2 -- .../PlayerItemTakesDamageScriptEvent.java | 1 - .../PlayerRightClicksEntityScriptEvent.java | 2 -- .../LingeringPotionSplashScriptEvent.java | 1 - .../world/StructureGrowsScriptEvent.java | 1 - .../denizen/flags/FlagManager.java | 2 -- .../denizenscript/denizen/nms/NMSHandler.java | 1 - .../denizen/npc/DenizenNPCHelper.java | 3 --- .../denizen/npc/traits/AssignmentTrait.java | 1 - .../denizen/npc/traits/ConstantsTrait.java | 10 --------- .../denizen/npc/traits/HealthTrait.java | 2 -- .../denizen/npc/traits/NicknameTrait.java | 1 - .../denizen/npc/traits/SittingTrait.java | 1 - .../denizen/npc/traits/SleepingTrait.java | 1 - .../denizen/npc/traits/TriggerTrait.java | 17 --------------- .../denizen/objects/BiomeTag.java | 4 ---- .../denizen/objects/ChunkTag.java | 1 - .../denizen/objects/ColorTag.java | 2 -- .../denizen/objects/CuboidTag.java | 21 ------------------- .../denizen/objects/EllipsoidTag.java | 1 - .../denizen/objects/EntityTag.java | 11 ---------- .../denizen/objects/InventoryTag.java | 9 -------- .../denizen/objects/ItemTag.java | 9 -------- .../denizen/objects/LocationTag.java | 9 -------- .../denizen/objects/MaterialTag.java | 5 ----- .../denizenscript/denizen/objects/NPCTag.java | 5 ----- .../denizen/objects/PlayerTag.java | 20 ------------------ .../denizen/objects/PluginTag.java | 4 ---- .../denizen/objects/WorldTag.java | 8 ------- .../objects/notable/NotableManager.java | 2 -- .../bukkit/BukkitElementProperties.java | 1 - .../bukkit/BukkitListProperties.java | 1 - .../bukkit/BukkitScriptProperties.java | 1 - .../objects/properties/entity/EntityAI.java | 1 - .../objects/properties/entity/EntityAge.java | 2 -- .../properties/entity/EntityArmorBonus.java | 1 - .../properties/entity/EntityArmorPose.java | 1 - .../properties/entity/EntityBoundingBox.java | 1 - .../properties/entity/EntityColor.java | 1 - .../properties/entity/EntityHealth.java | 1 - .../properties/entity/EntityInventory.java | 1 - .../properties/entity/EntityJumpStrength.java | 1 - .../properties/entity/EntityProfession.java | 1 - .../properties/entity/EntityRotation.java | 1 - .../entity/EntityScoreboardTags.java | 1 - .../properties/entity/EntitySilent.java | 1 - .../properties/entity/EntitySmall.java | 1 - .../properties/entity/EntitySpeed.java | 1 - .../objects/properties/entity/EntityTame.java | 1 - .../properties/entity/EntityVisible.java | 1 - .../inventory/InventoryContents.java | 1 - .../objects/properties/item/ItemApple.java | 2 -- .../properties/item/ItemBaseColor.java | 2 -- .../properties/item/ItemBlockMaterial.java | 1 - .../objects/properties/item/ItemBook.java | 1 - .../properties/item/ItemCanDestroy.java | 1 - .../properties/item/ItemCanPlaceOn.java | 1 - .../objects/properties/item/ItemColor.java | 2 -- .../properties/item/ItemCustomModel.java | 2 -- .../properties/item/ItemDisplayname.java | 2 -- .../properties/item/ItemDurability.java | 2 -- .../properties/item/ItemEnchantments.java | 2 -- .../objects/properties/item/ItemFirework.java | 2 -- .../objects/properties/item/ItemFlags.java | 2 -- .../properties/item/ItemInventory.java | 2 -- .../item/ItemKnowledgeBookRecipes.java | 2 -- .../objects/properties/item/ItemLock.java | 2 -- .../objects/properties/item/ItemLore.java | 3 --- .../objects/properties/item/ItemMap.java | 1 - .../objects/properties/item/ItemNBT.java | 1 - .../objects/properties/item/ItemPatterns.java | 2 -- .../properties/item/ItemPlantgrowth.java | 2 -- .../objects/properties/item/ItemPotion.java | 3 --- .../objects/properties/item/ItemQuantity.java | 2 -- .../properties/item/ItemRepairCost.java | 2 -- .../objects/properties/item/ItemScript.java | 2 -- .../properties/item/ItemSignContents.java | 2 -- .../properties/item/ItemSkullskin.java | 2 -- .../objects/properties/item/ItemSpawnEgg.java | 2 -- .../properties/item/ItemSpawnerCount.java | 1 - .../properties/item/ItemSpawnerDelay.java | 1 - .../item/ItemSpawnerMaxNearbyEntities.java | 1 - .../item/ItemSpawnerPlayerRange.java | 1 - .../properties/item/ItemSpawnerRange.java | 1 - .../properties/item/ItemSpawnerType.java | 1 - .../properties/item/ItemUnbreakable.java | 1 - .../properties/material/MaterialAge.java | 1 - .../properties/material/MaterialCampfire.java | 1 - .../material/MaterialDirectional.java | 1 - .../properties/material/MaterialFaces.java | 1 - .../properties/material/MaterialHalf.java | 1 - .../properties/material/MaterialLeafSize.java | 1 - .../material/MaterialLightable.java | 1 - .../material/MaterialPersistent.java | 1 - .../properties/material/MaterialPickle.java | 1 - .../properties/material/MaterialSlab.java | 1 - .../material/MaterialSwitchFace.java | 1 - .../commands/core/CooldownCommand.java | 4 ---- .../scripts/commands/core/FlagCommand.java | 2 -- .../scripts/commands/core/NoteCommand.java | 2 -- .../scripts/commands/core/ZapCommand.java | 1 - .../scripts/commands/entity/AgeCommand.java | 1 - .../commands/entity/HealthCommand.java | 2 -- .../scripts/commands/entity/WalkCommand.java | 4 ---- .../entity/WalkCommandCitizensEvents.java | 1 - .../commands/item/DisplayItemCommand.java | 1 - .../scripts/commands/item/GiveCommand.java | 1 - .../scripts/commands/npc/ActionCommand.java | 1 - .../scripts/commands/npc/AnchorCommand.java | 2 -- .../commands/player/CompassCommand.java | 3 --- .../commands/player/ExperienceCommand.java | 2 -- .../commands/player/ShowFakeCommand.java | 2 -- .../commands/server/AnnounceCommand.java | 1 - .../commands/world/AdjustBlockCommand.java | 1 - .../scripts/commands/world/DropCommand.java | 2 -- .../commands/world/GameRuleCommand.java | 1 - .../commands/world/ModifyBlockCommand.java | 3 --- .../commands/world/SchematicCommand.java | 2 -- .../scripts/commands/world/StrikeCommand.java | 1 - .../containers/core/InteractScriptHelper.java | 2 -- .../containers/core/ItemScriptHelper.java | 2 -- .../scripts/triggers/AbstractTrigger.java | 5 ----- .../scripts/triggers/TriggerRegistry.java | 1 - .../scripts/triggers/core/ChatTrigger.java | 5 ----- .../scripts/triggers/core/DamageTrigger.java | 1 - .../triggers/core/ProximityTrigger.java | 2 -- .../denizen/tags/core/CuboidTagBase.java | 1 - .../denizen/tags/core/NPCTagBase.java | 1 - .../denizen/tags/core/PlayerTagBase.java | 3 --- .../denizen/utilities/ScoreboardHelper.java | 1 - .../command/DenizenCommandHandler.java | 4 ---- .../utilities/command/NPCCommandHandler.java | 5 ----- .../command/manager/CommandContext.java | 1 - .../denizen/utilities/debugging/Debug.java | 7 ------- .../denizen/utilities/depends/Depends.java | 1 - .../denizen/utilities/nbt/CustomNBT.java | 1 - 149 files changed, 359 deletions(-) diff --git a/plugin/src/javadoc/stylesheet.css b/plugin/src/javadoc/stylesheet.css index ee636e0b73..20f4c90c76 100644 --- a/plugin/src/javadoc/stylesheet.css +++ b/plugin/src/javadoc/stylesheet.css @@ -29,7 +29,6 @@ a:link { color:#0066cc; } a:visited { color:#8b5caf; } a:hover { color:#6699cc; } - /* Headings */ h1 { font-size: 145%; @@ -44,12 +43,10 @@ h1 { text-align:left; } - /* Default Table elements and colors */ th, table { border-collapse:collapse;border-color: #E6E7E8; } - .TableHeadingColor { background:#000000 url(resources/bkg_blkheader.png) repeat-x scroll left top; color:#FFFFFF; @@ -64,7 +61,6 @@ th, table { border-collapse:collapse;border-color: #E6E7E8; } padding-left: 10px; } - .TableSubHeadingColor { background: #EEEEFF } /* Light mauve */ .TableRowColor { background: #FFFFFF; border-color: #E6E7E8;} .TableRowColor td { line-height: 175%; padding-left: 10px;} diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java index bc9d510e38..d18a5e82da 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java +++ b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java @@ -91,7 +91,6 @@ public CommandManager getCommandManager() { private TriggerRegistry triggerRegistry = new TriggerRegistry(); private DenizenNPCHelper npcHelper; - public BukkitCommandRegistry getCommandRegistry() { return commandRegistry; } @@ -572,7 +571,6 @@ public void reloadConfig() { SlowWarning.WARNING_RATE = Settings.warningRate(); } - /* * Reloads, retrieves and saves progress information in * Denizen/saves.yml and Denizen/scoreboards.yml diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/core/CuboidEnterExitSmartEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/core/CuboidEnterExitSmartEvent.java index 074fba967c..bd41b5fe01 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/core/CuboidEnterExitSmartEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/core/CuboidEnterExitSmartEvent.java @@ -26,12 +26,10 @@ public class CuboidEnterExitSmartEvent implements OldSmartEvent, Listener { - /////////////////// // SMARTEVENT METHODS /////////////// - ArrayList cuboids_to_watch = new ArrayList<>(); @Override @@ -72,7 +70,6 @@ public boolean shouldInitialize(Set events) { } - @Override public void _initialize() { DenizenAPI.getCurrentInstance().getServer().getPluginManager() @@ -80,7 +77,6 @@ public void _initialize() { Debug.log("Loaded Cuboid Enter & Exit SmartEvent."); } - @Override public void breakDown() { PlayerMoveEvent.getHandlerList().unregister(this); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/core/FlagSmartEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/core/FlagSmartEvent.java index 1867421bea..0cf2f406de 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/core/FlagSmartEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/core/FlagSmartEvent.java @@ -13,12 +13,10 @@ */ public class FlagSmartEvent implements OldSmartEvent, Listener { - /////////////////// // SMARTEVENT METHODS /////////////// - @Override public boolean shouldInitialize(Set events) { @@ -37,14 +35,12 @@ public boolean shouldInitialize(Set events) { return false; } - @Override public void _initialize() { active = true; Debug.log("Loaded Flag SmartEvent."); } - @Override public void breakDown() { active = false; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/core/NPCNavigationSmartEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/core/NPCNavigationSmartEvent.java index 5341b6115e..9ec5377a3e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/core/NPCNavigationSmartEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/core/NPCNavigationSmartEvent.java @@ -13,12 +13,10 @@ */ public class NPCNavigationSmartEvent implements OldSmartEvent, Listener { - /////////////////// // SMARTEVENT METHODS /////////////// - @Override public boolean shouldInitialize(Set events) { @@ -36,14 +34,12 @@ public boolean shouldInitialize(Set events) { return false; } - @Override public void _initialize() { active = true; Debug.log("Loaded NPC Navigation SmartEvent."); } - @Override public void breakDown() { active = false; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java index e95ee6f836..8082f10077 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityDespawnScriptEvent.java @@ -33,7 +33,6 @@ public class EntityDespawnScriptEvent extends BukkitScriptEvent { // // --> - public EntityDespawnScriptEvent() { instance = this; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java index 8ec63fda72..fe1b06d300 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityTamesScriptEvent.java @@ -46,7 +46,6 @@ public EntityTamesScriptEvent() { public EntityTag owner; public EntityTameEvent event; - @Override public boolean couldMatch(ScriptContainer scriptContainer, String s) { String lower = CoreUtilities.toLowerCase(s); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityUnleashedScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityUnleashedScriptEvent.java index 52a664b489..06a489d019 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityUnleashedScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/EntityUnleashedScriptEvent.java @@ -43,7 +43,6 @@ public EntityUnleashedScriptEvent() { public ElementTag reason; public EntityUnleashEvent event; - @Override public boolean couldMatch(ScriptContainer scriptContainer, String s) { String lower = CoreUtilities.toLowerCase(s); 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 44d3aff568..78d83ff448 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 @@ -46,7 +46,6 @@ public HorseJumpsScriptEvent() { public Float power; public HorseJumpEvent event; - @Override public boolean couldMatch(ScriptContainer scriptContainer, String s) { String lower = CoreUtilities.toLowerCase(s); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java index 9ddc3cc745..97dda7cee9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/ProjectileHitsScriptEvent.java @@ -104,7 +104,6 @@ else if (cmd.equals("shoots")) { } - @Override public String getName() { return "ProjectileHits"; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/entity/SlimeSplitsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/entity/SlimeSplitsScriptEvent.java index 9b8e30540a..f40b99152c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/entity/SlimeSplitsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/entity/SlimeSplitsScriptEvent.java @@ -42,7 +42,6 @@ public SlimeSplitsScriptEvent() { public int count; public SlimeSplitEvent event; - @Override public boolean couldMatch(ScriptContainer scriptContainer, String s) { String lower = CoreUtilities.toLowerCase(s); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java index 41fb578e36..4fa80098ac 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerBreaksItemScriptEvent.java @@ -80,7 +80,6 @@ public boolean matches(ScriptPath path) { public static String oldWarningMessage = Deprecations.oldStylePlayerBreaksItemEvent.message; - @Override public String getName() { return "PlayerItemBreak"; diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java index ebb96e4054..7f4dd04a03 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerEmptiesBucketScriptEvent.java @@ -36,7 +36,6 @@ public class PlayerEmptiesBucketScriptEvent extends BukkitScriptEvent implements // // --> - public PlayerEmptiesBucketScriptEvent() { instance = this; } @@ -48,7 +47,6 @@ public PlayerEmptiesBucketScriptEvent() { public LocationTag location; public PlayerBucketEmptyEvent event; - @Override public boolean couldMatch(ScriptPath path) { return path.eventLower.startsWith("player empties"); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java index 4c59dc4e6e..a790de6ad8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerFillsBucketScriptEvent.java @@ -36,7 +36,6 @@ public class PlayerFillsBucketScriptEvent extends BukkitScriptEvent implements L // // --> - public PlayerFillsBucketScriptEvent() { instance = this; } @@ -49,7 +48,6 @@ public PlayerFillsBucketScriptEvent() { public LocationTag location; public PlayerBucketFillEvent event; - @Override public boolean couldMatch(ScriptPath path) { return path.eventLower.startsWith("player fills"); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java index 49c22a0d3a..5c6beb2352 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/player/PlayerItemTakesDamageScriptEvent.java @@ -48,7 +48,6 @@ public class PlayerItemTakesDamageScriptEvent extends BukkitScriptEvent implemen ItemTag item; LocationTag location; - public PlayerItemTakesDamageScriptEvent() { instance = this; } 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 082e6787b2..403593c7ca 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 @@ -12,7 +12,6 @@ import org.bukkit.event.player.PlayerInteractEntityEvent; import org.bukkit.inventory.EquipmentSlot; - public class PlayerRightClicksEntityScriptEvent extends BukkitScriptEvent implements Listener { // <--[event] @@ -72,7 +71,6 @@ public String getName() { return "PlayerRightClicksEntity"; } - @Override public ScriptEntryData getScriptEntryData() { return new BukkitScriptEntryData(PlayerTag.mirrorBukkitPlayer(event.getPlayer()), entity.isNPC() ? entity.getDenizenNPC() : null); diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java index 1a16d5591c..910d0d531f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/LingeringPotionSplashScriptEvent.java @@ -76,7 +76,6 @@ public String getName() { return "LingeringPotionSplash"; } - @Override public ObjectTag getContext(String name) { if (name.equals("location")) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/world/StructureGrowsScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/world/StructureGrowsScriptEvent.java index 73e219bbe0..163e89b563 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/events/world/StructureGrowsScriptEvent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/events/world/StructureGrowsScriptEvent.java @@ -1,6 +1,5 @@ package com.denizenscript.denizen.events.world; - import com.denizenscript.denizen.objects.LocationTag; import com.denizenscript.denizen.objects.MaterialTag; import com.denizenscript.denizen.objects.WorldTag; diff --git a/plugin/src/main/java/com/denizenscript/denizen/flags/FlagManager.java b/plugin/src/main/java/com/denizenscript/denizen/flags/FlagManager.java index ab637dc246..7f1a56a97e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/flags/FlagManager.java +++ b/plugin/src/main/java/com/denizenscript/denizen/flags/FlagManager.java @@ -27,7 +27,6 @@ public enum Action { DIVIDE, INSERT, REMOVE, SPLIT, SPLIT_NEW, DELETE } - // Constructor private Denizen denizen; @@ -754,7 +753,6 @@ private double math(double currentValue, double value, Action flagAction) { } - /** * Value object that is in charge of holding values that belong to a flag. * Also contains some methods for retrieving stored values as specific diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java index 6b851a7708..bbfdeff0a2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/nms/NMSHandler.java @@ -196,7 +196,6 @@ public static Vector fixOffset(Vector offset, double yaw, double pitch) { return offsetPatched; } - public HashMap attachmentsA = new HashMap<>(); // Key follows value public HashMap attachments2 = new HashMap<>(); // Value follows key public HashMap attachmentOffsets = new HashMap<>(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/DenizenNPCHelper.java b/plugin/src/main/java/com/denizenscript/denizen/npc/DenizenNPCHelper.java index ff6a1fd9c7..facdc134c2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/DenizenNPCHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/DenizenNPCHelper.java @@ -54,7 +54,6 @@ public ActionHandler getActionHandler() { return actionHandler; } - /** * Returns a NPCTag object when given a valid NPC. DenizenNPCs have some methods * specific to Denizen functionality as well as easy access to the attached NPC and LivingEntity. @@ -134,7 +133,6 @@ public void onSpawn(NPCSpawnEvent event) { new NPCTag(event.getNPC()).action("spawn", null); } - // <--[action] // @Actions // despawn @@ -164,7 +162,6 @@ public void despawn(NPCDespawnEvent event) { } } - // <--[action] // @Actions // remove 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 01417d4d42..70fc6ec165 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 @@ -299,7 +299,6 @@ else if (event instanceof EntityDamageByBlockEvent) { private UUID entityId; - // <--[action] // @Actions // hit 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 51c76a784e..61b9df2665 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 @@ -35,7 +35,6 @@ public ConstantsTrait() { super("constants"); } - /** * Returns the value of the specified Constant, unique to this NPC. Note: * Returns tags filled with the currently assigned NPC. See: Denizen TagManager @@ -59,7 +58,6 @@ else if (getAssignmentConstants().containsKey(CoreUtilities.toLowerCase(name))) return null; } - /** * Gets a map of the NPCs constants. Note: Does not include any constants * inherited by the NPCs Assignment. To grab a comprehensive map of both, @@ -71,7 +69,6 @@ public Map getNPCConstants() { return constants; } - /** * Gets a map of the NPCs constants, including those inherited by the Assignment. * Any constants that are overridden by this NPC are taken into account, so this @@ -87,7 +84,6 @@ public Map getAllConstants() { return allConstants; } - /** * Sets the value of a constant, as identified by the name. This will * override any constants inherited from the NPCs Assignment. @@ -99,7 +95,6 @@ public void setConstant(String name, String value) { constants.put(CoreUtilities.toLowerCase(name), value); } - /** * Removes an NPC-specific constant, as identified by the name. This will * not remove any values inherited from an NPCs Assignment, only constants @@ -111,7 +106,6 @@ public void removeConstant(String name) { constants.remove(CoreUtilities.toLowerCase(name)); } - /** * Checks if this NPC has any unique constants, beyond what is inherited from * the NPCs Assignment. @@ -122,7 +116,6 @@ public boolean hasNPCConstants() { return !constants.isEmpty(); } - public Map getAssignmentConstants() { // Check to make sure NPC has an assignment if (npc.hasTrait(AssignmentTrait.class) && npc.getTrait(AssignmentTrait.class).hasAssignment()) { @@ -137,7 +130,6 @@ public Map getAssignmentConstants() { return assignmentConstants; } - public Map rebuildAssignmentConstants() { // Builds a map of constants inherited from the NPCs current Assignment if (!npc.hasTrait(AssignmentTrait.class) || !npc.getTrait(AssignmentTrait.class).hasAssignment()) { @@ -171,7 +163,6 @@ public Map rebuildAssignmentConstants() { return assignmentConstants; } - /** * Rebuilds assignment constants on a script reload */ @@ -180,7 +171,6 @@ public void onScriptsReload(ScriptReloadEvent event) { rebuildAssignmentConstants(); } - public void describe(CommandSender sender, int page) throws CommandException { Paginator paginator = new Paginator().header("Constants for " + npc.getName()); paginator.addLine("NPC-specific constants: " + (hasNPCConstants() ? "" : "None.") + ""); diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/HealthTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/HealthTrait.java index dc69a1324d..657341edc7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/HealthTrait.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/HealthTrait.java @@ -87,7 +87,6 @@ public class HealthTrait extends Trait implements Listener { private Location loc; private UUID entityId = null; - public DurationTag getRespawnDelay() { return DurationTag.valueOf(respawnDelay); } @@ -129,7 +128,6 @@ public boolean animatesOnDeath() { return animatedeath; } - public Integer void_watcher_task = null; /** diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/NicknameTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/NicknameTrait.java index eda8afb96f..187d256272 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/NicknameTrait.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/NicknameTrait.java @@ -8,7 +8,6 @@ import org.bukkit.ChatColor; import org.bukkit.event.Listener; - /** *

Adds the ability to 'nickname' an NPC. This is meant to extend the NPCs real * name to perhaps add more description. Similar to a Player's 'Display Name', but better. diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java index 6def4dbd43..782f0757b8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SittingTrait.java @@ -178,7 +178,6 @@ public Location getChair() { return chairLocation; } - /** * If someone tries to break the poor * NPC's chair, we need to stop them! diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SleepingTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SleepingTrait.java index 6f19798362..14f12c2079 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SleepingTrait.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SleepingTrait.java @@ -101,7 +101,6 @@ public Location getBed() { return bedLocation; } - /** * If someone tries to break the poor * NPC's bed, we need to stop them! diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/TriggerTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/TriggerTrait.java index ed6502803f..92e3d9ea50 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/TriggerTrait.java +++ b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/TriggerTrait.java @@ -34,7 +34,6 @@ public class TriggerTrait extends Trait implements Listener { @Persist(value = "radius", collectionType = ConcurrentHashMap.class) private Map radius = new ConcurrentHashMap<>(8, 0.9f, 1); - public void report() { Debug.log("enabled: " + enabled.entrySet().toString()); Debug.log("duration: " + duration.entrySet().toString()); @@ -42,7 +41,6 @@ public void report() { Debug.log("radius: " + radius.entrySet().toString()); } - public TriggerTrait() { super("triggers"); for (String triggerName : DenizenAPI.getCurrentInstance().getTriggerRegistry().list().keySet()) { @@ -52,7 +50,6 @@ public TriggerTrait() { } } - public void onSpawn() { for (String triggerName : DenizenAPI.getCurrentInstance().getTriggerRegistry().list().keySet()) { if (!enabled.containsKey(triggerName)) { @@ -61,7 +58,6 @@ public void onSpawn() { } } - /** * Toggles a trigger on or off for this NPC. * @@ -79,7 +75,6 @@ public String toggleTrigger(String triggerName, boolean toggle) { } } - public String toggleTrigger(String triggerName) { if (enabled.containsKey(triggerName.toUpperCase())) { if (enabled.get(triggerName.toUpperCase())) { @@ -96,12 +91,10 @@ public String toggleTrigger(String triggerName) { } } - public boolean hasTrigger(String triggerName) { return enabled.containsKey(triggerName.toUpperCase()) && enabled.get(triggerName.toUpperCase()); } - public boolean isEnabled(String triggerName) { if (!DenizenAPI.getDenizenNPC(npc).getAssignmentTrait().hasAssignment()) { return false; @@ -114,7 +107,6 @@ public boolean isEnabled(String triggerName) { } } - public void setLocalCooldown(String triggerName, double value) { if (value < 0) { value = 0; @@ -122,7 +114,6 @@ public void setLocalCooldown(String triggerName, double value) { duration.put(triggerName.toUpperCase(), value); } - public double getCooldownDuration(String triggerName) { if (duration.containsKey(triggerName.toUpperCase())) { return duration.get(triggerName.toUpperCase()); @@ -132,7 +123,6 @@ public double getCooldownDuration(String triggerName) { } } - public TriggerRegistry.CooldownType getCooldownType(String triggerName) { try { if (type.containsKey(triggerName.toUpperCase())) { @@ -147,12 +137,10 @@ public TriggerRegistry.CooldownType getCooldownType(String triggerName) { } } - public void setLocalRadius(String triggerName, int value) { radius.put(triggerName.toUpperCase(), value); } - public double getRadius(String triggerName) { if (radius.containsKey(triggerName.toUpperCase())) { return radius.get(triggerName.toUpperCase()); @@ -162,7 +150,6 @@ public double getRadius(String triggerName) { } } - public void describe(CommandSender sender, int page) throws CommandException { Paginator paginator = new Paginator().header("Triggers"); paginator.addLine("Key: Name Status Cooldown Cooldown Type (Radius)"); @@ -179,7 +166,6 @@ public void describe(CommandSender sender, int page) throws CommandException { } } - public boolean triggerCooldownOnly(AbstractTrigger triggerClass, PlayerTag player) { // Check cool down, return false if not yet met if (!DenizenAPI.getCurrentInstance().getTriggerRegistry().checkCooldown(npc, player, triggerClass, getCooldownType(triggerClass.getName()))) { @@ -194,7 +180,6 @@ public boolean triggerCooldownOnly(AbstractTrigger triggerClass, PlayerTag playe return true; } - // <--[action] // @Actions // unavailable @@ -209,7 +194,6 @@ public TriggerContext trigger(AbstractTrigger triggerClass, PlayerTag player) { return trigger(triggerClass, player, null); } - public TriggerContext trigger(AbstractTrigger triggerClass, PlayerTag player, Map context) { String trigger_type = triggerClass.getName(); @@ -252,7 +236,6 @@ public TriggerContext trigger(AbstractTrigger triggerClass, PlayerTag player, Ma return new TriggerContext(determination, true); } - /** * Contains whether the trigger successfully 'triggered' and any context that was * available while triggering or attempting to trigger. diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/BiomeTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/BiomeTag.java index 3ba616dfa8..fc1edeffd3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/BiomeTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/BiomeTag.java @@ -93,7 +93,6 @@ public static boolean matches(String arg) { return false; } - /////////////// // Constructors ///////////// @@ -102,7 +101,6 @@ public BiomeTag(Biome biome) { this.biome = NMSHandler.getInstance().getBiomeNMS(biome); } - ///////////////////// // INSTANCE FIELDS/METHODS ///////////////// @@ -153,7 +151,6 @@ public ObjectTag setPrefix(String prefix) { return this; } - public static void registerTags() { // <--[tag] @@ -289,7 +286,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return tagProcessor.getObjectAttribute(this, attribute); } - @Override public void applyProperty(Mechanism mechanism) { Debug.echoError("Cannot apply properties to a biome!"); 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 a548aab618..30a56a6ac1 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ChunkTag.java @@ -108,7 +108,6 @@ public static ChunkTag valueOf(String string, TagContext context) { return null; } - public static boolean matches(String string) { if (CoreUtilities.toLowerCase(string).startsWith("ch@")) { return true; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java index a46de0a85f..75f15edfff 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ColorTag.java @@ -133,7 +133,6 @@ public static boolean matches(String arg) { return false; } - /////////////// // Constructors ///////////// @@ -159,7 +158,6 @@ public ColorTag(DyeColor dyeColor) { this.color = dyeColor.getColor(); } - ///////////////////// // INSTANCE FIELDS/METHODS ///////////////// diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java index 2e424b6ce4..08d113e57c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/CuboidTag.java @@ -93,7 +93,6 @@ public static List getNotableCuboidsContaining(Location location) { return cuboids; } - ////////////////// // OBJECT FETCHER //////////////// @@ -199,12 +198,10 @@ public static boolean matches(String string) { return false; } - /////////////// // LocationPairs ///////////// - public static class LocationPair { public LocationTag low; public LocationTag high; @@ -263,7 +260,6 @@ public void generateDistances() { } } - /////////////////// // Constructors/Instance Methods ////////////////// @@ -285,7 +281,6 @@ public CuboidTag(Location point_1, Location point_2) { addPair(point_1, point_2); } - public void addPair(Location point_1, Location point_2) { if (point_1.getWorld() != point_2.getWorld()) { Debug.echoError("Tried to make cross-world cuboid!"); @@ -325,25 +320,21 @@ public boolean isInsideCuboid(Location location) { return false; } - public CuboidTag addBlocksToFilter(List addl) { filter.addAll(addl); return this; } - public CuboidTag removeBlocksFromFilter(List addl) { filter.removeAll(addl); return this; } - public CuboidTag removeFilter() { filter.clear(); return this; } - public CuboidTag setAsFilter(List list) { filter.clear(); filter.addAll(list); @@ -499,7 +490,6 @@ public ListTag getOutline() { return list; } - public ListTag getBlocks(Attribute attribute) { return getBlocks(null, attribute); } @@ -603,7 +593,6 @@ public List getBlockLocationsUnfiltered() { return list; } - public ListTag getSpawnableBlocks(Attribute attribute) { return getSpawnableBlocks(null, attribute); } @@ -688,13 +677,11 @@ public LocationTag getLow(int index) { // Notable /////////////////// - @Override public boolean isUnique() { return NotableManager.isSaved(this); } - @Override @Note("Cuboids") public String getSaveObject() { @@ -715,22 +702,18 @@ public void forget() { // ObjectTag //////////////////// - String prefix = "Cuboid"; - @Override public String getObjectType() { return "cuboid"; } - @Override public String getPrefix() { return prefix; } - @Override public CuboidTag setPrefix(String prefix) { this.prefix = prefix; @@ -757,7 +740,6 @@ public String identify() { } } - @Override public String identifySimple() { return identify(); @@ -773,18 +755,15 @@ public String identifyFull() { return sb.toString(); } - @Override public String toString() { return identify(); } - ///////////////////// // ObjectTag Tag Management ///////////////////// - public static void registerTags() { // <--[tag] diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/EllipsoidTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/EllipsoidTag.java index 92b9bbc363..0eb81bdb52 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/EllipsoidTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EllipsoidTag.java @@ -121,7 +121,6 @@ public static boolean matches(String arg) { } } - /////////////// // Constructors ///////////// 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 c9c419a6db..58ec7604c9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/EntityTag.java @@ -156,7 +156,6 @@ public ItemTag getItemInHand() { return null; } - ////////////////// // OBJECT FETCHER //////////////// @@ -195,7 +194,6 @@ public static EntityTag valueOf(String string, TagContext context) { return ObjectFetcher.getObjectFrom(EntityTag.class, string, context); } - // Choose a random entity type if "RANDOM" is used if (string.equalsIgnoreCase("RANDOM")) { @@ -387,7 +385,6 @@ public static boolean matches(String arg) { return false; } - ///////////////////// // CONSTRUCTORS ////////////////// @@ -502,7 +499,6 @@ public EntityTag(NPCTag npc) { } - ///////////////////// // INSTANCE FIELDS/METHODS ///////////////// @@ -1023,7 +1019,6 @@ else if (compare.equals(getEntityType().getLowercaseName())) { return false; } - ///////////////////// // ObjectTag Methods /////////////////// @@ -1114,7 +1109,6 @@ else if (isSpawnedOrValidForTag()) { return "null"; } - @Override public String identifySimple() { @@ -1140,7 +1134,6 @@ public String identifySimple() { return "null"; } - public String identifyType() { if (isCitizensNPC()) { return "npc"; @@ -1453,12 +1446,10 @@ public static void registerTags() { return new ElementTag(object.getName()); }); - ///////////////////// // INVENTORY ATTRIBUTES ///////////////// - // <--[tag] // @attribute // @returns ItemTag @@ -1558,7 +1549,6 @@ else if (object.getBukkitEntityType() == EntityType.PIG) { return null; }); - ///////////////////// // LOCATION ATTRIBUTES ///////////////// @@ -1743,7 +1733,6 @@ else if (mtr.angle == BlockFace.EAST) { return new WorldTag(object.entity.getWorld()); }); - ///////////////////// // STATE ATTRIBUTES ///////////////// 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 8d24080ff2..09237ffbbf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/InventoryTag.java @@ -212,7 +212,6 @@ public static InventoryTag mirrorBukkitInventory(Inventory inventory) { // All of the inventory id types we use public final static String[] idTypes = {"npc", "player", "crafting", "enderchest", "workbench", "entity", "location", "generic"}; - ///////////////////// // NOTABLE METHODS ///////////////// @@ -386,7 +385,6 @@ public static boolean matches(String arg) { return false; } - /////////////// // Constructors ///////////// @@ -1357,13 +1355,11 @@ public String getObjectType() { return "Inventory"; } - @Override public String getPrefix() { return prefix; } - @Override public InventoryTag setPrefix(String prefix) { this.prefix = prefix; @@ -1388,7 +1384,6 @@ public String identify() { } } - public String bestName() { if (isUnique()) { return NotableManager.getSavedId(this); @@ -1399,7 +1394,6 @@ public String bestName() { } } - @Override public String identifySimple() { if (isUnique()) { @@ -1411,7 +1405,6 @@ public String identifySimple() { } } - @Override public String toString() { return identify(); @@ -1421,7 +1414,6 @@ public String toString() { // Attributes ///////////////////// - public static void registerTags() { // <--[tag] @@ -1983,7 +1975,6 @@ else if (item != null && item.hasItemMeta() && item.getItemMeta().hasDisplayName return new ElementTag(val >= 0 ? (val + 1) : -1); }); - // <--[tag] // @attribute ]> // @returns ElementTag(Number) 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 a884efcebf..cc8db635cc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/ItemTag.java @@ -84,7 +84,6 @@ public class ItemTag implements ObjectTag, Notable, Adjustable { // OBJECT FETCHER //////////////// - public static ItemTag valueOf(String string) { return valueOf(string, null); } @@ -197,7 +196,6 @@ else if (ScriptRegistry.containsScript(string, BookScriptContainer.class)) { return null; } - public static boolean matches(String arg) { if (arg == null) { @@ -530,7 +528,6 @@ public boolean isRepairable() { return item.getType().getMaxDurability() > 0; } - ////////////////////////////// // DSCRIPT ARGUMENT METHODS ///////////////////////// @@ -572,7 +569,6 @@ else if (NMSHandler.getVersion().isAtMost(NMSVersion.v1_12) && (item.getDurabili return "i@" + getMaterial().identifyNoPropertiesNoIdentifier().replace("m@", "") + PropertyParser.getPropertiesString(this); } - @Override public String identifySimple() { if (item == null) { @@ -611,32 +607,27 @@ public String getFullString() { return "i@" + getMaterial().realName() + "," + item.getDurability() + PropertyParser.getPropertiesString(this); } - @Override public String toString() { return identify(); } - @Override public boolean isUnique() { return NotableManager.isSaved(this); } - @Override @Note("Items") public String getSaveObject() { return getFullString(); } - @Override public void makeUnique(String id) { NotableManager.saveAs(this, id); } - @Override public void forget() { NotableManager.remove(this); 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 a4445c67ba..396ea9b42b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/LocationTag.java @@ -157,12 +157,10 @@ public void forget() { NotableManager.remove(this); } - ////////////////// // OBJECT FETCHER //////////////// - public static LocationTag valueOf(String string) { return valueOf(string, null); } @@ -351,7 +349,6 @@ public static boolean matches(String string) { return LocationTag.valueOf(string, new BukkitTagContext(null, null, false, null, false, null)) != null; } - ///////////////////// // CONSTRUCTORS ////////////////// @@ -1223,7 +1220,6 @@ else if (object.getBlockTypeForTag(attribute) == Material.FLOWER_POT) { return null; }); - // <--[tag] // @attribute // @returns ElementTag @@ -1333,7 +1329,6 @@ else if (object.getBlockTypeForTag(attribute) == Material.FLOWER_POT) { } }); - ///////////////////// // DIRECTION ATTRIBUTES ///////////////// @@ -1786,7 +1781,6 @@ else if (yaw < 315) { return new LocationTag(location); }); - ///////////////////// // ENTITY AND BLOCK LIST ATTRIBUTES ///////////////// @@ -2117,7 +2111,6 @@ else if (attribute.startsWith("unexplored_structure", 2) && attribute.hasContext return list; }); - ///////////////////// // IDENTIFICATION ATTRIBUTES ///////////////// @@ -2330,7 +2323,6 @@ else if (attribute.startsWith("unexplored_structure", 2) && attribute.hasContext return new ElementTag(notname); }); - ///////////////////// // MATHEMATICAL ATTRIBUTES ///////////////// @@ -2589,7 +2581,6 @@ else if (attribute.startsWith("vertical", 2)) { return null; }); - ///////////////////// // STATE ATTRIBUTES ///////////////// 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 b652447c83..cee3b0007e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java @@ -65,12 +65,10 @@ public MaterialTag forceIdentifyAs(String string) { return this; } - ////////////////// // OBJECT FETCHER //////////////// - public static MaterialTag valueOf(String string) { return valueOf(string, null); } @@ -227,7 +225,6 @@ public boolean matchesBlock(Block b) { return matchesMaterialData(b.getType().getNewData(b.getData())); } - /////////////// // Constructors ///////////// @@ -328,7 +325,6 @@ public String name() { return material.name(); } - public byte getData(byte fallback) { if (data == null) { return fallback; @@ -938,7 +934,6 @@ public static void registerTags() { return new ElementTag("Material"); }); - // <--[tag] // @attribute =;...]> // @returns MaterialTag diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java index 0ceb104db2..28d7d1bd6f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/NPCTag.java @@ -79,7 +79,6 @@ public static NPCTag fromEntity(Entity entity) { return mirrorCitizensNPC(CitizensAPI.getNPCRegistry().getNPC(entity)); } - public static NPCTag valueOf(String string) { return valueOf(string, null); } @@ -107,7 +106,6 @@ public static NPCTag valueOf(String string, TagContext context) { return null; } - public static boolean matches(String string) { // If using object notation, assume it's valid @@ -194,7 +192,6 @@ public LivingEntity getLivingEntity() { } } - @Override public EntityTag getDenizenEntity() { try { @@ -574,7 +571,6 @@ public static void registerTags() { return new ElementTag(trait.hasTrigger(attribute.getContext(1))); }); - // <--[tag] // @attribute // @returns ElementTag(Boolean) @@ -585,7 +581,6 @@ public static void registerTags() { return (new ElementTag(object.getCitizen().getTrait(Anchors.class).getAnchors().size() > 0)); }); - // <--[tag] // @attribute // @returns ListTag 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 006e5fa0ff..86d4fad1e5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PlayerTag.java @@ -55,7 +55,6 @@ public class PlayerTag implements ObjectTag, Adjustable, EntityFormObject { - // <--[language] // @name PlayerTag Objects // @group Object System @@ -70,7 +69,6 @@ public class PlayerTag implements ObjectTag, Adjustable, EntityFormObject { // STATIC METHODS ///////////////// - public static PlayerTag mirrorBukkitPlayer(OfflinePlayer player) { if (player == null) { return null; @@ -103,7 +101,6 @@ public static Map getAllPlayers() { return playerNames; } - ///////////////////// // OBJECT FETCHER ///////////////// @@ -120,8 +117,6 @@ public static Map getAllPlayers() { // // --> - - public static PlayerTag valueOf(String string) { return valueOf(string, null); } @@ -179,7 +174,6 @@ public static PlayerTag valueOfInternal(String string, TagContext context, boole return null; } - public static boolean matches(String arg) { // If passed null, of course it doesn't match! if (arg == null) { @@ -214,7 +208,6 @@ public static boolean playerNameIsValid(String name) { return playerNames.containsKey(CoreUtilities.toLowerCase(name)); } - ///////////////////// // CONSTRUCTORS ///////////////// @@ -234,7 +227,6 @@ public PlayerTag(Player player) { } } - ///////////////////// // INSTANCE FIELDS/METHODS ///////////////// @@ -596,7 +588,6 @@ public boolean hasChunkLoaded(Chunk chunk) { return NMSHandler.getPlayerHelper().hasChunkLoaded(getPlayerEntity(), chunk); } - ///////////////////// // ObjectTag Methods ///////////////// @@ -802,7 +793,6 @@ public static void registerTags() { : searchFlags; }); - registerTag("current_step", (attribute, object) -> { Deprecations.playerStepTag.warn(attribute.context); String outcome = "null"; @@ -818,7 +808,6 @@ public static void registerTags() { return new ElementTag(outcome); }); - ///////////////////// // ECONOMY ATTRIBUTES ///////////////// @@ -879,7 +868,6 @@ public static void registerTags() { }); - ///////////////////// // ENTITY LIST ATTRIBUTES ///////////////// @@ -1005,7 +993,6 @@ else if (CoreUtilities.toLowerCase(obj.toString()).equals("npc")) { return null; }); - ///////////////////// // IDENTIFICATION ATTRIBUTES ///////////////// @@ -1032,7 +1019,6 @@ else if (CoreUtilities.toLowerCase(obj.toString()).equals("npc")) { return new ElementTag(object.getSaveName()); }); - ///////////////////// // LOCATION ATTRIBUTES ///////////////// @@ -1070,7 +1056,6 @@ else if (CoreUtilities.toLowerCase(obj.toString()).equals("npc")) { return new WorldTag(object.getWorld()); }); - ///////////////////// // STATE ATTRIBUTES ///////////////// @@ -1587,7 +1572,6 @@ else if (Depends.permissions != null) { return object.getEnderChest(); }); - ///////////////////// // ONLINE ATTRIBUTES ///////////////// @@ -1826,7 +1810,6 @@ else if (attribute.startsWith("percent", 2)) { return null; }); - ///////////////////// // CITIZENS ATTRIBUTES ///////////////// @@ -1845,7 +1828,6 @@ else if (attribute.startsWith("percent", 2)) { return null; }); - ///////////////////// // CONVERSION ATTRIBUTES ///////////////// @@ -1861,7 +1843,6 @@ else if (attribute.startsWith("percent", 2)) { return new EntityTag(object.getPlayerEntity()); }); - ///////////////////// // IDENTIFICATION ATTRIBUTES ///////////////// @@ -1943,7 +1924,6 @@ else if (attribute.startsWith("percent", 2)) { return new ElementTag(chunk.isLoadedSafe() && object.hasChunkLoaded(chunk.getChunkForTag(attribute))); }); - ///////////////////// // STATE ATTRIBUTES ///////////////// diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/PluginTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/PluginTag.java index 74357102b4..3d8cdb6c87 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/PluginTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/PluginTag.java @@ -40,7 +40,6 @@ public class PluginTag implements ObjectTag { // Object Fetcher //////////////// - public static PluginTag valueOf(String string) { return valueOf(string, null); } @@ -89,7 +88,6 @@ public static boolean matches(String arg) { return false; } - ///////////////////// // Constructors ////////////////// @@ -98,7 +96,6 @@ public PluginTag(Plugin plugin) { this.plugin = plugin; } - ///////////////////// // Instance Fields/Methods ///////////////// @@ -109,7 +106,6 @@ public Plugin getPlugin() { return plugin; } - ///////////////////// // ObjectTag Methods /////////////////// diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java index a0f64b4afa..6b6bb43d20 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/WorldTag.java @@ -27,7 +27,6 @@ public class WorldTag implements ObjectTag, Adjustable { - ///////////////////// // STATIC METHODS ///////////////// @@ -46,7 +45,6 @@ public static WorldTag mirrorBukkitWorld(World world) { } } - ///////////////////// // OBJECT FETCHER ///////////////// @@ -73,7 +71,6 @@ public static WorldTag mirrorBukkitWorld(World world) { // For general info, see <@link language WorldTag Objects> // --> - public static WorldTag valueOf(String string) { return valueOf(string, null); } @@ -117,7 +114,6 @@ else if (announce) { return null; } - public static boolean matches(String arg) { arg = arg.replace("w@", ""); @@ -133,7 +129,6 @@ public static boolean matches(String arg) { return returnable != null; } - public World getWorld() { return Bukkit.getWorld(world_name); } @@ -323,7 +318,6 @@ public static void registerTags() { return new ListTag(npcs); }); - ///////////////////// // GEOGRAPHY ATTRIBUTES ///////////////// @@ -395,7 +389,6 @@ public static void registerTags() { return new ElementTag(object.getWorld().getWorldType().getName()); }); - ///////////////////// // IDENTIFICATION ATTRIBUTES ///////////////// @@ -420,7 +413,6 @@ public static void registerTags() { return new ElementTag(object.getWorld().getSeed()); }); - ///////////////////// // SETTINGS ATTRIBUTES ///////////////// diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/notable/NotableManager.java b/plugin/src/main/java/com/denizenscript/denizen/objects/notable/NotableManager.java index 7a916d48e8..48771ec809 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/notable/NotableManager.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/notable/NotableManager.java @@ -24,7 +24,6 @@ import java.util.logging.Level; import java.util.logging.Logger; - public class NotableManager { public NotableManager() { @@ -200,7 +199,6 @@ public void saveNotables() { // Note Annotation Handler /////////////////// - private static Map objects = new HashMap<>(); private static Map reverse_objects = new HashMap<>(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitElementProperties.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitElementProperties.java index 7561c48694..d2eb82cff4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitElementProperties.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitElementProperties.java @@ -34,7 +34,6 @@ public static BukkitElementProperties getFrom(ObjectTag element) { } } - private BukkitElementProperties(ElementTag element) { this.element = element; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitListProperties.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitListProperties.java index 066f413d7b..861e1ce852 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitListProperties.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitListProperties.java @@ -23,7 +23,6 @@ public static BukkitListProperties getFrom(ObjectTag list) { } } - private BukkitListProperties(ListTag list) { this.list = list; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitScriptProperties.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitScriptProperties.java index 50e44dff00..df458c25f5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitScriptProperties.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/bukkit/BukkitScriptProperties.java @@ -87,7 +87,6 @@ public static void registerTags() { }); } - @Override public String getPropertyString() { return null; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java index d479eaeca3..228e6a0151 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAI.java @@ -71,7 +71,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { .getObjectAttribute(attribute.fulfill(1)); } - return null; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAge.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAge.java index ecdd1c8a73..879dcb7c8d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAge.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityAge.java @@ -168,14 +168,12 @@ public ObjectTag getObjectAttribute(Attribute attribute) { .getObjectAttribute(attribute.fulfill(1)); } - return null; } @Override public void adjust(Mechanism mechanism) { - // <--[mechanism] // @object EntityTag // @name age_lock diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorBonus.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorBonus.java index 946022a095..3a81a852f5 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorBonus.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorBonus.java @@ -73,7 +73,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return getArmorBonus().getObjectAttribute(attribute.fulfill(1)); } - return null; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorPose.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorPose.java index 850d03e96b..edea07b37d 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorPose.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityArmorPose.java @@ -110,7 +110,6 @@ else if (attribute.startsWith("armor_pose") && attribute.hasContext(1)) { } } - return null; } 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 deae60445a..5d1b96f1a3 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 @@ -39,7 +39,6 @@ public static EntityBoundingBox getFrom(ObjectTag object) { "bounding_box" }; - private static Set modifiedBoxes = new HashSet<>(); public static void remove(UUID uuid) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityColor.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityColor.java index 2fb87b1b9e..4a430f90a7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityColor.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityColor.java @@ -21,7 +21,6 @@ public class EntityColor implements Property { - public static boolean describes(ObjectTag entity) { if (!(entity instanceof EntityTag)) { return false; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityHealth.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityHealth.java index e44631dd54..61738e32f0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityHealth.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityHealth.java @@ -189,7 +189,6 @@ else if (entity.isLivingEntity()) { } } - // <--[mechanism] // @object EntityTag // @name health_data diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInventory.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInventory.java index 60c7f8e0c1..62ed25bddf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInventory.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityInventory.java @@ -75,7 +75,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { } } - return null; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityJumpStrength.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityJumpStrength.java index 659584b2f7..b6c6f6fe11 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityJumpStrength.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityJumpStrength.java @@ -10,7 +10,6 @@ public class EntityJumpStrength implements Property { - public static boolean describes(ObjectTag entity) { return entity instanceof EntityTag && ((EntityTag) entity).getBukkitEntity() instanceof AbstractHorse; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java index 48a46655be..2df753c3fb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityProfession.java @@ -13,7 +13,6 @@ public class EntityProfession implements Property { - public static boolean describes(ObjectTag entity) { if (!(entity instanceof EntityTag)) { return false; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRotation.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRotation.java index 69f3092d9f..e583708c04 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRotation.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityRotation.java @@ -14,7 +14,6 @@ public class EntityRotation implements Property { - public static boolean describes(ObjectTag entity) { if (!(entity instanceof EntityTag)) { return false; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityScoreboardTags.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityScoreboardTags.java index b5d8c7b9ff..95b1b4add4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityScoreboardTags.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityScoreboardTags.java @@ -73,7 +73,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return getTags().getObjectAttribute(attribute.fulfill(1)); } - return null; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java index 14a69818c0..b212721daa 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySilent.java @@ -66,7 +66,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { .getObjectAttribute(attribute.fulfill(1)); } - return null; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySmall.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySmall.java index 86e42a5ee7..ae8dd14608 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySmall.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySmall.java @@ -10,7 +10,6 @@ public class EntitySmall implements Property { - public static boolean describes(ObjectTag entity) { return entity instanceof EntityTag && ((EntityTag) entity).getBukkitEntity() instanceof ArmorStand; 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 d03b275d81..dab6a6bbd7 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 @@ -90,7 +90,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return getSpeed().getObjectAttribute(attribute.fulfill(1)); } - return null; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java index 6519736b33..3e40861259 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityTame.java @@ -14,7 +14,6 @@ public class EntityTame implements Property { - public static boolean describes(ObjectTag entity) { return entity instanceof EntityTag && ((EntityTag) entity).getBukkitEntity() instanceof Tameable; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVisible.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVisible.java index 8a4d74e4b8..fb0ecc1ad3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVisible.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntityVisible.java @@ -77,7 +77,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return new ElementTag(stand.isVisible()).getObjectAttribute(attribute.fulfill(1)); } - return null; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryContents.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryContents.java index 202b4471ba..f98fb61257 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryContents.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/inventory/InventoryContents.java @@ -119,7 +119,6 @@ public String getPropertyId() { return "contents"; } - public static void registerTags() { // <--[tag] diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemApple.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemApple.java index 9cceda9f53..2d821c7b7f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemApple.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemApple.java @@ -35,7 +35,6 @@ public static ItemApple getFrom(ObjectTag _item) { "apple_enchanted" }; - private ItemApple(ItemTag _item) { item = _item; } @@ -70,7 +69,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13)) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBaseColor.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBaseColor.java index 46063a8458..548cf98dfa 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBaseColor.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBaseColor.java @@ -42,7 +42,6 @@ public static ItemBaseColor getFrom(ObjectTag item) { "base_color" }; - private ItemBaseColor(ItemTag item) { this.item = item; } @@ -102,7 +101,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { DyeColor baseColor = getBaseColor(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBlockMaterial.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBlockMaterial.java index b21c3b9c10..dd186eacfc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBlockMaterial.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBlockMaterial.java @@ -33,7 +33,6 @@ public static ItemBlockMaterial getFrom(ObjectTag _item) { "block_material" }; - private ItemBlockMaterial(ItemTag _item) { item = _item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBook.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBook.java index e001968188..21f45e4c23 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBook.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemBook.java @@ -43,7 +43,6 @@ public static ItemBook getFrom(ObjectTag _item) { "book", "book_raw_pages", "book_pages", "book_author", "book_title" }; - private ItemBook(ItemTag _item) { item = _item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCanDestroy.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCanDestroy.java index f73a9c56c6..18dddd8c2c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCanDestroy.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCanDestroy.java @@ -38,7 +38,6 @@ public static ItemCanDestroy getFrom(ObjectTag item) { "can_destroy" }; - private ItemCanDestroy(ItemTag item) { this.item = item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCanPlaceOn.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCanPlaceOn.java index 73a775a807..3ecf19626e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCanPlaceOn.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCanPlaceOn.java @@ -38,7 +38,6 @@ public static ItemCanPlaceOn getFrom(ObjectTag item) { "can_place_on" }; - private ItemCanPlaceOn(ItemTag item) { this.item = item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemColor.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemColor.java index 5b78452161..b6b4bda285 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemColor.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemColor.java @@ -42,7 +42,6 @@ public static ItemColor getFrom(ObjectTag _item) { "color", "dye_color", "dye" }; - private ItemColor(ItemTag _item) { item = _item; } @@ -81,7 +80,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { Material mat = item.getItemStack().getType(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCustomModel.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCustomModel.java index 701890a71a..63eedca766 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCustomModel.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemCustomModel.java @@ -31,7 +31,6 @@ public static ItemCustomModel getFrom(ObjectTag _item) { "custom_model_data" }; - private ItemCustomModel(ItemTag _item) { item = _item; } @@ -79,7 +78,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { if (item.getItemStack().getItemMeta().hasCustomModelData()) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemDisplayname.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemDisplayname.java index 28236c88d5..8e63bcbd62 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemDisplayname.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemDisplayname.java @@ -33,7 +33,6 @@ public static ItemDisplayname getFrom(ObjectTag _item) { "display_name" }; - private ItemDisplayname(ItemTag _item) { item = _item; } @@ -83,7 +82,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { if (hasDisplayName()) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemDurability.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemDurability.java index ad26747720..5390ee7097 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemDurability.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemDurability.java @@ -31,7 +31,6 @@ public static ItemDurability getFrom(ObjectTag _item) { "durability" }; - private ItemDurability(ItemTag _item) { item = _item; } @@ -74,7 +73,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { if (item.getItemStack().getDurability() != 0) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemEnchantments.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemEnchantments.java index 5612e95b5b..f7a5566730 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemEnchantments.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemEnchantments.java @@ -42,7 +42,6 @@ public static ItemEnchantments getFrom(ObjectTag _item) { "remove_enchantments", "enchantments" }; - private ItemEnchantments(ItemTag _item) { item = _item; } @@ -165,7 +164,6 @@ else if (item.getItemStack().hasItemMeta() && item.getItemStack().getItemMeta() return new HashSet<>(); } - @Override public String getPropertyString() { Set> enchants = getEnchantments(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFirework.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFirework.java index b027c0bd59..dc173288d0 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFirework.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFirework.java @@ -42,7 +42,6 @@ public static ItemFirework getFrom(ObjectTag _item) { "firework" }; - private ItemFirework(ItemTag _item) { item = _item; } @@ -100,7 +99,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { ListTag data = getFireworkData(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFlags.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFlags.java index 82fa68839a..c0f08b29c4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFlags.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemFlags.java @@ -35,7 +35,6 @@ public static ItemFlags getFrom(ObjectTag _item) { "flags" }; - private ItemFlags(ItemTag _item) { item = _item; } @@ -78,7 +77,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { ListTag flags = flags(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemInventory.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemInventory.java index a3dc536d07..56af600b79 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemInventory.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemInventory.java @@ -37,7 +37,6 @@ public static ItemInventory getFrom(ObjectTag _item) { "inventory" }; - private InventoryTag getItemInventory() { return InventoryTag.mirrorBukkitInventory(((InventoryHolder) ((BlockStateMeta) item.getItemStack().getItemMeta()).getBlockState()).getInventory()); } @@ -70,7 +69,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { InventoryTag inv = getItemInventory(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemKnowledgeBookRecipes.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemKnowledgeBookRecipes.java index 0669aa4a2e..9cd00d01dc 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemKnowledgeBookRecipes.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemKnowledgeBookRecipes.java @@ -38,7 +38,6 @@ public static ItemKnowledgeBookRecipes getFrom(ObjectTag _item) { "knowledge_book_recipes" }; - private ItemKnowledgeBookRecipes(ItemTag _item) { item = _item; } @@ -79,7 +78,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { ListTag recipes = recipeList(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemLock.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemLock.java index 163195a2a2..f666127d02 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemLock.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemLock.java @@ -36,7 +36,6 @@ public static ItemLock getFrom(ObjectTag _item) { "lock" }; - private String getItemLock() { return ((Lockable) ((BlockStateMeta) item.getItemStack().getItemMeta()).getBlockState()).getLock(); } @@ -85,7 +84,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { return isLocked() ? getItemLock() : null; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemLore.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemLore.java index f39aab10ec..4977bbd6b8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemLore.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemLore.java @@ -39,13 +39,11 @@ public static ItemLore getFrom(ObjectTag _item) { "lore" }; - public boolean hasLore() { return item.getItemStack().hasItemMeta() && (item.getItemStack().getItemMeta().hasLore()); } - private ItemLore(ItemTag _item) { item = _item; } @@ -97,7 +95,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { if (hasLore()) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemMap.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemMap.java index b8a1c464c8..4d56906e38 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemMap.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemMap.java @@ -37,7 +37,6 @@ public static ItemMap getFrom(ObjectTag _item) { "map" }; - private ItemMap(ItemTag _item) { item = _item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemNBT.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemNBT.java index f65dd61f10..0d1d2766b8 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemNBT.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemNBT.java @@ -38,7 +38,6 @@ public static ItemNBT getFrom(ObjectTag item) { "remove_nbt", "nbt" }; - private ItemNBT(ItemTag item) { this.item = item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPatterns.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPatterns.java index 165bbc44ba..20b639d1c9 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPatterns.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPatterns.java @@ -49,7 +49,6 @@ public static ItemPatterns getFrom(ObjectTag item) { "patterns" }; - private ItemPatterns(ItemTag item) { this.item = item; } @@ -126,7 +125,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { ListTag list = listPatterns(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPlantgrowth.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPlantgrowth.java index 0c4e088ce0..073e7dc8ac 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPlantgrowth.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPlantgrowth.java @@ -45,7 +45,6 @@ public static ItemPlantgrowth getFrom(ObjectTag _item) { "plant_growth" }; - private ItemPlantgrowth(ItemTag _item) { item = _item; } @@ -94,7 +93,6 @@ else if (item.getItemStack().getData() instanceof CocoaPlant) { return null; } - @Override public String getPropertyString() { String state; diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java index 145bc4b011..b22149e7d3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java @@ -48,7 +48,6 @@ public static ItemPotion getFrom(ObjectTag _item) { "potion_effects" }; - private ItemPotion(ItemTag item) { this.item = item; } @@ -135,7 +134,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { boolean has = item.getItemStack().hasItemMeta() && item.getItemStack().getItemMeta() instanceof PotionMeta && ((PotionMeta) item.getItemStack().getItemMeta()).hasCustomEffects(); - // <--[tag] // @attribute // @returns ElementTag @@ -176,7 +174,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { attribute = attribute.fulfill(1); - // <--[tag] // @attribute ].is_splash> // @returns ElementTag(Boolean) diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemQuantity.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemQuantity.java index e8b4047107..7c08473540 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemQuantity.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemQuantity.java @@ -32,7 +32,6 @@ public static ItemQuantity getFrom(ObjectTag _item) { "quantity" }; - private ItemQuantity(ItemTag _item) { item = _item; } @@ -80,7 +79,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { if (item.getItemStack().getAmount() > 1) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemRepairCost.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemRepairCost.java index 7666a2bb42..0024ad4545 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemRepairCost.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemRepairCost.java @@ -33,7 +33,6 @@ public static ItemRepairCost getFrom(ObjectTag _item) { "repair_cost" }; - private ItemRepairCost(ItemTag _item) { item = _item; } @@ -64,7 +63,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { int cost = ((Repairable) item.getItemStack().getItemMeta()).getRepairCost(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemScript.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemScript.java index 3da90728dc..e6792e3b69 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemScript.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemScript.java @@ -34,7 +34,6 @@ public static ItemScript getFrom(ObjectTag _item) { "script" }; - private ItemScript(ItemTag _item) { item = _item; } @@ -90,7 +89,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { if (item.isItemscript()) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSignContents.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSignContents.java index d013d1c44d..e6903ee238 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSignContents.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSignContents.java @@ -39,7 +39,6 @@ public static ItemSignContents getFrom(ObjectTag _item) { "sign_contents" }; - private ListTag getSignContents() { return new ListTag(Arrays.asList(((Sign) ((BlockStateMeta) item.getItemStack().getItemMeta()).getBlockState()).getLines())); } @@ -72,7 +71,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { for (String line : getSignContents()) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java index 2740fb592b..fe08f1c75b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSkullskin.java @@ -40,7 +40,6 @@ public static ItemSkullskin getFrom(ObjectTag _item) { "skull_skin" }; - private ItemSkullskin(ItemTag _item) { item = _item; } @@ -102,7 +101,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { .getObjectAttribute(attribute.fulfill(1)); } - return null; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnEgg.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnEgg.java index 258b679264..28269bfa63 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnEgg.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnEgg.java @@ -36,7 +36,6 @@ public static ItemSpawnEgg getFrom(ObjectTag _item) { "spawn_id", "spawn_egg", "spawn_type" }; - private ItemSpawnEgg(ItemTag _item) { item = _item; } @@ -71,7 +70,6 @@ public ObjectTag getObjectAttribute(Attribute attribute) { return null; } - @Override public String getPropertyString() { if (NMSHandler.getVersion().isAtLeast(NMSVersion.v1_13)) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerCount.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerCount.java index 2ebd34b511..d5c6b70e6a 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerCount.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerCount.java @@ -34,7 +34,6 @@ public static ItemSpawnerCount getFrom(ObjectTag _item) { "spawner_count" }; - private ItemSpawnerCount(ItemTag _item) { item = _item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerDelay.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerDelay.java index a9cb4658b4..580fd48e60 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerDelay.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerDelay.java @@ -35,7 +35,6 @@ public static ItemSpawnerDelay getFrom(ObjectTag _item) { "spawner_delay_data" }; - private ItemSpawnerDelay(ItemTag _item) { item = _item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerMaxNearbyEntities.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerMaxNearbyEntities.java index 55c1a91bb1..34f7de61fb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerMaxNearbyEntities.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerMaxNearbyEntities.java @@ -34,7 +34,6 @@ public static ItemSpawnerMaxNearbyEntities getFrom(ObjectTag _item) { "spawner_max_nearby_entities" }; - private ItemSpawnerMaxNearbyEntities(ItemTag _item) { item = _item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerPlayerRange.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerPlayerRange.java index f931c9f39b..69a60e31fa 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerPlayerRange.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerPlayerRange.java @@ -34,7 +34,6 @@ public static ItemSpawnerPlayerRange getFrom(ObjectTag _item) { "spawner_player_range" }; - private ItemSpawnerPlayerRange(ItemTag _item) { item = _item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerRange.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerRange.java index 269625b5d6..b2fd184503 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerRange.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerRange.java @@ -34,7 +34,6 @@ public static ItemSpawnerRange getFrom(ObjectTag _item) { "spawner_range" }; - private ItemSpawnerRange(ItemTag _item) { item = _item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerType.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerType.java index ed72151534..2f2f11c2f4 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerType.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemSpawnerType.java @@ -34,7 +34,6 @@ public static ItemSpawnerType getFrom(ObjectTag _item) { "spawner_type" }; - private ItemSpawnerType(ItemTag _item) { item = _item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemUnbreakable.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemUnbreakable.java index c29d4c090b..685d3c028b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemUnbreakable.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemUnbreakable.java @@ -30,7 +30,6 @@ public static ItemUnbreakable getFrom(ObjectTag object) { "unbreakable" }; - private ItemUnbreakable(ItemTag item) { this.item = item; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialAge.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialAge.java index 72a2158dd1..da9b4814b6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialAge.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialAge.java @@ -30,7 +30,6 @@ public static MaterialAge getFrom(ObjectTag _material) { "age", "plant_growth" }; - private MaterialAge(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialCampfire.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialCampfire.java index 9298d7be04..92f6186402 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialCampfire.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialCampfire.java @@ -29,7 +29,6 @@ public static MaterialCampfire getFrom(ObjectTag _material) { "signal_fire" }; - private MaterialCampfire(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialDirectional.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialDirectional.java index 3af49efea9..e23abedeef 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialDirectional.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialDirectional.java @@ -46,7 +46,6 @@ public static MaterialDirectional getFrom(ObjectTag _material) { "direction" }; - private MaterialDirectional(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialFaces.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialFaces.java index 565824704c..06ff9ee080 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialFaces.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialFaces.java @@ -30,7 +30,6 @@ public static MaterialFaces getFrom(ObjectTag _material) { "faces" }; - private MaterialFaces(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialHalf.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialHalf.java index 23a52c7dfe..90a2aefab2 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialHalf.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialHalf.java @@ -46,7 +46,6 @@ public static MaterialHalf getFrom(ObjectTag _material) { "half" }; - private MaterialHalf(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialLeafSize.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialLeafSize.java index 5139c79c3b..3f06e9cb34 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialLeafSize.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialLeafSize.java @@ -29,7 +29,6 @@ public static MaterialLeafSize getFrom(ObjectTag _material) { "leaf_size" }; - private MaterialLeafSize(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialLightable.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialLightable.java index 2b0f6d0846..d324267550 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialLightable.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialLightable.java @@ -29,7 +29,6 @@ public static MaterialLightable getFrom(ObjectTag _material) { "lit" }; - private MaterialLightable(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialPersistent.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialPersistent.java index 3d65e5631a..ba67e85129 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialPersistent.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialPersistent.java @@ -29,7 +29,6 @@ public static MaterialPersistent getFrom(ObjectTag _material) { "persistent" }; - private MaterialPersistent(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialPickle.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialPickle.java index 36cbb03938..0ce9a48ef7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialPickle.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialPickle.java @@ -30,7 +30,6 @@ public static MaterialPickle getFrom(ObjectTag _material) { "pickle_count" }; - private MaterialPickle(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSlab.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSlab.java index 02400ff44e..72c4f10f25 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSlab.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSlab.java @@ -29,7 +29,6 @@ public static MaterialSlab getFrom(ObjectTag _material) { "slab_type" }; - private MaterialSlab(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSwitchFace.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSwitchFace.java index 0af0dab3d7..f6a3cccf43 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSwitchFace.java +++ b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/material/MaterialSwitchFace.java @@ -30,7 +30,6 @@ public static MaterialSwitchFace getFrom(ObjectTag _material) { "switch_face" }; - private MaterialSwitchFace(MaterialTag _material) { material = _material; } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java index fbc229650d..148f4353ba 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java @@ -99,7 +99,6 @@ else if (arg.matchesPrefix("script", "s")) { } } - @Override public void execute(ScriptEntry scriptEntry) { // Fetch objects @@ -134,7 +133,6 @@ public void execute(ScriptEntry scriptEntry) { } } - /** * Gets the duration of a script cool-down. * @@ -181,7 +179,6 @@ public static DurationTag getCooldownDuration(PlayerTag player, String scriptNam return duration; } - /** * Checks if a script is cooled-down. If a cool-down is currently in progress, * its requirements will fail and it will not trigger. If the script is being cooled down @@ -227,7 +224,6 @@ public static boolean checkCooldown(PlayerTag player, String scriptName) { return false; } - /** * Sets a cooldown for a Denizen Script. Can be for a specific Player, or GLOBAL. * diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/FlagCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/FlagCommand.java index c5a7d4fbe8..1757356ad1 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/FlagCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/FlagCommand.java @@ -169,7 +169,6 @@ else if (!scriptEntry.hasObject("flag_target") scriptEntry.addObject("flag_target", arg.asType(EntityTag.class)); } - // Check if setting a boolean else if (!scriptEntry.hasObject("flag_name") && arg.raw_value.split(":", 3).length == 1) { @@ -266,7 +265,6 @@ else if (flagArgs[1].equals("//") || flagArgs[1].equals("/")) { } } - @Override public void execute(ScriptEntry scriptEntry) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/NoteCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/NoteCommand.java index d8c7298d68..60511ff254 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/NoteCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/NoteCommand.java @@ -10,7 +10,6 @@ import com.denizenscript.denizencore.scripts.commands.AbstractCommand; import com.denizenscript.denizencore.utilities.CoreUtilities; - public class NoteCommand extends AbstractCommand { // <--[command] @@ -129,6 +128,5 @@ public void execute(ScriptEntry scriptEntry) { Debug.echoError(scriptEntry.getResidingQueue(), e); } - } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ZapCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ZapCommand.java index 2955cf68c6..6a2f132b87 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ZapCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/ZapCommand.java @@ -16,7 +16,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - public class ZapCommand extends AbstractCommand implements Listener { // <--[command] diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java index 3f0a6bdde6..7d62b7edb3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/AgeCommand.java @@ -13,7 +13,6 @@ import java.util.List; - public class AgeCommand extends AbstractCommand { // <--[command] diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java index cff455fa58..77afa3d524 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/HealthCommand.java @@ -86,7 +86,6 @@ else if (!scriptEntry.hasObject("action") } } - // Check for required information if (!scriptEntry.hasObject("qty") && !scriptEntry.hasObject("action")) { @@ -101,7 +100,6 @@ else if (!scriptEntry.hasObject("action") } - @Override public void execute(ScriptEntry scriptEntry) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java index 487b83cc20..35b4fbc0cf 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java @@ -127,7 +127,6 @@ else if (!scriptEntry.hasObject("entities") } } - // Check for required information if (!scriptEntry.hasObject("location") && !scriptEntry.hasObject("stop")) { @@ -149,7 +148,6 @@ else if (!scriptEntry.hasObject("entities") scriptEntry.defaultObject("stop", new ElementTag(false)); } - @Override public void execute(ScriptEntry scriptEntry) { @@ -163,7 +161,6 @@ public void execute(ScriptEntry scriptEntry) { List entities = (List) scriptEntry.getObject("entities"); final LocationTag lookat = scriptEntry.getObjectTag("lookat"); - // Debug the execution if (scriptEntry.dbCallShouldDebug()) { @@ -253,7 +250,6 @@ public void run() { } - // Held script entries public static List held = new ArrayList<>(); diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommandCitizensEvents.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommandCitizensEvents.java index 9ad8d84704..c4d9df557c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommandCitizensEvents.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommandCitizensEvents.java @@ -45,7 +45,6 @@ public void cancel(NavigationCancelEvent e) { } - public void checkHeld(NavigationEvent e) { if (e.getNPC() == null) { return; diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/DisplayItemCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/DisplayItemCommand.java index f461769cc7..1158f9d353 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/DisplayItemCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/DisplayItemCommand.java @@ -21,7 +21,6 @@ import java.util.HashSet; import java.util.UUID; - public class DisplayItemCommand extends AbstractCommand implements Listener { // <--[command] diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java index b32b0d1adc..c8053c5eb3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/GiveCommand.java @@ -19,7 +19,6 @@ import java.util.List; - public class GiveCommand extends AbstractCommand { // <--[command] diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/ActionCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/ActionCommand.java index da6e148e31..a5c79ac25b 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/ActionCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/ActionCommand.java @@ -84,7 +84,6 @@ else if (!scriptEntry.hasObject("actions")) { } - @Override public void execute(ScriptEntry scriptEntry) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java index d3bf807476..bf3bd73550 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/AnchorCommand.java @@ -92,7 +92,6 @@ else if (!scriptEntry.hasObject("location") } - @Override public void execute(ScriptEntry scriptEntry) { @@ -173,6 +172,5 @@ else if (range == null) { } } - } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/CompassCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/CompassCommand.java index a85490b566..bd074a46eb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/CompassCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/CompassCommand.java @@ -74,7 +74,6 @@ else if (!scriptEntry.hasObject("reset") scriptEntry.defaultObject("reset", new ElementTag(false)); } - @Override public void execute(ScriptEntry scriptEntry) { @@ -84,7 +83,6 @@ public void execute(ScriptEntry scriptEntry) { ElementTag reset = scriptEntry.getElement("reset"); Player player = Utilities.getEntryPlayer(scriptEntry).getPlayerEntity(); - // Debug the execution if (scriptEntry.dbCallShouldDebug()) { @@ -101,7 +99,6 @@ public void execute(ScriptEntry scriptEntry) { player.setCompassTarget(location); } - } } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java index ff4c6697eb..6c6af6b287 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ExperienceCommand.java @@ -9,7 +9,6 @@ import com.denizenscript.denizencore.scripts.commands.AbstractCommand; import org.bukkit.entity.Player; - public class ExperienceCommand extends AbstractCommand { // <--[command] @@ -111,7 +110,6 @@ else if (arg.matches("SILENT")) { } - @Override public void execute(ScriptEntry scriptEntry) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java index d71f3a8d01..eb906a4ea6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ShowFakeCommand.java @@ -117,7 +117,6 @@ else if (!scriptEntry.hasObject("locations") scriptEntry.defaultObject("cancel", new ElementTag(false)); } - @Override public void execute(ScriptEntry scriptEntry) { @@ -134,7 +133,6 @@ public void execute(ScriptEntry scriptEntry) { + ArgumentHelper.debugList("players", players)); } - boolean shouldCancel = cancel.asBoolean(); int i = 0; diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java index 45b0508dcc..38c74e75eb 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/AnnounceCommand.java @@ -151,4 +151,3 @@ else if (type == AnnounceType.TO_CONSOLE) { } } - diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AdjustBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AdjustBlockCommand.java index 1d8701bda2..260a1e7626 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AdjustBlockCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/AdjustBlockCommand.java @@ -15,7 +15,6 @@ import java.util.List; - public class AdjustBlockCommand extends AbstractCommand { // <--[command] diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java index cfc6120838..8e3ed50a6c 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/DropCommand.java @@ -137,7 +137,6 @@ else if (!scriptEntry.hasObject("delay") && arg.matchesArgumentType(DurationTag. // Okay! } - @Override public void execute(ScriptEntry scriptEntry) { @@ -150,7 +149,6 @@ public void execute(ScriptEntry scriptEntry) { EntityTag entity = (EntityTag) scriptEntry.getObject("entity"); DurationTag delay = (DurationTag) scriptEntry.getObject("delay"); - // Report to dB if (scriptEntry.dbCallShouldDebug()) { Debug.report(scriptEntry, getName(), diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/GameRuleCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/GameRuleCommand.java index d68c203276..23eaee9ff6 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/GameRuleCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/GameRuleCommand.java @@ -8,7 +8,6 @@ import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.commands.AbstractCommand; - public class GameRuleCommand extends AbstractCommand { // <--[command] diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java index 1816ac591b..b65bb3eeaa 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ModifyBlockCommand.java @@ -81,7 +81,6 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException // Parse arguments for (Argument arg : scriptEntry.getProcessedArgs()) { - if (arg.matchesArgumentType(CuboidTag.class) && !scriptEntry.hasObject("locations") && !scriptEntry.hasObject("location_list") @@ -159,7 +158,6 @@ else if (!scriptEntry.hasObject("percents")) { } - @Override public void execute(final ScriptEntry scriptEntry) { @@ -418,7 +416,6 @@ public void run() { }, 2, 2); } - @EventHandler public void blockPhysics(BlockPhysicsEvent event) { if (no_physics) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java index 5bd2961675..a481383772 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java @@ -138,7 +138,6 @@ public void onBlockPhysics(BlockPhysicsEvent event) { } } - private enum Type {CREATE, LOAD, UNLOAD, ROTATE, PASTE, SAVE, FLIP_X, FLIP_Y, FLIP_Z} public static Map schematics; @@ -210,7 +209,6 @@ else if (!scriptEntry.hasObject("cuboid") } } - @Override public void execute(final ScriptEntry scriptEntry) { diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/StrikeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/StrikeCommand.java index 042a527d8c..1689b589cd 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/StrikeCommand.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/StrikeCommand.java @@ -9,7 +9,6 @@ import com.denizenscript.denizencore.scripts.ScriptEntry; import com.denizenscript.denizencore.scripts.commands.AbstractCommand; - public class StrikeCommand extends AbstractCommand { // <--[command] diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InteractScriptHelper.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InteractScriptHelper.java index 4bad52fed2..9759def017 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InteractScriptHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/InteractScriptHelper.java @@ -209,7 +209,6 @@ else if (interactableScripts.isEmpty()) { return null; } - /** * Returns the current step for a Player and specified script. If no current step is found, the default * step is used, 'Default', unless another default (used by ending the step-name with a '*') is specified @@ -235,7 +234,6 @@ public static String getCurrentStep(PlayerTag player, String scriptName) { return ScriptRegistry.getScriptContainerAs(scriptName, InteractScriptContainer.class).getDefaultStepName().toUpperCase(); } - /** * Used with the getInteractScript method. Overrides Java's compareTo to allow comparisons of * possible interact scripts' priorities. diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java index c6f3353114..cabdb7ff05 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptHelper.java @@ -269,7 +269,6 @@ else if (type.equals("furnace") || type.equals("blast") || type.equals("smoker") } } - @EventHandler public void scriptReload(ScriptReloadEvent event) { rebuildRecipes(); @@ -333,7 +332,6 @@ public static String createItemScriptID(String name) { /////// All the below is for the legacy crafting system, which is still used for 1.12 and some recipe types! /////// //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - public static Map> specialrecipesMap = new HashMap<>(); public static Map> shapelessRecipesMap = new HashMap<>(); public Map currentFurnaceRecipes = new HashMap<>(); 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 a70945ab27..5983188476 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 @@ -33,13 +33,11 @@ public AbstractTrigger as(String triggerName) { return this; } - public String getName() { // Return the name of the trigger specified upon registration. return name; } - /** * Part of the Plugin disable sequence. *

@@ -50,7 +48,6 @@ public void onDisable() { // Nothing to do here on this level of abstraction. } - /** * Part of the Plugin enable sequence. *

@@ -61,7 +58,6 @@ public void onEnable() { // Nothing to do here on this level of abstraction. } - /** * Part of the Plugin enable sequence. *

@@ -73,7 +69,6 @@ public AbstractTrigger activate() { return this; } - public boolean parse(NPCTag npc, PlayerTag player, InteractScriptContainer script, String id) { return parse(npc, player, script, id, null); } diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/TriggerRegistry.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/TriggerRegistry.java index 9719e3dbb0..7c2838a57e 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/TriggerRegistry.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/TriggerRegistry.java @@ -69,7 +69,6 @@ public void registerCoreMembers() { Debug.echoApproval("Loaded core triggers: " + instances.keySet().toString()); } - ///////// // Trigger Cooldowns /////// 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 a036c9564e..e28011c612 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 @@ -150,7 +150,6 @@ public ChatContext process(Player player, String message) { // if enabled. Should the Player chat only when looking at the NPC? This may // reduce accidental chats with NPCs. - if (Settings.chatMustSeeNPC()) { if (!player.hasLineOfSight(npc.getEntity())) { if (HyperDebug) { @@ -250,7 +249,6 @@ public ChatContext process(Player player, String message) { } } - // Parse the script and match Triggers.. if found, cancel the text! The // parser will take care of everything else. String id = null; @@ -377,7 +375,6 @@ else if (keyword.equals("*") return new ChatContext(message, ret); } - @EventHandler public void asyncChatTrigger(final AsyncPlayerChatEvent event) { if (HyperDebug) { @@ -437,13 +434,11 @@ public void syncChatTrigger(final PlayerChatEvent event) { event.setCancelled(true); } - if (chat.hasChanges()) { event.setMessage(chat.getChanges()); } } - /** * Contains whether the chat trigger successfully 'triggered' and any context that was * available while triggering or attempting to trigger. 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 99289ada16..818816288d 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 @@ -25,7 +25,6 @@ public class DamageTrigger extends AbstractTrigger implements Listener { - // <--[language] // @name Damage Triggers // @group NPC Interact Scripts diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ProximityTrigger.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ProximityTrigger.java index a3fa8904d3..2385974076 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ProximityTrigger.java +++ b/plugin/src/main/java/com/denizenscript/denizen/scripts/triggers/core/ProximityTrigger.java @@ -46,7 +46,6 @@ public class ProximityTrigger extends AbstractTrigger implements Listener { // private static int maxProximityDistance = 75; // TODO: is this reasonable to have? - // <--[action] // @Actions // enter proximity @@ -156,7 +155,6 @@ && hasExitedProximityOf(bukkitPlayer, npc)) { double exitRadius = triggerTrait.getRadius(name); double moveRadius = triggerTrait.getRadius(name); - // // If a script was found, it might have custom ranges. // diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/CuboidTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/CuboidTagBase.java index 8e44883bff..4140714eec 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/CuboidTagBase.java +++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/CuboidTagBase.java @@ -7,7 +7,6 @@ import com.denizenscript.denizencore.tags.TagManager; import com.denizenscript.denizencore.utilities.CoreUtilities; - public class CuboidTagBase { public CuboidTagBase() { diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/NPCTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/NPCTagBase.java index 9f6ef09c63..65db5986f7 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/NPCTagBase.java +++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/NPCTagBase.java @@ -84,7 +84,6 @@ public void npcTags(ReplaceableTagEvent event) { } - /////// // Keep track of previous locations and fire navigation actions //// diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/PlayerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/PlayerTagBase.java index 1e5913015a..4fa8db86af 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/tags/core/PlayerTagBase.java +++ b/plugin/src/main/java/com/denizenscript/denizen/tags/core/PlayerTagBase.java @@ -74,12 +74,10 @@ public void run() { } } - ////////// // ReplaceableTagEvent handler //////// - public void playerTags(ReplaceableTagEvent event) { if (!event.matches("player", "pl") || event.replaced()) { @@ -111,4 +109,3 @@ public void playerTags(ReplaceableTagEvent event) { } } - diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/ScoreboardHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/ScoreboardHelper.java index be0f58ca58..e54db7c357 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/ScoreboardHelper.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/ScoreboardHelper.java @@ -203,7 +203,6 @@ public static void _saveScoreboards() { } } - ///////////////////// // OBJECTIVE METHODS ///////////////// diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java index a39701d7cb..ad4c01aa03 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.Set; - public class DenizenCommandHandler { private final Denizen denizen; @@ -308,7 +307,6 @@ public void version(CommandContext args, CommandSender sender) throws CommandExc Messaging.send(sender, "<7>version: " + Denizen.versionTag + "<7>, core version: " + DenizenCore.VERSION); } - /* * DENIZEN SAVE */ @@ -323,7 +321,6 @@ public void save(CommandContext args, CommandSender sender) throws CommandExcept Messaging.send(sender, "Denizen/saves.yml saved to disk from memory."); } - /* * DENIZEN RELOAD */ @@ -380,7 +377,6 @@ else if (args.getString(1).equalsIgnoreCase("scripts")) { } - /* * DENIZEN SCRIPTS */ diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/NPCCommandHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/NPCCommandHandler.java index 362b34765b..fe90a2ad00 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/NPCCommandHandler.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/NPCCommandHandler.java @@ -25,7 +25,6 @@ public NPCCommandHandler(Citizens citizens) { this.citizens = citizens; } - // <--[language] // @name /npc pushable command // @group Console Commands @@ -192,7 +191,6 @@ else if (args.length() > 2 && args.getInteger(1, 0) < 1) { } } - /* * ASSIGNMENT */ @@ -255,7 +253,6 @@ else if (args.length() > 2 && args.getInteger(1, 0) < 1) { } } - /* * TRIGGER */ @@ -316,7 +313,6 @@ public void trigger(CommandContext args, CommandSender sender, NPC npc) throws C } } - /* * NICKNAME */ @@ -349,7 +345,6 @@ else if (args.hasFlag('r')) { } } - /* * Sit */ diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandContext.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandContext.java index 7d211cca1d..c4e370805f 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandContext.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/manager/CommandContext.java @@ -14,7 +14,6 @@ public class CommandContext { - protected String[] args; protected final Set flags = new HashSet<>(); private Location location = null; diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/Debug.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/Debug.java index b892e50794..d7370128e3 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/Debug.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/Debug.java @@ -93,7 +93,6 @@ public static void echoDebug(Debuggable caller, DebugElement element) { echoDebug(caller, element, null); } - // Used by the various parts of Denizen that output debuggable information // to help scripters see what is going on. Debugging an element is usually // for formatting debug information. @@ -116,7 +115,6 @@ public static void echoDebug(Debuggable caller, DebugElement element, String str echo(sb.toString(), caller); } - // Used by the various parts of Denizen that output debuggable information // to help scripters see what is going on. public static void echoDebug(Debuggable caller, String message) { @@ -133,7 +131,6 @@ public static void echoDebug(Debuggable caller, String message) { // Other public debugging methods (Always show when debugger is enabled) /////// - /** * Shows an approval message (always shows, regardless of script debug mode, excluding debug fully off - use sparingly) * Prefixed with "OKAY! " @@ -148,7 +145,6 @@ public static void echoApproval(String message) { + ChatColor.WHITE + message, null); } - // <--[event] // @Events // script generates error @@ -386,7 +382,6 @@ public static void log(String message) { + ChatColor.WHITE + trimMessage(message), null); } - public static void log(DebugElement element, String string) { if (!showDebug) { return; @@ -413,7 +408,6 @@ public static void log(DebugElement element, String string) { // Private Helper Methods ///////// - // Some debug methods trim to keep super-long messages from hitting the console. private static String trimMessage(String message) { if (!shouldTrim) { @@ -426,7 +420,6 @@ private static String trimMessage(String message) { return message; } - public static boolean shouldDebug(Debuggable caller) { if (debugOverride) { return true; diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/depends/Depends.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/depends/Depends.java index 74800f04de..73df9d1d87 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/depends/Depends.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/depends/Depends.java @@ -8,7 +8,6 @@ import org.bukkit.plugin.Plugin; import org.bukkit.plugin.RegisteredServiceProvider; - public class Depends { public static Citizens citizens = null; diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/nbt/CustomNBT.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/nbt/CustomNBT.java index cf46e29a46..0730349cfe 100644 --- a/plugin/src/main/java/com/denizenscript/denizen/utilities/nbt/CustomNBT.java +++ b/plugin/src/main/java/com/denizenscript/denizen/utilities/nbt/CustomNBT.java @@ -427,4 +427,3 @@ public static Map> getDisabledSlots(Entity entity) { } } -