Move random to the core

and clean imports
DenizenScript · Oct 5, 2014 · a9f46a7 · a9f46a7
1 parent eaf7b09
commit a9f46a7
Show file tree

Hide file tree

Showing 36 changed files with 52 additions and 92 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,15 +1055,15 @@ 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++;
                     }
                     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;