fix: change random to threadlocalrandom where possible

Author: Kamefrede

contributors.properties

@@ -300,3 +300,4 @@ jumpyrocks=#0f1115,#d32f2f,#f6c16b,#ffeb3b,#ffffff,#7c3aed,#2aefff
 lightlike=#006600,#ff33ff
 1v1c3nes=#6c7073,#296cf2
 thefayewitch=#a117ad,#3076d1,#c44388,#000000,#ffffff,#c2a804
+zhichaoxi=#A83E3E,#ECB212,#55BCC4,#AD248D

src/main/java/vazkii/psi/common/entity/EntitySpellGrenade.java

@@ -26,6 +26,7 @@
 import vazkii.psi.api.spell.SpellContext;
 
 import java.util.Optional;
+import java.util.concurrent.ThreadLocalRandom;
 
 public class EntitySpellGrenade extends EntitySpellProjectile {
 	boolean sound = false;
@@ -76,9 +77,9 @@ public void doExplosion() {
 			double d1 = getCommandSenderWorld().random.nextGaussian() * m;
 			double d2 = getCommandSenderWorld().random.nextGaussian() * m;
 
-			double x = getX() + 0.75 * getCommandSenderWorld().random.nextFloat() - 0.375;
-			double y = getY() + 0.5 * getCommandSenderWorld().random.nextFloat();
-			double z = getZ() + 0.75 * getCommandSenderWorld().random.nextFloat() - 0.375;
+			double x = getX() + 0.75 * ThreadLocalRandom.current().nextFloat() - 0.375;
+			double y = getY() + 0.5 * ThreadLocalRandom.current().nextFloat();
+			double z = getZ() + 0.75 * ThreadLocalRandom.current().nextFloat() - 0.375;
 			getCommandSenderWorld().addParticle(ParticleTypes.EXPLOSION, x, y, z, d0, d1, d2);
 		}
 	}

src/main/java/vazkii/psi/common/item/ItemCAD.java

@@ -72,6 +72,7 @@
 import vazkii.psi.common.spell.trick.block.PieceTrickBreakBlock;
 
 import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
@@ -481,13 +482,13 @@ public boolean craft(ItemStack cad, Player player, PieceCraftingTrick craftingTr
 				ItemStack outCopy = recipe.get().value().getResultItem(RegistryAccess.EMPTY).copy();
 				int count = stack.getCount() * outCopy.getCount();
 				while(count > 64) {
-					int dropCount = world.getRandom().nextInt(32) + 32;
+					int dropCount = ThreadLocalRandom.current().nextInt(32) + 32;
 					ItemEntity drop = new ItemEntity(world, item.getX(), item.getY(), item.getZ(),
 							new ItemStack(outCopy.getItem(), dropCount));
 					Vec3 motion = item.getDeltaMovement();
-					drop.setDeltaMovement(motion.x() + (world.getRandom().nextFloat() - 0.5D) / 5,
-							motion.y() + (world.getRandom().nextFloat()) / 10,
-							motion.z() + (world.getRandom().nextFloat() - 0.5D) / 5);
+					drop.setDeltaMovement(motion.x() + (ThreadLocalRandom.current().nextFloat() - 0.5D) / 5,
+							motion.y() + (ThreadLocalRandom.current().nextFloat()) / 10,
+							motion.z() + (ThreadLocalRandom.current().nextFloat() - 0.5D) / 5);
 					world.addFreshEntity(drop);
 					count -= dropCount;
 				}

src/main/java/vazkii/psi/common/network/message/MessageVisualEffect.java

@@ -20,6 +20,8 @@
 
 import vazkii.psi.common.Psi;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 public record MessageVisualEffect(int color, double x, double y, double z, double width, double height, double offset,
 		int effectType) implements CustomPacketPayload {
 
@@ -82,9 +84,9 @@ public void handle(IPayloadContext ctx) {
 						double d2 = world.random.nextGaussian() * m;
 
 						world.addParticle(ParticleTypes.EXPLOSION,
-								x + world.random.nextFloat() * width * 2.0F - width - d0 * d3,
-								y + world.random.nextFloat() * height - d1 * d3,
-								z + world.random.nextFloat() * width * 2.0F - width - d2 * d3, d0, d1, d2);
+								x + ThreadLocalRandom.current().nextFloat() * width * 2.0F - width - d0 * d3,
+								y + ThreadLocalRandom.current().nextFloat() * height - d1 * d3,
+								z + ThreadLocalRandom.current().nextFloat() * width * 2.0F - width - d2 * d3, d0, d1, d2);
 					}
 				}
 			}

