Nether portals and mechanics

server/block/fire.go

@@ -7,6 +7,7 @@ import (
 	"github.com/df-mc/dragonfly/server/entity"
 	"github.com/df-mc/dragonfly/server/entity/damage"
 	"github.com/df-mc/dragonfly/server/world"
+	"github.com/df-mc/dragonfly/server/world/portal"
 	"math/rand"
 	"time"
 )
@@ -24,40 +25,98 @@ type Fire struct {
 	Age int
 }
 
-// flammableBlock returns true if a block is flammable.
-func flammableBlock(block world.Block) bool {
-	flammable, ok := block.(Flammable)
-	return ok && flammable.FlammabilityInfo().Encouragement > 0
+// Place ...
+func (Fire) Place(pos cube.Pos, w *world.World) bool {
+	for _, f := range cube.Faces() {
+		if o, ok := w.Block(pos.Side(f)).(Obsidian); ok && !o.Crying {
+			if p, ok := portal.NetherPortalFromPos(w, pos); ok && p.Framed() && !p.Activated() {
+				p.Activate()
+				return false
+			}
+			return true
+		}
+	}
+	return true
 }
 
-// neighboursFlammable returns true if one a block adjacent to the passed position is flammable.
-func neighboursFlammable(pos cube.Pos, w *world.World) bool {
-	for _, i := range cube.Faces() {
-		if flammableBlock(w.Block(pos.Side(i))) {
-			return true
+// EntityInside ...
+func (f Fire) EntityInside(_ cube.Pos, _ *world.World, e world.Entity) {
+	if flammable, ok := e.(entity.Flammable); ok {
+		if l, ok := e.(entity.Living); ok && !l.AttackImmune() {
+			l.Hurt(1, damage.SourceFire{})
+		}
+		if flammable.OnFireDuration() < time.Second*8 {
+			flammable.SetOnFire(8 * time.Second)
+		}
+	}
+}
+
+// ScheduledTick ...
+func (f Fire) ScheduledTick(pos cube.Pos, w *world.World, r *rand.Rand) {
+	f.tick(pos, w, r)
+}
+
+// RandomTick ...
+func (f Fire) RandomTick(pos cube.Pos, w *world.World, r *rand.Rand) {
+	f.tick(pos, w, r)
+}
+
+// NeighbourUpdateTick ...
+func (f Fire) NeighbourUpdateTick(pos, neighbour cube.Pos, w *world.World) {
+	below := w.Block(pos.Side(cube.FaceDown))
+	if diffuser, ok := below.(LightDiffuser); (ok && diffuser.LightDiffusionLevel() != 15) && (!neighboursFlammable(pos, w) || f.Type == SoulFire()) {
+		w.BreakBlockWithoutParticles(pos)
+		return
+	}
+	switch below.(type) {
+	case SoulSand, SoulSoil:
+		f.Type = SoulFire()
+		w.PlaceBlock(pos, f)
+	case Water:
+		if neighbour == pos {
+			w.BreakBlockWithoutParticles(pos)
+		}
+	default:
+		if f.Type == SoulFire() {
+			w.BreakBlockWithoutParticles(pos)
+			return
 		}
 	}
+}
+
+// HasLiquidDrops ...
+func (f Fire) HasLiquidDrops() bool {
 	return false
 }
 
-// max ...
-func max(a, b int) int {
-	if a > b {
-		return a
+// LightEmissionLevel ...
+func (f Fire) LightEmissionLevel() uint8 {
+	return f.Type.LightLevel()
+}
+
+// EncodeBlock ...
+func (f Fire) EncodeBlock() (name string, properties map[string]interface{}) {
+	switch f.Type {
+	case NormalFire():
+		return "minecraft:fire", map[string]interface{}{"age": int32(f.Age)}
+	case SoulFire():
+		return "minecraft:soul_fire", map[string]interface{}{"age": int32(f.Age)}
 	}
-	return b
+	panic("unknown fire type")
 }
 
-// infinitelyBurning returns true if fire can infinitely burn at the specified position.
-func infinitelyBurning(pos cube.Pos, w *world.World) bool {
-	switch block := w.Block(pos.Side(cube.FaceDown)).(type) {
-	//TODO: Magma Block
-	case Netherrack:
-		return true
-	case Bedrock:
-		return block.InfiniteBurning
+// Start starts a fire at a position in the world. The position passed must be either air or tall grass and conditions
+// for a fire to be present must be present.
+func (f Fire) Start(w *world.World, pos cube.Pos) {
+	b := w.Block(pos)
+	_, isAir := b.(Air)
+	_, isTallGrass := b.(TallGrass)
+	if isAir || isTallGrass {
+		below := w.Block(pos.Side(cube.FaceDown))
+		if below.Model().FaceSolid(pos, cube.FaceUp, w) || neighboursFlammable(pos, w) {
+			w.PlaceBlock(pos, Fire{})
+		}
 	}
-	return false
 }
 
 // burn attempts to burn a block.
@@ -75,18 +134,6 @@ func (f Fire) burn(pos cube.Pos, w *world.World, r *rand.Rand, chanceBound int)
 	}
 }
 
-// rainingAround checks if it is raining either at the cube.Pos passed or at any of its horizontal neighbours.
-func rainingAround(pos cube.Pos, w *world.World) bool {
-	raining := w.RainingAt(pos)
-	for _, face := range cube.HorizontalFaces() {
-		if raining {
-			break
-		}
-		raining = w.RainingAt(pos.Side(face))
-	}
-	return raining
-}
-
 // tick ...
 func (f Fire) tick(pos cube.Pos, w *world.World, r *rand.Rand) {
 	if f.Type == SoulFire() {
@@ -174,84 +221,52 @@ func (f Fire) tick(pos cube.Pos, w *world.World, r *rand.Rand) {
 	}
 }
 
-// EntityInside ...
-func (f Fire) EntityInside(_ cube.Pos, _ *world.World, e world.Entity) {
-	if flammable, ok := e.(entity.Flammable); ok {
-		if l, ok := e.(entity.Living); ok && !l.AttackImmune() {
-			l.Hurt(1, damage.SourceFire{})
-		}
-		if flammable.OnFireDuration() < time.Second*8 {
-			flammable.SetOnFire(8 * time.Second)
-		}
-	}
-}
-
-// ScheduledTick ...
-func (f Fire) ScheduledTick(pos cube.Pos, w *world.World, r *rand.Rand) {
-	f.tick(pos, w, r)
-}
-
-// RandomTick ...
-func (f Fire) RandomTick(pos cube.Pos, w *world.World, r *rand.Rand) {
-	f.tick(pos, w, r)
+// flammableBlock returns true if a block is flammable.
+func flammableBlock(block world.Block) bool {
+	flammable, ok := block.(Flammable)
+	return ok && flammable.FlammabilityInfo().Encouragement > 0
 }
 
-// NeighbourUpdateTick ...
-func (f Fire) NeighbourUpdateTick(pos, neighbour cube.Pos, w *world.World) {
-	below := w.Block(pos.Side(cube.FaceDown))
-	if diffuser, ok := below.(LightDiffuser); (ok && diffuser.LightDiffusionLevel() != 15) && (!neighboursFlammable(pos, w) || f.Type == SoulFire()) {
-		w.BreakBlockWithoutParticles(pos)
-		return
-	}
-	switch below.(type) {
-	case SoulSand, SoulSoil:
-		f.Type = SoulFire()
-		w.PlaceBlock(pos, f)
-	case Water:
-		if neighbour == pos {
-			w.BreakBlockWithoutParticles(pos)
-		}
-	default:
-		if f.Type == SoulFire() {
-			w.BreakBlockWithoutParticles(pos)
-			return
+// neighboursFlammable returns true if one a block adjacent to the passed position is flammable.
+func neighboursFlammable(pos cube.Pos, w *world.World) bool {
+	for _, i := range cube.Faces() {
+		if flammableBlock(w.Block(pos.Side(i))) {
+			return true
 		}
 	}
-}
-
-// HasLiquidDrops ...
-func (f Fire) HasLiquidDrops() bool {
 	return false
 }
 
-// LightEmissionLevel ...
-func (f Fire) LightEmissionLevel() uint8 {
-	return f.Type.LightLevel()
+// max ...
+func max(a, b int) int {
+	if a > b {
+		return a
+	}
+	return b
 }
 
-// EncodeBlock ...
-func (f Fire) EncodeBlock() (name string, properties map[string]interface{}) {
-	switch f.Type {
-	case NormalFire():
-		return "minecraft:fire", map[string]interface{}{"age": int32(f.Age)}
-	case SoulFire():
-		return "minecraft:soul_fire", map[string]interface{}{"age": int32(f.Age)}
+// infinitelyBurning returns true if fire can infinitely burn at the specified position.
+func infinitelyBurning(pos cube.Pos, w *world.World) bool {
+	switch block := w.Block(pos.Side(cube.FaceDown)).(type) {
+	//TODO: Magma Block
+	case Netherrack:
+		return true
+	case Bedrock:
+		return block.InfiniteBurning
 	}
-	panic("unknown fire type")
+	return false
 }
 
-// Start starts a fire at a position in the world. The position passed must be either air or tall grass and conditions
-// for a fire to be present must be present.
-func (f Fire) Start(w *world.World, pos cube.Pos) {
-	b := w.Block(pos)
-	_, isAir := b.(Air)
-	_, isTallGrass := b.(TallGrass)
-	if isAir || isTallGrass {
-		below := w.Block(pos.Side(cube.FaceDown))
-		if below.Model().FaceSolid(pos, cube.FaceUp, w) || neighboursFlammable(pos, w) {
-			w.PlaceBlock(pos, Fire{})
+// rainingAround checks if it is raining either at the cube.Pos passed or at any of its horizontal neighbours.
+func rainingAround(pos cube.Pos, w *world.World) bool {
+	raining := w.RainingAt(pos)
+	for _, face := range cube.HorizontalFaces() {
+		if raining {
+			break
 		}
+		raining = w.RainingAt(pos.Side(face))
 	}
+	return raining
 }
 
 // allFire ...

server/block/model/portal.go

@@ -0,0 +1,28 @@
+package model
+
+import (
+	"github.com/df-mc/dragonfly/server/block/cube"
+	"github.com/df-mc/dragonfly/server/entity/physics"
+	"github.com/df-mc/dragonfly/server/world"
+	"github.com/go-gl/mathgl/mgl64"
+)
+
+// Portal is a model used by portal blocks.
+type Portal struct {
+	// Axis is the axis which the portal faces.
+	Axis cube.Axis
+}
+
+// AABB ...
+func (p Portal) AABB(cube.Pos, *world.World) []physics.AABB {
+	min, max := mgl64.Vec3{0, 0, 0.375}, mgl64.Vec3{1, 1, 0.25}
+	if p.Axis == cube.Z {
+		min[0], min[2], max[0], max[2] = 0.375, 0, 0.25, 1
+	}
+	return []physics.AABB{physics.NewAABB(min, max)}
+}
+
+// FaceSolid ...
+func (Portal) FaceSolid(cube.Pos, cube.Face, *world.World) bool {
+	return false
+}

server/block/portal.go

@@ -0,0 +1,38 @@
+package block
+
+import (
+	"github.com/df-mc/dragonfly/server/block/cube"
+	"github.com/df-mc/dragonfly/server/block/model"
+	"github.com/df-mc/dragonfly/server/world"
+	"github.com/df-mc/dragonfly/server/world/portal"
+)
+
+// Portal is the translucent part of the nether portal that teleports the player to and from the Nether.
+type Portal struct {
+	transparent
+
+	// Axis is the axis which the portal faces.
+	Axis cube.Axis
+}
+
+// Model ...
+func (p Portal) Model() world.BlockModel {
+	return model.Portal{Axis: p.Axis}
+}
+
+// EncodeBlock ...
+func (p Portal) EncodeBlock() (string, map[string]interface{}) {
+	return "minecraft:portal", map[string]interface{}{"portal_axis": p.Axis.String()}
+}
+
+// HasLiquidDrops ...
+func (p Portal) HasLiquidDrops() bool {
+	return false
+}
+
+// NeighbourUpdateTick ...
+func (p Portal) NeighbourUpdateTick(pos, _ cube.Pos, w *world.World) {
+	if n, ok := portal.NetherPortalFromPos(w, pos); ok && (!n.Framed() || !n.Activated()) {
+		n.Deactivate()
+	}
+}

server/block/register.go

@@ -1,6 +1,7 @@
 package block
 
 import (
+	"github.com/df-mc/dragonfly/server/block/cube"
 	_ "github.com/df-mc/dragonfly/server/internal/block_internal"
 	"github.com/df-mc/dragonfly/server/item"
 	"github.com/df-mc/dragonfly/server/world"
@@ -29,6 +30,8 @@ func init() {
 	world.RegisterBlock(Bedrock{InfiniteBurning: true})
 	world.RegisterBlock(Obsidian{})
 	world.RegisterBlock(Obsidian{Crying: true})
+	world.RegisterBlock(Portal{Axis: cube.X})
+	world.RegisterBlock(Portal{Axis: cube.Z})
 	world.RegisterBlock(DiamondBlock{})
 	world.RegisterBlock(Glass{})
 	world.RegisterBlock(Glowstone{})

server/entity/falling_block.go

@@ -53,7 +53,7 @@ func (f *FallingBlock) Block() world.Block {
 // Tick ...
 func (f *FallingBlock) Tick(w *world.World, _ int64) {
 	f.mu.Lock()
-	m := f.c.TickMovement(f, f.pos, f.vel, 0, 0)
+	m := f.c.TickMovement(w, f, f.pos, f.vel, 0, 0)
 	f.pos, f.vel = m.pos, m.vel
 	f.mu.Unlock()