$ Stopped using CSRPNG's in most cases.

6 files changed, 26 insertions, 27 deletions

diff --git a/src/Java/gtPlusPlus/api/objects/CSPRNG.java b/src/Java/gtPlusPlus/api/objects/CSPRNG_DO_NOT_USE.java
index e55a650b67..19200846ca 100644
--- a/src/Java/gtPlusPlus/api/objects/CSPRNG.java
+++ b/src/Java/gtPlusPlus/api/objects/CSPRNG_DO_NOT_USE.java
@@ -86,7 +86,7 @@ import gtPlusPlus.core.util.Utils;
  * @version 3 -- 06-Jul-2005
  *
  */
-public class CSPRNG extends Random implements IRandomGenerator {
+public class CSPRNG_DO_NOT_USE extends Random implements IRandomGenerator {
 
     // pre-compute a few values
     private static final BigInteger two = BigInteger.valueOf(2L);
@@ -147,7 +147,7 @@ public class CSPRNG extends Random implements IRandomGenerator {
      *
      * @param bits number of bits
      */
-    public CSPRNG(int bits) {
+    public CSPRNG_DO_NOT_USE(int bits) {
 	this(bits, new Random());
     }
 
@@ -157,7 +157,7 @@ public class CSPRNG extends Random implements IRandomGenerator {
      * @param bits
      * @param rand
      */
-    public CSPRNG(int bits, Random rand) {
+    public CSPRNG_DO_NOT_USE(int bits, Random rand) {
 	this(generateN(bits, rand));
     }
 
@@ -169,7 +169,7 @@ public class CSPRNG extends Random implements IRandomGenerator {
      * @param n
      *            The n-value.
      */
-    public CSPRNG(BigInteger n) {
+    public CSPRNG_DO_NOT_USE(BigInteger n) {
 	this(n, SecureRandom.getSeed(n.bitLength() / 8));
     }
 
@@ -182,7 +182,7 @@ public class CSPRNG extends Random implements IRandomGenerator {
      * @param seed
      *            The seed value using a byte[] array.
      */
-    public CSPRNG(BigInteger n, byte[] seed) {
+    public CSPRNG_DO_NOT_USE(BigInteger n, byte[] seed) {
 	this.n = n;
 	setSeed(seed);
     }
@@ -217,44 +217,44 @@ public class CSPRNG extends Random implements IRandomGenerator {
     }
     
 
-    public static CSPRNG generate(){
+    public static CSPRNG_DO_NOT_USE generate(){
     	return generate(512);
     }
     
     /**
-     * @return CSPRNG
+     * @return CSPRNG_DO_NOT_USE
      * @Author Draknyte1/Alkalus
      */
-    public static CSPRNG generate(int bitsize){
+    public static CSPRNG_DO_NOT_USE generate(int bitsize){
     	// First use the internal, stock "true" random number
     	// generator to get a "true random seed"
     	SecureRandom r = Utils.generateSecureRandom();
     	r.nextInt(); // need to do something for SR to be triggered.
     	// Use this seed to generate a n-value for Blum-Blum-Shub
     	// This value can be re-used if desired.
-    	BigInteger nval = CSPRNG.generateN(bitsize, r);
+    	BigInteger nval = CSPRNG_DO_NOT_USE.generateN(bitsize, r);
     	// now get a seed
     	byte[] seed = new byte[bitsize/8];
     	r.nextBytes(seed);
     	// now create an instance of BlumBlumShub
-    	CSPRNG bbs = new CSPRNG(nval, seed);    	
+    	CSPRNG_DO_NOT_USE bbs = new CSPRNG_DO_NOT_USE(nval, seed);    	
     	return bbs;
     }
     
     
     /**
-     * @return CSPRNG
+     * @return CSPRNG_DO_NOT_USE
      * @Author Draknyte1/Alkalus
      */
-    public static CSPRNG generate(Random aRandom){
+    public static CSPRNG_DO_NOT_USE generate(Random aRandom){
     	return generate(512, aRandom);
     }
     
     /**
-     * @return CSPRNG
+     * @return CSPRNG_DO_NOT_USE
      * @Author Draknyte1/Alkalus
      */
-    public static CSPRNG generate(int aBitSize, Random aRandom){
+    public static CSPRNG_DO_NOT_USE generate(int aBitSize, Random aRandom){
     	// First use the internal, stock "true" random number
     	// generator to get a "true random seed"
     	SecureRandom r = Utils.generateSecureRandom();
@@ -264,7 +264,7 @@ public class CSPRNG extends Random implements IRandomGenerator {
     	int bitsize = aBitSize;
     	// now create an instance of BlumBlumShub
     	// do everything almost automatically
-    	CSPRNG bbs = new CSPRNG(bitsize, aRandom);
+    	CSPRNG_DO_NOT_USE bbs = new CSPRNG_DO_NOT_USE(bitsize, aRandom);
     	return bbs;
     }
 
diff --git a/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java b/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
index 8a9c56e14c..f505824bc9 100644
--- a/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
+++ b/src/Java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
@@ -2,8 +2,8 @@ package gtPlusPlus.core.client.renderer;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.CSPRNG;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.XSTR;
 import gtPlusPlus.core.entity.EntityTeslaTowerLightning;
 
 import java.util.Random;
@@ -40,7 +40,7 @@ public class RenderPlasmaBolt extends Render {
 		double[] adouble1 = new double[8];
 		double d3 = 0.0D;
 		double d4 = 0.0D;
-		Random random = CSPRNG.generate(new Random(p_76986_1_.boltVertex));
+		Random random = new XSTR(p_76986_1_.boltVertex);
 
 		for (int i = 7; i >= 0; --i) {
 			adouble[i] = d3;
@@ -50,7 +50,7 @@ public class RenderPlasmaBolt extends Render {
 		}
 
 		for (int k1 = 0; k1 < 4; ++k1) {
-			Random random1 = CSPRNG.generate(new Random(p_76986_1_.boltVertex));
+			Random random1 = new XSTR(p_76986_1_.boltVertex);
 
 			for (int j = 0; j < 3; ++j) {
 				int k = 7;
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 14fbc63797..30db0d41c8 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -6,7 +6,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import com.mojang.authlib.GameProfile;
 
 import gregtech.api.GregTech_API;
-import gtPlusPlus.api.objects.CSPRNG;
+import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
 import gtPlusPlus.api.objects.XSTR;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.array.Pair;
@@ -33,7 +33,7 @@ public class CORE {
 
 	//Math Related
 	public static final float PI = (float) Math.PI;
-	public static volatile Random RANDOM = CSPRNG.generate(new XSTR());
+	public static volatile Random RANDOM = CSPRNG_DO_NOT_USE.generate(new XSTR());
 
 	//Env. Variables
 	public static Configuration Config;
diff --git a/src/Java/gtPlusPlus/core/util/math/MathUtils.java b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
index 21c8fa840b..f3f72f86bb 100644
--- a/src/Java/gtPlusPlus/core/util/math/MathUtils.java
+++ b/src/Java/gtPlusPlus/core/util/math/MathUtils.java
@@ -4,9 +4,8 @@ import java.util.Map;
 import java.util.Random;
 
 import gregtech.api.enums.GT_Values;
-import gtPlusPlus.api.objects.CSPRNG;
+import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.XSTR;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 
@@ -23,7 +22,7 @@ public class MathUtils {
 	 * @see java.util.Random#nextInt(int)
 	 */
 
-	final static Random rand = CSPRNG.generate(CORE.RANDOM);
+	final static Random rand = CSPRNG_DO_NOT_USE.generate(CORE.RANDOM);
 
 	public static int randInt(final int min, final int max) {
 		// nextInt is normally exclusive of the top value,
diff --git a/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java b/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java
index b6aa6ae6db..0fd2d8c6a5 100644
--- a/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java
+++ b/src/Java/gtPlusPlus/core/util/uuid/UUIDGenerator.java
@@ -5,7 +5,7 @@ import java.net.InetAddress;
 import java.util.Random;
 import java.util.UUID;
 
-import gtPlusPlus.api.objects.CSPRNG;
+import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
 
 /**
  * 
@@ -106,7 +106,7 @@ public class UUIDGenerator {
 		}
 		// note that secure random is very slow the first time
 		// it is used; consider switching to a standard random
-		RANDOM = CSPRNG.generate();
+		RANDOM = CSPRNG_DO_NOT_USE.generate();
 		_seq = (short) RANDOM.nextInt(MAX_14BIT);
 
 		byte[] ip = null;
diff --git a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
index c632482d4e..1daa69bc5a 100644
--- a/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
+++ b/src/Java/gtPlusPlus/core/world/explosions/MiningExplosion.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.world.explosions;
 
 import java.util.*;
 
-import gtPlusPlus.api.objects.CSPRNG;
+import gtPlusPlus.api.objects.CSPRNG_DO_NOT_USE;
 import gtPlusPlus.api.objects.XSTR;
 import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
 import gtPlusPlus.core.util.math.MathUtils;
@@ -22,7 +22,7 @@ public class MiningExplosion extends Explosion {
 	/** whether or not this explosion spawns smoke particles */
 	public boolean isSmoking = true;
 	private final int field_77289_h = 16;
-	private final Random explosionRNG = CSPRNG.generate(new XSTR());
+	private final Random explosionRNG = CSPRNG_DO_NOT_USE.generate(new XSTR());
 	private final World worldObj;
 	public double explosionX;
 	public double explosionY;