src/main/java/vazkii/psi/common/spell/operator/entity/PieceOperatorRandomEntity.java

@@ -18,6 +18,8 @@
 import vazkii.psi.api.spell.piece.PieceOperator;
 import vazkii.psi.api.spell.wrapper.EntityListWrapper;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 public class PieceOperatorRandomEntity extends PieceOperator {
 
 	SpellParam<EntityListWrapper> list;
@@ -38,7 +40,7 @@ public Object execute(SpellContext context) throws SpellRuntimeException {
 			throw new SpellRuntimeException(SpellRuntimeException.NULL_TARGET);
 		}
 
-		return listVal.get(context.caster.getCommandSenderWorld().random.nextInt(listVal.size()));
+		return listVal.get(ThreadLocalRandom.current().nextInt(listVal.size()));
 	}
 
 	@Override

src/main/java/vazkii/psi/common/spell/operator/number/PieceOperatorRandom.java

@@ -15,6 +15,8 @@
 import vazkii.psi.api.spell.param.ParamNumber;
 import vazkii.psi.api.spell.piece.PieceOperator;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 public class PieceOperatorRandom extends PieceOperator {
 
 	SpellParam<Number> max;
@@ -39,7 +41,7 @@ public Object execute(SpellContext context) throws SpellRuntimeException {
 			throw new SpellRuntimeException(SpellRuntimeException.NEGATIVE_NUMBER);
 		}
 
-		return (double) (context.caster.getCommandSenderWorld().random.nextInt(maxVal - minVal) + minVal);
+		return (double) (ThreadLocalRandom.current().nextInt(maxVal - minVal) + minVal);
 	}
 
 	@Override

src/main/java/vazkii/psi/common/spell/trick/PieceTrickTorrent.java

@@ -32,6 +32,8 @@
 import vazkii.psi.api.spell.param.ParamVector;
 import vazkii.psi.api.spell.piece.PieceTrick;
 
+import java.util.concurrent.ThreadLocalRandom;
+
 public class PieceTrickTorrent extends PieceTrick {
 
 	SpellParam<Vector3> position;
@@ -54,7 +56,7 @@ public static boolean placeWater(@Nullable Player playerIn, Level worldIn, Block
 				int i = pos.getX();
 				int j = pos.getY();
 				int k = pos.getZ();
-				worldIn.playSound(playerIn, pos, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5F, 2.6F + (worldIn.random.nextFloat() - worldIn.random.nextFloat()) * 0.8F);
+				worldIn.playSound(playerIn, pos, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5F, 2.6F + (ThreadLocalRandom.current().nextFloat() - ThreadLocalRandom.current().nextFloat()) * 0.8F);
 
 				for(int l = 0; l < 8; ++l) {
 					worldIn.addParticle(ParticleTypes.LARGE_SMOKE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D);

web/changelog.txt

@@ -1,3 +1,11 @@
+1.21-108
+* Fixed random operations not being thread-safe (Kamefrede)
+* Fixed Spell Import message from old versions not having the correct text (Kamefrede)
+* Fixed CAD Data being wrongly shared between all CADs (Kamefrede)
+* Fixed Vector3 conversion to BlockPos truncating instead of rounding (Kamefrede)
+* Fixed Psi Overload death message not having the correct text (Kamefrede)
+* Fixed crash when moving CAD in inventory while loopcast is active (Kamefrede)
+* Fixed crash when a player removes a CAD from an assembbler with another player looking at it (Kamefrede)
 1.21-107
 * [API] Make Total PSI and PSI Regeneration configurable attributes (lightsing)
 * Fixed Trick: Break Block not playing particles correctly (zhichaoxi2006)