server: Replaced all math/rand with math/rand/v2.

df-mc · Dec 29, 2024 · cc7e4ee · cc7e4ee
1 parent 4719c63
commit cc7e4ee
Show file tree

Hide file tree

Showing 78 changed files with 180 additions and 172 deletions.
diff --git a/server/block/beetroot_seeds.go b/server/block/beetroot_seeds.go
@@ -5,7 +5,7 @@ import (
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // BeetrootSeeds are a crop that can be harvested to craft soup or red dye.
@@ -53,7 +53,7 @@ func (b BeetrootSeeds) BreakInfo() BreakInfo {
 		if b.Growth < 7 {
 			return []item.Stack{item.NewStack(b, 1)}
 		}
-		return []item.Stack{item.NewStack(item.Beetroot{}, 1), item.NewStack(b, rand.Intn(4)+1)}
+		return []item.Stack{item.NewStack(item.Beetroot{}, 1), item.NewStack(b, rand.IntN(4)+1)}
 	})
 }
 
@@ -71,7 +71,7 @@ func (b BeetrootSeeds) EncodeItem() (name string, meta int16) {
 func (b BeetrootSeeds) RandomTick(pos cube.Pos, tx *world.Tx, r *rand.Rand) {
 	if tx.Light(pos) < 8 {
 		breakBlock(b, pos, tx)
-	} else if b.Growth < 7 && r.Intn(3) > 0 && r.Float64() <= b.CalculateGrowthChance(pos, tx) {
+	} else if b.Growth < 7 && r.IntN(3) > 0 && r.Float64() <= b.CalculateGrowthChance(pos, tx) {
 		b.Growth++
 		tx.SetBlock(pos, b, nil)
 	}

diff --git a/server/block/blackstone.go b/server/block/blackstone.go
@@ -3,7 +3,7 @@ package block
 import (
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // Blackstone is a naturally generating block in the nether that can be used to craft stone tools, brewing stands and
@@ -22,7 +22,7 @@ func (b Blackstone) BreakInfo() BreakInfo {
 	if b.Type == GildedBlackstone() {
 		drops = func(item.Tool, []item.Enchantment) []item.Stack {
 			if rand.Float64() < 0.1 {
-				return []item.Stack{item.NewStack(item.GoldNugget{}, rand.Intn(4)+2)}
+				return []item.Stack{item.NewStack(item.GoldNugget{}, rand.IntN(4)+2)}
 			}
 			return []item.Stack{item.NewStack(b, 1)}
 		}

diff --git a/server/block/blast_furnace.go b/server/block/blast_furnace.go
@@ -7,7 +7,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/sound"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 )
 

diff --git a/server/block/block.go b/server/block/block.go
@@ -8,7 +8,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/sound"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 )
 

diff --git a/server/block/break_info.go b/server/block/break_info.go
@@ -7,7 +7,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/particle"
 	"math"
-	"math/rand"
+	"math/rand/v2"
 	"slices"
 	"time"
 )
@@ -133,7 +133,7 @@ type XPDropRange [2]int
 func (r XPDropRange) RandomValue() int {
 	diff := r[1] - r[0]
 	// Add one because it's a [r[0], r[1]] interval.
-	return rand.Intn(diff+1) + r[0]
+	return rand.IntN(diff+1) + r[0]
 }
 
 // pickaxeEffective is a convenience function for blocks that are effectively mined with a pickaxe.

diff --git a/server/block/cactus.go b/server/block/cactus.go
@@ -6,7 +6,7 @@ import (
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // Cactus is a plant block that generates naturally in dry areas and causes damage.

diff --git a/server/block/campfire.go b/server/block/campfire.go
@@ -8,7 +8,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/sound"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 	"strconv"
 	"time"
 )

diff --git a/server/block/carrot.go b/server/block/carrot.go
@@ -5,7 +5,7 @@ import (
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 )
 
@@ -41,7 +41,7 @@ func (c Carrot) BoneMeal(pos cube.Pos, tx *world.Tx) bool {
 	if c.Growth == 7 {
 		return false
 	}
-	c.Growth = min(c.Growth+rand.Intn(4)+2, 7)
+	c.Growth = min(c.Growth+rand.IntN(4)+2, 7)
 	tx.SetBlock(pos, c, nil)
 	return true
 }
@@ -67,7 +67,7 @@ func (c Carrot) BreakInfo() BreakInfo {
 		if c.Growth < 7 {
 			return []item.Stack{item.NewStack(c, 1)}
 		}
-		return []item.Stack{item.NewStack(c, rand.Intn(4)+2)}
+		return []item.Stack{item.NewStack(c, rand.IntN(4)+2)}
 	})
 }
 

diff --git a/server/block/cocoa_bean.go b/server/block/cocoa_bean.go
@@ -6,7 +6,7 @@ import (
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // CocoaBean is a crop block found in jungle biomes.
@@ -79,7 +79,7 @@ func (c CocoaBean) UseOnBlock(pos cube.Pos, face cube.Face, _ mgl64.Vec3, tx *wo
 
 // RandomTick ...
 func (c CocoaBean) RandomTick(pos cube.Pos, tx *world.Tx, r *rand.Rand) {
-	if c.Age < 2 && r.Intn(5) == 0 {
+	if c.Age < 2 && r.IntN(5) == 0 {
 		c.Age++
 		tx.SetBlock(pos, c, nil)
 	}
@@ -89,7 +89,7 @@ func (c CocoaBean) RandomTick(pos cube.Pos, tx *world.Tx, r *rand.Rand) {
 func (c CocoaBean) BreakInfo() BreakInfo {
 	return newBreakInfo(0.2, alwaysHarvestable, axeEffective, func(item.Tool, []item.Enchantment) []item.Stack {
 		if c.Age == 2 {
-			return []item.Stack{item.NewStack(c, rand.Intn(2)+2)}
+			return []item.Stack{item.NewStack(c, rand.IntN(2)+2)}
 		}
 		return []item.Stack{item.NewStack(c, 1)}
 	}).withBlastResistance(15)

diff --git a/server/block/composter.go b/server/block/composter.go
@@ -7,7 +7,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/particle"
 	"github.com/df-mc/dragonfly/server/world/sound"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 )
 

diff --git a/server/block/copper.go b/server/block/copper.go
@@ -6,7 +6,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/sound"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // Copper is a solid block commonly found in deserts and beaches underneath sand.

diff --git a/server/block/copper_door.go b/server/block/copper_door.go
@@ -7,7 +7,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/sound"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // CopperDoor is a block that can be used as an openable 1x2 barrier.

diff --git a/server/block/copper_grate.go b/server/block/copper_grate.go
@@ -6,7 +6,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/df-mc/dragonfly/server/world/sound"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // CopperGrate is a solid block commonly found in deserts and beaches underneath sand.

diff --git a/server/block/copper_ore.go b/server/block/copper_ore.go
@@ -2,7 +2,7 @@ package block
 
 import (
 	"github.com/df-mc/dragonfly/server/item"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // CopperOre is a rare mineral block found underground.
@@ -18,7 +18,7 @@ type CopperOre struct {
 func (c CopperOre) BreakInfo() BreakInfo {
 	return newBreakInfo(c.Type.Hardness(), func(t item.Tool) bool {
 		return t.ToolType() == item.TypePickaxe && t.HarvestLevel() >= item.ToolTierStone.HarvestLevel
-	}, pickaxeEffective, silkTouchDrop(item.NewStack(item.RawCopper{}, rand.Intn(4)+2), item.NewStack(c, 1))).withBlastResistance(9)
+	}, pickaxeEffective, silkTouchDrop(item.NewStack(item.RawCopper{}, rand.IntN(4)+2), item.NewStack(c, 1))).withBlastResistance(9)
 }
 
 // SmeltInfo ...

diff --git a/server/block/copper_trapdoor.go b/server/block/copper_trapdoor.go
@@ -8,7 +8,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world/sound"
 	"github.com/go-gl/mathgl/mgl64"
 	"math"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // CopperTrapdoor is a block that can be used as an openable 1x1 barrier.

diff --git a/server/block/coral.go b/server/block/coral.go
@@ -5,7 +5,7 @@ import (
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 )
 

diff --git a/server/block/coral_block.go b/server/block/coral_block.go
@@ -3,7 +3,7 @@ package block
 import (
 	"github.com/df-mc/dragonfly/server/block/cube"
 	"github.com/df-mc/dragonfly/server/world"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 )
 

diff --git a/server/block/deadbush.go b/server/block/deadbush.go
@@ -5,7 +5,7 @@ import (
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // DeadBush is a transparent block in the form of an aesthetic plant.
@@ -55,7 +55,7 @@ func (d DeadBush) BreakInfo() BreakInfo {
 		if t.ToolType() == item.TypeShears {
 			return []item.Stack{item.NewStack(d, 1)}
 		}
-		if amount := rand.Intn(3); amount != 0 {
+		if amount := rand.IntN(3); amount != 0 {
 			return []item.Stack{item.NewStack(item.Stick{}, amount)}
 		}
 		return nil

diff --git a/server/block/double_tall_grass.go b/server/block/double_tall_grass.go
@@ -5,7 +5,7 @@ import (
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // DoubleTallGrass is a two-block high variety of grass.

diff --git a/server/block/dragon_egg.go b/server/block/dragon_egg.go
@@ -1,7 +1,7 @@
 package block
 
 import (
-	"math/rand"
+	"math/rand/v2"
 
 	"github.com/df-mc/dragonfly/server/block/cube"
 	"github.com/df-mc/dragonfly/server/item"
@@ -30,7 +30,7 @@ func (d DragonEgg) SideClosed(cube.Pos, cube.Pos, *world.Tx) bool {
 // teleport ...
 func (d DragonEgg) teleport(pos cube.Pos, tx *world.Tx) {
 	for i := 0; i < 1000; i++ {
-		newPos := pos.Add(cube.Pos{rand.Intn(31) - 15, max(tx.Range()[0]-pos.Y(), min(tx.Range()[1]-pos.Y(), rand.Intn(15)-7)), rand.Intn(31) - 15})
+		newPos := pos.Add(cube.Pos{rand.IntN(31) - 15, max(tx.Range()[0]-pos.Y(), min(tx.Range()[1]-pos.Y(), rand.IntN(15)-7)), rand.IntN(31) - 15})
 
 		if _, ok := tx.Block(newPos).(Air); ok {
 			tx.SetBlock(newPos, d, nil)

diff --git a/server/block/explosion.go b/server/block/explosion.go
@@ -9,7 +9,7 @@ import (
 	"github.com/df-mc/dragonfly/server/world/sound"
 	"github.com/go-gl/mathgl/mgl64"
 	"math"
-	"math/rand"
+	"math/rand/v2"
 	"time"
 )
 
@@ -18,8 +18,10 @@ import (
 type ExplosionConfig struct {
 	// Size is the size of the explosion, it is effectively the radius which entities/blocks will be affected within.
 	Size float64
-	// Rand is the source to use for the explosion "randomness".
-	Rand rand.Source
+	// RandSource is the source to use for the explosion "randomness". If set
+	// to nil, RandSource defaults to a `rand.PCG`source seeded with
+	// `time.Now().UnixNano()`.
+	RandSource rand.Source
 	// SpawnFire will cause the explosion to randomly start fires in 1/3 of all destroyed air blocks that are
 	// above opaque blocks.
 	SpawnFire bool
@@ -74,8 +76,9 @@ func (c ExplosionConfig) Explode(tx *world.Tx, explosionPos mgl64.Vec3) {
 	if c.Particle == nil {
 		c.Particle = particle.HugeExplosion{}
 	}
-	if c.Rand == nil {
-		c.Rand = rand.NewSource(time.Now().UnixNano())
+	if c.RandSource == nil {
+		t := uint64(time.Now().UnixNano())
+		c.RandSource = rand.NewPCG(t, t)
 	}
 	if c.Size == 0 {
 		c.Size = 4
@@ -84,7 +87,7 @@ func (c ExplosionConfig) Explode(tx *world.Tx, explosionPos mgl64.Vec3) {
 		c.ItemDropChance = 1.0 / c.Size
 	}
 
-	r, d := rand.New(c.Rand), c.Size*2
+	r, d := rand.New(c.RandSource), c.Size*2
 	box := cube.Box(
 		math.Floor(explosionPos[0]-d-1),
 		math.Floor(explosionPos[1]-d-1),
@@ -164,7 +167,7 @@ func (c ExplosionConfig) Explode(tx *world.Tx, explosionPos mgl64.Vec3) {
 	}
 	if c.SpawnFire {
 		for _, pos := range affectedBlocks {
-			if r.Intn(3) == 0 {
+			if r.IntN(3) == 0 {
 				if _, ok := tx.Block(pos).(Air); ok && tx.Block(pos.Side(cube.FaceDown)).Model().FaceSolid(pos, cube.FaceUp, tx) {
 					Fire{}.Start(tx, pos)
 				}

diff --git a/server/block/farmland.go b/server/block/farmland.go
@@ -4,7 +4,7 @@ import (
 	"github.com/df-mc/dragonfly/server/block/cube"
 	"github.com/df-mc/dragonfly/server/event"
 	"github.com/df-mc/dragonfly/server/world"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // Farmland is a block that crops are grown on. Farmland is created by interacting with a grass or dirt block using a

diff --git a/server/block/fern.go b/server/block/fern.go
@@ -5,7 +5,7 @@ import (
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/go-gl/mathgl/mgl64"
-	"math/rand"
+	"math/rand/v2"
 )
 
 // Fern is a transparent plant block which can be used to obtain seeds and as decoration.