From a9f46a70362dcac507ab9be19ed2de528324267d Mon Sep 17 00:00:00 2001 From: mcmonkey4eva Date: Sun, 5 Oct 2014 15:36:58 -0700 Subject: [PATCH] Move random to the core and clean imports --- .../java/net/aufdemrand/denizen/Denizen.java | 1 - .../denizen/events/EventManager.java | 1 - .../events/bukkit/ReplaceableTagEvent.java | 4 ---- .../events/core/EntityCombustSmartEvent.java | 1 - .../events/core/ItemMoveSmartEvent.java | 2 -- .../core/ItemDropListenerInstance.java | 8 +++---- .../denizen/npc/traits/FishingTrait.java | 10 ++++---- .../denizen/npc/traits/HealthTrait.java | 4 ++-- .../denizen/npc/traits/SittingTrait.java | 3 --- .../aufdemrand/denizen/objects/Duration.java | 4 ++-- .../aufdemrand/denizen/objects/Element.java | 1 - .../aufdemrand/denizen/objects/dColor.java | 8 +++---- .../aufdemrand/denizen/objects/dEntity.java | 6 ++--- .../net/aufdemrand/denizen/objects/dList.java | 6 ++--- .../aufdemrand/denizen/objects/dMaterial.java | 4 ++-- .../aufdemrand/denizen/objects/dScript.java | 3 --- .../aufdemrand/denizen/objects/dWorld.java | 4 ++-- .../properties/entity/EntityInfected.java | 1 - .../properties/entity/EntityJumpStrength.java | 1 - .../properties/entity/EntityPainting.java | 1 - .../denizen/scripts/ScriptRegistry.java | 3 --- .../scripts/commands/core/RandomCommand.java | 8 +++---- .../scripts/commands/core/SQLCommand.java | 1 - .../scripts/commands/entity/ShootCommand.java | 6 ++--- .../scripts/commands/entity/SpawnCommand.java | 6 ++--- .../commands/world/FireworkCommand.java | 4 ++-- .../commands/world/PlayEffectCommand.java | 4 ++-- .../scripts/containers/ScriptContainer.java | 1 - .../core/InteractScriptContainer.java | 1 - .../scripts/queues/core/Delayable.java | 1 - .../aufdemrand/denizen/tags/TagManager.java | 2 -- .../denizen/tags/core/CuboidTags.java | 1 - .../denizen/tags/core/ListTags.java | 1 - .../denizen/tags/core/UtilTags.java | 8 +++---- .../denizen/utilities/Utilities.java | 23 ++++++------------- .../utilities/packets/ItemChangeMessage.java | 1 - 36 files changed, 52 insertions(+), 92 deletions(-) diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java index a3bf472d3d..d83c9c1da6 100644 --- a/src/main/java/net/aufdemrand/denizen/Denizen.java +++ b/src/main/java/net/aufdemrand/denizen/Denizen.java @@ -52,7 +52,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.plugin.java.JavaPlugin; -import org.yaml.snakeyaml.Yaml; public class Denizen extends JavaPlugin implements DenizenImplementation { diff --git a/src/main/java/net/aufdemrand/denizen/events/EventManager.java b/src/main/java/net/aufdemrand/denizen/events/EventManager.java index 5ae1c2b811..f06dc06f01 100644 --- a/src/main/java/net/aufdemrand/denizen/events/EventManager.java +++ b/src/main/java/net/aufdemrand/denizen/events/EventManager.java @@ -18,7 +18,6 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandMap; import org.bukkit.command.PluginCommand; -import org.bukkit.configuration.ConfigurationSection; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.plugin.Plugin; diff --git a/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java b/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java index 9ec972c6e6..08c3708e99 100644 --- a/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java @@ -1,15 +1,11 @@ package net.aufdemrand.denizen.events.bukkit; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import net.aufdemrand.denizen.objects.dNPC; import net.aufdemrand.denizen.objects.dPlayer; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.tags.Attribute; import net.aufdemrand.denizen.tags.TagManager; -import net.aufdemrand.denizen.utilities.debugging.dB; import net.minecraft.util.org.apache.commons.lang3.StringUtils; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/net/aufdemrand/denizen/events/core/EntityCombustSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/EntityCombustSmartEvent.java index 62bd51a783..d4c00bc9f2 100644 --- a/src/main/java/net/aufdemrand/denizen/events/core/EntityCombustSmartEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/core/EntityCombustSmartEvent.java @@ -5,7 +5,6 @@ import net.aufdemrand.denizen.objects.*; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import org.bukkit.entity.Entity; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityCombustEvent; diff --git a/src/main/java/net/aufdemrand/denizen/events/core/ItemMoveSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/ItemMoveSmartEvent.java index 7a25ac3176..f3026b86c3 100644 --- a/src/main/java/net/aufdemrand/denizen/events/core/ItemMoveSmartEvent.java +++ b/src/main/java/net/aufdemrand/denizen/events/core/ItemMoveSmartEvent.java @@ -5,10 +5,8 @@ import net.aufdemrand.denizen.objects.*; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import org.bukkit.entity.Entity; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.inventory.InventoryMoveItemEvent; import java.util.*; diff --git a/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java b/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java index 10bcc3bd20..9ee12cf0a0 100644 --- a/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java +++ b/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java @@ -2,6 +2,7 @@ import java.util.List; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.EntityType; @@ -14,7 +15,6 @@ import net.aufdemrand.denizen.listeners.AbstractListener; import net.aufdemrand.denizen.listeners.core.ItemDropListenerType.ItemDropType; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.objects.aH; import net.aufdemrand.denizen.utilities.debugging.dB; @@ -203,7 +203,7 @@ public void mobKilled(EntityDeathEvent event) { dB.log("...within region (deprecated)"); dB.log("...trying to drop item"); - if (Utilities.getRandom().nextInt(101) < dropRate) { + if (CoreUtilities.getRandom().nextInt(101) < dropRate) { dB.log("...item should drop now"); event.getEntity().getWorld().dropItem(event.getEntity().getLocation(), item); qtyDropped++; @@ -229,7 +229,7 @@ public void blockMined(BlockBreakEvent event) { } dB.log("...within region(deprecated)"); - if (Utilities.getRandom().nextInt(101) < dropRate) { + if (CoreUtilities.getRandom().nextInt(101) < dropRate) { event.getBlock().getWorld().dropItem(event.getBlock().getLocation(), item); qtyDropped++; dB.log("...item dropped"); @@ -254,7 +254,7 @@ public void blockPlaced(BlockPlaceEvent event) { } dB.log("...within region(deprecated)"); - if (Utilities.getRandom().nextInt(101) < dropRate) { + if (CoreUtilities.getRandom().nextInt(101) < dropRate) { event.getBlock().getWorld().dropItem(event.getBlock().getLocation(), item); qtyDropped++; dB.log("...item dropped"); diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java index 9e28b5f72c..1850cd0b1b 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java +++ b/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java @@ -1,8 +1,8 @@ package net.aufdemrand.denizen.npc.traits; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import net.citizensnpcs.api.persistence.Persist; import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.util.PlayerAnimation; @@ -183,7 +183,7 @@ private void cast() { victor = normalizeVector(victor); v = v + (.5 * Math.pow(hangtime, 2)); //Random rand = new Random(1234); - v = v+ (Utilities.getRandom().nextDouble() - .8)/2; + v = v+ (CoreUtilities.getRandom().nextDouble() - .8)/2; victor = victor.multiply(v / 20.0); Projectile theHook = (Projectile) fishHook.getBukkitEntity(); @@ -265,18 +265,18 @@ else if (catchType == CatchType.FISH) private ItemStack catchRandomJunk() { fishHook.owner.a(StatisticList.A, 1); - return ((PossibleFishingResult) WeightedRandom.a(Utilities.getRandom(), junkResults)).a(Utilities.getRandom()); + return ((PossibleFishingResult) WeightedRandom.a(CoreUtilities.getRandom(), junkResults)).a(CoreUtilities.getRandom()); } private ItemStack catchRandomTreasure() { fishHook.owner.a(StatisticList.B, 1); - return ((PossibleFishingResult) WeightedRandom.a(Utilities.getRandom(), treasureResults)).a(Utilities.getRandom()); + return ((PossibleFishingResult) WeightedRandom.a(CoreUtilities.getRandom(), treasureResults)).a(CoreUtilities.getRandom()); } private ItemStack catchRandomFish() { //float f3 = f - f2; fishHook.owner.a(StatisticList.z, 1); - return ((PossibleFishingResult) WeightedRandom.a(Utilities.getRandom(), fishResults)).a(Utilities.getRandom()); + return ((PossibleFishingResult) WeightedRandom.a(CoreUtilities.getRandom(), fishResults)).a(CoreUtilities.getRandom()); } /** diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java index d1454764eb..a64dedc446 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java +++ b/src/main/java/net/aufdemrand/denizen/npc/traits/HealthTrait.java @@ -326,14 +326,14 @@ public void run() { // dMaterial mat = new dMaterial(Material.WOOL, 14); // // for (dPlayer player : Utilities.getClosestPlayers(entity.getLocation(), 10)) { -// for (Block block : Utilities.getRandomSolidBlocks(entity.getLocation(), 3, 65)) +// for (Block block : CoreUtilities.getRandomSolidBlocks(entity.getLocation(), 3, 65)) // new FakeBlock(player, new dLocation(block.getLocation()), // mat, Duration.valueOf("10-20s")); // } // // ParticleEffect.CRIT.play(entity.getEyeLocation(), .2f, .2f, .2f, 0, 3500); // -// for (Block block : Utilities.getRandomSolidBlocks(entity.getLocation(), 2, 5)) { +// for (Block block : CoreUtilities.getRandomSolidBlocks(entity.getLocation(), 2, 5)) { // entity.getWorld().dropItemNaturally(block.getLocation(), new ItemStack(Material.BONE)).setPickupDelay(Integer.MAX_VALUE); // entity.getWorld().dropItemNaturally(block.getLocation(), new ItemStack(Material.REDSTONE, 1, (short) 14)).setPickupDelay(Integer.MAX_VALUE); // } diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java index b3dfc83a9b..a58e86dcc2 100644 --- a/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java +++ b/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java @@ -2,14 +2,11 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.Utilities; -import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.persistence.Persist; import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.util.PlayerAnimation; -import net.minecraft.server.v1_7_R4.EntityHuman; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/net/aufdemrand/denizen/objects/Duration.java b/src/main/java/net/aufdemrand/denizen/objects/Duration.java index 26fce5135e..80efecf605 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/Duration.java +++ b/src/main/java/net/aufdemrand/denizen/objects/Duration.java @@ -8,9 +8,9 @@ import net.aufdemrand.denizen.objects.properties.Property; import net.aufdemrand.denizen.objects.properties.PropertyParser; import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.ChatColor; import com.google.common.primitives.Ints; @@ -109,7 +109,7 @@ public static Duration valueOf(String string) { // and that 'low' is less time than 'high'. if (low != null && high != null && low.getSecondsAsInt() < high.getSecondsAsInt()) { - int seconds = Utilities.getRandom() + int seconds = CoreUtilities.getRandom() .nextInt((high.getSecondsAsInt() - low.getSecondsAsInt() + 1)) + low.getSecondsAsInt(); // dB.log("Getting random duration between " + low.identify() diff --git a/src/main/java/net/aufdemrand/denizen/objects/Element.java b/src/main/java/net/aufdemrand/denizen/objects/Element.java index b3a6258d15..2e7adf51bc 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/Element.java +++ b/src/main/java/net/aufdemrand/denizen/objects/Element.java @@ -17,7 +17,6 @@ import net.aufdemrand.denizen.utilities.SQLEscaper; import net.aufdemrand.denizen.utilities.debugging.dB; -import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; // <--[language] diff --git a/src/main/java/net/aufdemrand/denizen/objects/dColor.java b/src/main/java/net/aufdemrand/denizen/objects/dColor.java index 7cb79e7bae..34be31f375 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dColor.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dColor.java @@ -6,7 +6,7 @@ import net.aufdemrand.denizen.objects.properties.Property; import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.utilities.Utilities; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Color; import net.aufdemrand.denizen.tags.Attribute; @@ -36,9 +36,9 @@ public static dColor valueOf(String string) { if (string.matches("RANDOM")) { // Get a color using random RGB values - return new dColor(Utilities.getRandom().nextInt(256), - Utilities.getRandom().nextInt(256), - Utilities.getRandom().nextInt(256)); + return new dColor(CoreUtilities.getRandom().nextInt(256), + CoreUtilities.getRandom().nextInt(256), + CoreUtilities.getRandom().nextInt(256)); } Matcher m = rgbPattern.matcher(string); diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java index c34d00cbf2..dbd981894e 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java @@ -8,10 +8,10 @@ import net.aufdemrand.denizen.scripts.containers.core.EntityScriptContainer; import net.aufdemrand.denizen.scripts.containers.core.EntityScriptHelper; import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; import net.aufdemrand.denizen.utilities.nbt.CustomNBT; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import net.minecraft.server.v1_7_R4.EntityHuman; import net.minecraft.server.v1_7_R4.EntityLiving; import org.bukkit.*; @@ -82,7 +82,7 @@ public static dEntity valueOf(String string) { "|ENDER_DRAGON|FISHING_HOOK|ITEM_FRAME|LEASH_HITCH|LIGHTNING" + "|PAINTING|PLAYER|UNKNOWN|WEATHER|WITHER|WITHER_SKULL)$")) { - randomType = EntityType.values()[Utilities.getRandom().nextInt(EntityType.values().length)]; + randomType = EntityType.values()[CoreUtilities.getRandom().nextInt(EntityType.values().length)]; } return new dEntity(randomType, "RANDOM"); @@ -903,7 +903,7 @@ public void setSubtype (String entityName, String typeName, String method, Strin if (value.equalsIgnoreCase("RANDOM")) { - entityClass.getMethod(method, typeClass).invoke(entity, types[Utilities.getRandom().nextInt(types.length)]); + entityClass.getMethod(method, typeClass).invoke(entity, types[CoreUtilities.getRandom().nextInt(types.length)]); } else { for (Object type : types) { diff --git a/src/main/java/net/aufdemrand/denizen/objects/dList.java b/src/main/java/net/aufdemrand/denizen/objects/dList.java index c8a18bb221..d2b34fb74c 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dList.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dList.java @@ -14,9 +14,9 @@ import net.aufdemrand.denizen.tags.core.EscapeTags; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.NaturalOrderComparator; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.ChatColor; import java.util.*; @@ -1055,7 +1055,7 @@ else if (res > 0) available.addAll(this); dList toReturn = new dList(); while (!available.isEmpty() && times < count) { - int random = Utilities.getRandom().nextInt(available.size()); + int random = CoreUtilities.getRandom().nextInt(available.size()); toReturn.add(available.get(random)); available.remove(random); times++; @@ -1063,7 +1063,7 @@ else if (res > 0) return toReturn.getAttribute(attribute.fulfill(1)); } else { - return new Element(this.get(Utilities.getRandom().nextInt(this.size()))) + return new Element(this.get(CoreUtilities.getRandom().nextInt(this.size()))) .getAttribute(attribute.fulfill(1)); } } diff --git a/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java b/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java index 715c62746d..7927dd4e1f 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dMaterial.java @@ -8,8 +8,8 @@ import net.aufdemrand.denizen.objects.properties.Property; import net.aufdemrand.denizen.objects.properties.PropertyParser; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Material; import org.bukkit.material.MaterialData; @@ -492,7 +492,7 @@ public static dMaterial valueOf(String string) { || string.toLowerCase().matches("m@random")) { // Get a random material - return new dMaterial(Material.values()[Utilities.getRandom().nextInt(Material.values().length)]); + return new dMaterial(Material.values()[CoreUtilities.getRandom().nextInt(Material.values().length)]); } Matcher m = materialPattern.matcher(string); diff --git a/src/main/java/net/aufdemrand/denizen/objects/dScript.java b/src/main/java/net/aufdemrand/denizen/objects/dScript.java index 1910747249..709ed96cbc 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dScript.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dScript.java @@ -1,8 +1,6 @@ package net.aufdemrand.denizen.objects; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import net.aufdemrand.denizen.objects.properties.Property; import net.aufdemrand.denizen.objects.properties.PropertyParser; @@ -14,7 +12,6 @@ import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizencore.utilities.YamlConfiguration; -import org.bukkit.configuration.ConfigurationSection; public class dScript implements dObject { diff --git a/src/main/java/net/aufdemrand/denizen/objects/dWorld.java b/src/main/java/net/aufdemrand/denizen/objects/dWorld.java index d3388912a8..99fb5b3f33 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/dWorld.java +++ b/src/main/java/net/aufdemrand/denizen/objects/dWorld.java @@ -3,8 +3,8 @@ import net.aufdemrand.denizen.objects.properties.Property; import net.aufdemrand.denizen.objects.properties.PropertyParser; import net.aufdemrand.denizen.tags.Attribute; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import net.citizensnpcs.api.CitizensAPI; import org.bukkit.Bukkit; @@ -272,7 +272,7 @@ public String getAttribute(Attribute attribute) { // returns a random loaded chunk. // --> if (attribute.startsWith("random_loaded_chunk")) { - int random = Utilities.getRandom().nextInt(getWorld().getLoadedChunks().length); + int random = CoreUtilities.getRandom().nextInt(getWorld().getLoadedChunks().length); return new dChunk((CraftChunk) getWorld().getLoadedChunks()[random]) .getAttribute(attribute.fulfill(1)); } diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java index d87849eb01..33374a2785 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java +++ b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityInfected.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.tags.Attribute; import net.citizensnpcs.api.npc.NPC; import net.citizensnpcs.trait.ZombieModifier; -import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Villager; import org.bukkit.entity.Zombie; diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java index cd8cc1a79e..b670c2aa14 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java +++ b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityJumpStrength.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.tags.Attribute; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse; -import org.bukkit.entity.Slime; public class EntityJumpStrength implements Property { diff --git a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java index 744d78ca1a..8118245265 100644 --- a/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java +++ b/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityPainting.java @@ -7,7 +7,6 @@ import net.aufdemrand.denizen.objects.properties.Property; import net.aufdemrand.denizen.tags.Attribute; import org.bukkit.Art; -import org.bukkit.entity.Creeper; import org.bukkit.entity.EntityType; import org.bukkit.entity.Painting; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/ScriptRegistry.java b/src/main/java/net/aufdemrand/denizen/scripts/ScriptRegistry.java index 9f048b99ad..fc06002fc4 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/ScriptRegistry.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/ScriptRegistry.java @@ -6,11 +6,8 @@ import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.scripts.ScriptHelper; import net.aufdemrand.denizencore.utilities.YamlConfiguration; -import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; -import org.yaml.snakeyaml.Yaml; -import java.io.File; import java.util.*; public class ScriptRegistry { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java index d0320d78d5..92f4d10552 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/RandomCommand.java @@ -7,9 +7,9 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.queues.ScriptQueue; import net.aufdemrand.denizen.scripts.commands.BracedCommand; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.objects.aH; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.utilities.CoreUtilities; /** @@ -87,12 +87,12 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException { possibilities = bracedCommands.size(); } - int selected = Utilities.getRandom().nextInt(possibilities); + int selected = CoreUtilities.getRandom().nextInt(possibilities); // Try to not duplicate if (selected == previous || selected == previous2 || selected == previous3) - selected = Utilities.getRandom().nextInt(possibilities); + selected = CoreUtilities.getRandom().nextInt(possibilities); if (selected == previous || selected == previous2 || selected == previous3) - selected = Utilities.getRandom().nextInt(possibilities); + selected = CoreUtilities.getRandom().nextInt(possibilities); previous3 = previous2; previous2 = previous; previous = selected; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java index 230cf3f24e..8e85f75c28 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/core/SQLCommand.java @@ -1,6 +1,5 @@ package net.aufdemrand.denizen.scripts.commands.core; -import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizencore.exceptions.CommandExecutionException; import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException; import net.aufdemrand.denizen.objects.*; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/ShootCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/ShootCommand.java index 4d6900e24a..9626d24bb4 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/ShootCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/ShootCommand.java @@ -19,7 +19,6 @@ import net.aufdemrand.denizen.scripts.queues.ScriptQueue; import net.aufdemrand.denizen.scripts.queues.core.InstantQueue; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.Conversion; import net.aufdemrand.denizen.utilities.Velocity; @@ -27,6 +26,7 @@ import net.aufdemrand.denizen.utilities.entity.Position; import net.aufdemrand.denizen.utilities.entity.Rotation; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Bukkit; import org.bukkit.entity.Entity; import org.bukkit.entity.Projectile; @@ -294,8 +294,8 @@ else if (lead == null) { Vector base = lastEntity.getVelocity().clone(); float sf = spread.asFloat(); for (dEntity entity: entities) { - Vector newvel = Velocity.spread(base, (Utilities.getRandom().nextDouble() > 0.5f ? 1: -1) * Math.toRadians(Utilities.getRandom().nextDouble() * sf), - (Utilities.getRandom().nextDouble() > 0.5f ? 1: -1) * Math.toRadians(Utilities.getRandom().nextDouble() * sf)); + Vector newvel = Velocity.spread(base, (CoreUtilities.getRandom().nextDouble() > 0.5f ? 1: -1) * Math.toRadians(CoreUtilities.getRandom().nextDouble() * sf), + (CoreUtilities.getRandom().nextDouble() > 0.5f ? 1: -1) * Math.toRadians(CoreUtilities.getRandom().nextDouble() * sf)); entity.setVelocity(newvel); } } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java index 0332fbc4a3..b79df648bb 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/entity/SpawnCommand.java @@ -11,9 +11,9 @@ import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Location; /** @@ -105,9 +105,9 @@ public void execute(final ScriptEntry scriptEntry) throws CommandExecutionExcept for (dEntity entity : entities) { Location loc = location.clone(); if (spread != null) { - loc.add(Utilities.getRandom().nextInt(spread.asInt() * 2) - spread.asInt(), + loc.add(CoreUtilities.getRandom().nextInt(spread.asInt() * 2) - spread.asInt(), 0, - Utilities.getRandom().nextInt(spread.asInt() * 2) - spread.asInt()); + CoreUtilities.getRandom().nextInt(spread.asInt() * 2) - spread.asInt()); } entity.spawnAt(loc); diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/FireworkCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/FireworkCommand.java index 34e142c596..569a216ce3 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/FireworkCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/FireworkCommand.java @@ -13,9 +13,9 @@ import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.commands.AbstractCommand; import net.aufdemrand.denizen.utilities.Conversion; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.FireworkEffect; import org.bukkit.FireworkEffect.Builder; import org.bukkit.entity.Firework; @@ -44,7 +44,7 @@ public void parseArgs(ScriptEntry scriptEntry) throws InvalidArgumentsException else if (!scriptEntry.hasObject("type") && arg.matches("random")) { - scriptEntry.addObject("type", new Element(FireworkEffect.Type.values()[Utilities.getRandom().nextInt(FireworkEffect.Type.values().length)].name())); + scriptEntry.addObject("type", new Element(FireworkEffect.Type.values()[CoreUtilities.getRandom().nextInt(FireworkEffect.Type.values().length)].name())); } else if (!scriptEntry.hasObject("type") diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java index acf790febb..2d30f2db2b 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/PlayEffectCommand.java @@ -1,7 +1,7 @@ package net.aufdemrand.denizen.scripts.commands.world; import net.aufdemrand.denizen.objects.*; -import net.aufdemrand.denizen.utilities.Utilities; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Effect; import org.bukkit.Material; @@ -64,7 +64,7 @@ else if (arg.matches("random")) { ParticleEffect effect = null; // Make sure the new effect is not an invisible effect while (effect == null || effect.toString().matches("^(BUBBLE|SUSPEND|DEPTH_SUSPEND)$")) { - effect = ParticleEffect.values()[Utilities.getRandom().nextInt(ParticleEffect.values().length)]; + effect = ParticleEffect.values()[CoreUtilities.getRandom().nextInt(ParticleEffect.values().length)]; } scriptEntry.addObject("particleeffect", effect); } diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/ScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/ScriptContainer.java index a9e3c6c41f..d4fdca6748 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/ScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/ScriptContainer.java @@ -6,7 +6,6 @@ import net.aufdemrand.denizen.scripts.ScriptBuilder; import net.aufdemrand.denizen.scripts.ScriptEntry; import net.aufdemrand.denizen.scripts.ScriptEntrySet; -import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.scripts.ScriptHelper; import net.aufdemrand.denizen.scripts.commands.core.CooldownCommand; import net.aufdemrand.denizen.scripts.requirements.RequirementsContext; diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InteractScriptContainer.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InteractScriptContainer.java index 00b101dea3..160f9859b7 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InteractScriptContainer.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/InteractScriptContainer.java @@ -8,7 +8,6 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizencore.utilities.YamlConfiguration; -import org.bukkit.configuration.ConfigurationSection; import java.util.*; public class InteractScriptContainer extends ScriptContainer { diff --git a/src/main/java/net/aufdemrand/denizen/scripts/queues/core/Delayable.java b/src/main/java/net/aufdemrand/denizen/scripts/queues/core/Delayable.java index 3615b52c43..a8baba6811 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/queues/core/Delayable.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/queues/core/Delayable.java @@ -1,7 +1,6 @@ package net.aufdemrand.denizen.scripts.queues.core; import net.aufdemrand.denizen.objects.Duration; -import net.aufdemrand.denizen.scripts.queues.ScriptQueue; public interface Delayable { diff --git a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java index 0c9ec42215..da7917a1ed 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java +++ b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java @@ -13,8 +13,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** * Calls a bukkit event for replaceable tags. diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/CuboidTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/CuboidTags.java index b12e775a65..f7b1e3f26a 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/CuboidTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/CuboidTags.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.events.bukkit.ReplaceableTagEvent; import net.aufdemrand.denizen.objects.dCuboid; -import net.aufdemrand.denizen.objects.dList; import net.aufdemrand.denizen.tags.Attribute; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/ListTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/ListTags.java index 170ddf00b5..7347318137 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/ListTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/ListTags.java @@ -3,7 +3,6 @@ import net.aufdemrand.denizen.Denizen; import net.aufdemrand.denizen.events.bukkit.ReplaceableTagEvent; import net.aufdemrand.denizen.objects.dList; -import net.aufdemrand.denizen.objects.dLocation; import net.aufdemrand.denizen.tags.Attribute; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java index 73d5e77f31..c4319b8ea1 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java +++ b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java @@ -19,11 +19,11 @@ import net.aufdemrand.denizen.scripts.queues.ScriptQueue; import net.aufdemrand.denizen.tags.Attribute; import net.aufdemrand.denizen.utilities.DenizenAPI; -import net.aufdemrand.denizen.utilities.Utilities; import net.aufdemrand.denizen.utilities.debugging.dB; import net.aufdemrand.denizen.utilities.depends.Depends; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import net.aufdemrand.denizencore.utilities.javaluator.DoubleEvaluator; import net.citizensnpcs.Citizens; import net.citizensnpcs.api.CitizensAPI; @@ -714,7 +714,7 @@ public void utilTag(ReplaceableTagEvent event) { } event.setReplaced(new Element( - String.valueOf(Utilities.getRandom().nextInt(max - min + 1) + min)) + String.valueOf(CoreUtilities.getRandom().nextInt(max - min + 1) + min)) .getAttribute(attribute.fulfill(3))); } } @@ -727,7 +727,7 @@ public void utilTag(ReplaceableTagEvent event) { // Returns a random decimal number from 0 to 1 // --> else if (subType.equalsIgnoreCase("DECIMAL")) - event.setReplaced(new Element(Utilities.getRandom().nextDouble()) + event.setReplaced(new Element(CoreUtilities.getRandom().nextDouble()) .getAttribute(attribute.fulfill(2))); // <--[tag] @@ -738,7 +738,7 @@ else if (subType.equalsIgnoreCase("DECIMAL")) // 70% of all results will be within the range of -1 to 1. // --> else if (subType.equalsIgnoreCase("GAUSS")) - event.setReplaced(new Element(Utilities.getRandom().nextGaussian()) + event.setReplaced(new Element(CoreUtilities.getRandom().nextGaussian()) .getAttribute(attribute.fulfill(2))); // TODO: Delete (Deprecated in favor of li@list.random) diff --git a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java index a1d45ecf8a..efe03e1a6c 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java @@ -1,14 +1,12 @@ package net.aufdemrand.denizen.utilities; import java.io.File; -import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Properties; -import java.util.Random; import java.util.Set; import net.aufdemrand.denizen.Settings; @@ -18,6 +16,7 @@ import net.aufdemrand.denizen.tags.TagManager; import net.aufdemrand.denizen.utilities.debugging.dB; +import net.aufdemrand.denizencore.utilities.CoreUtilities; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -36,22 +35,14 @@ */ public class Utilities { - // TODO: Javadocs, comments - // - static Random random = new Random(); - - public static Random getRandom() { - return random; - } - // TODO: Javadocs, comments // public static Location getWalkableLocationNear(Location location, int range) { Location returnable; - int selected_x = random.nextInt(range * 2); - int selected_z = random.nextInt(range * 2); + int selected_x = CoreUtilities.getRandom().nextInt(range * 2); + int selected_z = CoreUtilities.getRandom().nextInt(range * 2); returnable = location.clone().add(selected_x - range, 1, selected_z - range); // TODO: Handle location being underground/in a wall better than a stack overflow? @@ -188,9 +179,9 @@ public static List getRandomSolidBlocks(Location location, int range, int f++; Location loc = location.clone() - .add(Utilities.getRandom().nextInt(range * 2) - range, - Utilities.getRandom().nextInt(range * 2) - range, - Utilities.getRandom().nextInt(range * 2) - range); + .add(CoreUtilities.getRandom().nextInt(range * 2) - range, + CoreUtilities.getRandom().nextInt(range * 2) - range, + CoreUtilities.getRandom().nextInt(range * 2) - range); if (loc.getBlock().getType().isSolid()) { blocks.add(loc.getBlock()); @@ -510,7 +501,7 @@ public static void extractFile(File jarFile, String fileName, String destDir) { public static String generateRandomColors(int count) { String ret = ""; for (int i = 0; i < count; i++) { - ret += String.valueOf(ChatColor.COLOR_CHAR) + colors.charAt(random.nextInt(34)); + ret += String.valueOf(ChatColor.COLOR_CHAR) + colors.charAt(CoreUtilities.getRandom().nextInt(34)); } return ret; } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/packets/ItemChangeMessage.java b/src/main/java/net/aufdemrand/denizen/utilities/packets/ItemChangeMessage.java index a714dc6703..5e0b31767d 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/packets/ItemChangeMessage.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/packets/ItemChangeMessage.java @@ -14,7 +14,6 @@ import org.bukkit.event.player.PlayerItemHeldEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import org.bukkit.material.MaterialData; import java.lang.reflect.Field; import java.util.*;