better handle the static random object using Utilities class

DenizenScript · Apr 24, 2013 · 8bb8097 · 8bb8097
1 parent 7d69e5f
commit 8bb8097
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 41 deletions.
diff --git a/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java b/src/main/java/net/aufdemrand/denizen/listeners/core/ItemDropListenerInstance.java
@@ -15,7 +15,7 @@
 
 import net.aufdemrand.denizen.listeners.AbstractListener;
 import net.aufdemrand.denizen.listeners.core.ItemDropListenerType.ItemDropType;
-import net.aufdemrand.denizen.utilities.RandomGenerator;
+import net.aufdemrand.denizen.utilities.Utilities;
 import net.aufdemrand.denizen.utilities.arguments.aH;
 import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType;
 import net.aufdemrand.denizen.utilities.debugging.dB;
@@ -206,7 +206,7 @@ public void mobKilled(EntityDeathEvent event) {
 		dB.echoDebug("...within region");
 
 		dB.echoDebug("...trying to drop item");
-		if (RandomGenerator.nextInt(101) < dropRate) {
+		if (Utilities.getRandom().nextInt(101) < dropRate) {
 			dB.echoDebug("...item should drop now");
 			event.getEntity().getWorld().dropItem(event.getEntity().getLocation(), item);
 			qtyDropped++;
@@ -232,7 +232,7 @@ public void blockMined(BlockBreakEvent event) {
 		}
 		dB.echoDebug("...within region");
 
-		if (RandomGenerator.nextInt(101) < dropRate) {
+		if (Utilities.getRandom().nextInt(101) < dropRate) {
 			event.getBlock().getWorld().dropItem(event.getBlock().getLocation(), item);
 			qtyDropped++;
 			dB.echoDebug("...item dropped");
@@ -257,7 +257,7 @@ public void blockPlaced(BlockPlaceEvent event) {
 		}
 		dB.echoDebug("...within region");
 
-		if (RandomGenerator.nextInt(101) < dropRate) {
+		if (Utilities.getRandom().nextInt(101) < dropRate) {
 			event.getBlock().getWorld().dropItem(event.getBlock().getLocation(), item);
 			qtyDropped++;
 			dB.echoDebug("...item dropped");

diff --git a/src/main/java/net/aufdemrand/denizen/npc/activities/core/WanderActivity.java b/src/main/java/net/aufdemrand/denizen/npc/activities/core/WanderActivity.java
@@ -6,7 +6,7 @@
 
 import net.aufdemrand.denizen.npc.dNPC;
 import net.aufdemrand.denizen.npc.activities.AbstractActivity;
-import net.aufdemrand.denizen.utilities.RandomGenerator;
+import net.aufdemrand.denizen.utilities.Utilities;
 import net.aufdemrand.denizen.utilities.arguments.aH;
 import net.aufdemrand.denizen.utilities.arguments.aH.ArgumentType;
 import net.aufdemrand.denizen.utilities.debugging.dB;
@@ -95,11 +95,11 @@ public boolean removeGoal(dNPC npc, boolean verbose) {
 	public Location getNewLocation(double X, double Y, double Z, World world, int radius, int depth) {
 		Location newLocation = new Location(world, X, Y, Z);
 
-		int randomX = RandomGenerator.nextInt(radius * 2) - radius;
-		int randomZ = RandomGenerator.nextInt(radius * 2) - radius;
+		int randomX = Utilities.getRandom().nextInt(radius * 2) - radius;
+		int randomZ = Utilities.getRandom().nextInt(radius * 2) - radius;
 		int randomY = 0;
 
-		if (depth > 1) randomY = RandomGenerator.nextInt(depth * 2) - depth;
+		if (depth > 1) randomY = Utilities.getRandom().nextInt(depth * 2) - depth;
 		else randomY = 2;
 
 		newLocation.setX(newLocation.getX() + randomX);

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java
@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 
 import net.aufdemrand.denizen.utilities.DenizenAPI;
-import net.aufdemrand.denizen.utilities.RandomGenerator;
+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;
@@ -146,7 +146,7 @@ private void cast() {
         victor = normalizeVector(victor);
         v = v + (.5 * Math.pow(hangtime, 2));   
         //Random rand = new Random(1234);
-        v = v+ (RandomGenerator.nextDouble() - .8)/2;
+        v = v+ (Utilities.getRandom().nextDouble() - .8)/2;
         victor = victor.multiply(v / 20.0);
 
         Projectile theHook = (Projectile) fishHook.getBukkitEntity();

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
@@ -5,7 +5,7 @@
 import net.aufdemrand.denizen.scripts.ScriptEntry;
 import net.aufdemrand.denizen.scripts.ScriptQueue;
 import net.aufdemrand.denizen.scripts.commands.AbstractCommand;
-import net.aufdemrand.denizen.utilities.RandomGenerator;
+import net.aufdemrand.denizen.utilities.Utilities;
 import net.aufdemrand.denizen.utilities.arguments.aH;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.debugging.dB.Messages;
@@ -74,7 +74,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
         Integer possibilities = (Integer) scriptEntry.getObject("possibilities");
         ScriptQueue queue = (ScriptQueue) scriptEntry.getObject("queue");
 
-		int selected = RandomGenerator.nextInt(possibilities);
+		int selected = Utilities.getRandom().nextInt(possibilities);
 		ScriptEntry keeping = null;
 
 		dB.echoDebug("...random number generator selected '%s'", String.valueOf(selected + 1));

diff --git a/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java b/src/main/java/net/aufdemrand/denizen/tags/core/UtilTags.java
@@ -1,17 +1,17 @@
 package net.aufdemrand.denizen.tags.core;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+
 import net.aufdemrand.denizen.Denizen;
 import net.aufdemrand.denizen.events.ReplaceableTagEvent;
-import net.aufdemrand.denizen.utilities.RandomGenerator;
+import net.aufdemrand.denizen.utilities.Utilities;
 import net.aufdemrand.denizen.utilities.arguments.aH;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
-
 public class UtilTags implements Listener {
 
     public UtilTags(Denizen denizen) {
@@ -42,7 +42,7 @@ public void utilTags(ReplaceableTagEvent event) {
                             max = store;
                         }
 
-                        event.setReplaced(String.valueOf(RandomGenerator.randInt(min, max)));
+                        event.setReplaced(String.valueOf(Utilities.getRandom().nextInt(max - min + 1) + min));
                     }
                 }
             }

diff --git a/src/main/java/net/aufdemrand/denizen/utilities/RandomGenerator.java b/src/main/java/net/aufdemrand/denizen/utilities/RandomGenerator.java
diff --git a/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java b/src/main/java/net/aufdemrand/denizen/utilities/Utilities.java
@@ -30,11 +30,13 @@
  */
 public class Utilities {
 
+    static Random random = new Random();
+
     public static Location getWalkableLocationNear(Location location, int range) {
         Location returnable;
 
-        int selected_x = RandomGenerator.nextInt(range * 2);
-        int selected_z = RandomGenerator.nextInt(range * 2);
+        int selected_x = random.nextInt(range * 2);
+        int selected_z = random.nextInt(range * 2);
         returnable = location.add(selected_x - range, 1, selected_z - range);
 
         if (!isWalkable(returnable)) return getWalkableLocationNear(location, range);
@@ -581,5 +583,9 @@ public static List<File> listDScriptFiles(File dir, boolean recursive) {
 
         return files;
     }
+
+    public static Random getRandom() {
+    	return random;
+    }
 
 }