Implemented functional anvils

cmd/blockhash/main.go

@@ -222,7 +222,7 @@ func (b *hashBuilder) ftype(structName, s string, expr ast.Expr, directives map[
 		return "uint64(" + s + ".Uint8())", 4
 	case "CoralType":
 		return "uint64(" + s + ".Uint8())", 3
-	case "SandstoneType", "PrismarineType", "StoneBricksType", "NetherBricksType", "FroglightType":
+	case "AnvilType", "SandstoneType", "PrismarineType", "StoneBricksType", "NetherBricksType", "FroglightType":
 		return "uint64(" + s + ".Uint8())", 2
 	case "OreType", "FireType", "GrassType":
 		return "uint64(" + s + ".Uint8())", 1

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/pelletier/go-toml v1.9.4
 	github.com/rogpeppe/go-internal v1.3.0
-	github.com/sandertv/gophertunnel v1.20.0
+	github.com/sandertv/gophertunnel v1.21.2
 	github.com/sirupsen/logrus v1.8.1
 	golang.org/x/exp v0.0.0-20220328175248-053ad81199eb
 	golang.org/x/text v0.3.7

go.sum

@@ -147,16 +147,8 @@ github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhg
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/sandertv/go-raknet v1.10.9 h1:1a8ntIenpDBue3IsUdhJhxTznGt8Qeaan7HtQKi0hBs=
 github.com/sandertv/go-raknet v1.10.9/go.mod h1:Gx+WgZBMQ0V2UoouGoJ8Wj6CDrMBQ4SB2F/ggpl5/+Y=
-github.com/sandertv/gophertunnel v1.19.11-0.20220528215528-9a29e457b568 h1:gJj5u6lizaLUd6USTP/f4xFPXYaaMcMtzOy82l5p/V0=
-github.com/sandertv/gophertunnel v1.19.11-0.20220528215528-9a29e457b568/go.mod h1:KWY6jLxX/2P7e9n5oVFjVnPL3U1YsWuFgCrgtRazuhw=
-github.com/sandertv/gophertunnel v1.19.11-0.20220528222242-c50246c32560 h1:+coYbeRFnYXGFheqIa3u5Bt5OhKeFDrdhFBn25cokNY=
-github.com/sandertv/gophertunnel v1.19.11-0.20220528222242-c50246c32560/go.mod h1:KWY6jLxX/2P7e9n5oVFjVnPL3U1YsWuFgCrgtRazuhw=
-github.com/sandertv/gophertunnel v1.19.11-0.20220601231535-4fdf3713c504 h1:F5wOiMpqxX/P+My9RVRvApjeQBRUi25FFZu5XbqJPqI=
-github.com/sandertv/gophertunnel v1.19.11-0.20220601231535-4fdf3713c504/go.mod h1:KWY6jLxX/2P7e9n5oVFjVnPL3U1YsWuFgCrgtRazuhw=
-github.com/sandertv/gophertunnel v1.19.13 h1:agU7PpriACYVnlxiG0nhjOFXBjagGOQXO9sfyCulKjU=
-github.com/sandertv/gophertunnel v1.19.13/go.mod h1:MM2eeBapijrPCK45QL0EaTEheEBHWJshdZpr6ZBsaXc=
-github.com/sandertv/gophertunnel v1.20.0 h1:DZHlUZvQvENyddgDrrtQ6oEt5J3B3sjR7l/4yHnHYww=
-github.com/sandertv/gophertunnel v1.20.0/go.mod h1:MM2eeBapijrPCK45QL0EaTEheEBHWJshdZpr6ZBsaXc=
+github.com/sandertv/gophertunnel v1.21.2 h1:+fTgLsGY4qqO+A27u3Z2IveIcvuz25nRJZRYzVeHyjI=
+github.com/sandertv/gophertunnel v1.21.2/go.mod h1:MM2eeBapijrPCK45QL0EaTEheEBHWJshdZpr6ZBsaXc=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=

main.go

@@ -3,11 +3,14 @@ package main
 import (
 	"fmt"
 	"github.com/df-mc/dragonfly/server"
+	"github.com/df-mc/dragonfly/server/entity"
+	"github.com/df-mc/dragonfly/server/player"
 	"github.com/df-mc/dragonfly/server/player/chat"
 	"github.com/pelletier/go-toml"
 	"github.com/sirupsen/logrus"
 	"io/ioutil"
 	"os"
+	"time"
 )
 
 func main() {
@@ -28,7 +31,14 @@ func main() {
 		log.Fatalln(err)
 	}
 
-	for srv.Accept(nil) {
+	for srv.Accept(func(p *player.Player) {
+		go func() {
+			for {
+				p.SendTip(entity.Facing(p))
+				time.Sleep(200 * time.Millisecond)
+			}
+		}()
+	}) {
 	}
 }
 

server/block/anvil.go

@@ -0,0 +1,98 @@
+package block
+
+import (
+	"github.com/df-mc/dragonfly/server/block/cube"
+	"github.com/df-mc/dragonfly/server/item"
+	"github.com/df-mc/dragonfly/server/world"
+	"github.com/df-mc/dragonfly/server/world/sound"
+	"github.com/go-gl/mathgl/mgl64"
+)
+
+// Anvil is a block that allows players to repair items, rename items, and combine enchantments.
+type Anvil struct {
+	gravityAffected
+	solid
+	transparent
+
+	// Type is the type of anvil.
+	Type AnvilType
+	// Facing is the direction that the anvil is facing.
+	Facing cube.Direction
+}
+
+// BreakInfo ...
+func (a Anvil) BreakInfo() BreakInfo {
+	return newBreakInfo(5, pickaxeHarvestable, pickaxeEffective, oneOf(a))
+}
+
+// Activate ...
+func (a Anvil) Activate(pos cube.Pos, _ cube.Face, _ *world.World, u item.User) bool {
+	if opener, ok := u.(ContainerOpener); ok {
+		opener.OpenBlockContainer(pos)
+		return true
+	}
+	return false
+}
+
+// UseOnBlock ...
+func (a Anvil) UseOnBlock(pos cube.Pos, face cube.Face, _ mgl64.Vec3, w *world.World, user item.User, ctx *item.UseContext) (used bool) {
+	pos, _, used = firstReplaceable(w, pos, face, a)
+	if !used {
+		return
+	}
+	a.Facing = user.Facing().RotateRight()
+	place(w, pos, a, user, ctx)
+	return placed(ctx)
+}
+
+// NeighbourUpdateTick ...
+func (a Anvil) NeighbourUpdateTick(pos, _ cube.Pos, w *world.World) {
+	a.fall(a, pos, w)
+}
+
+// Damage returns the damage per block fallen of the anvil and the maximum damage the anvil can deal.
+func (a Anvil) Damage() (damagePerBlock, maxDamage float64) {
+	return 2, 40
+}
+
+// Break breaks the anvil and moves it to the next damage stage. If the anvil is at the last damage stage, it will be
+// destroyed.
+func (a Anvil) Break() world.Block {
+	switch a.Type {
+	case UndamagedAnvil():
+		a.Type = SlightlyDamagedAnvil()
+	case SlightlyDamagedAnvil():
+		a.Type = VeryDamagedAnvil()
+	case VeryDamagedAnvil():
+		return Air{}
+	}
+	return a
+}
+
+// Landed is called when a falling anvil hits the ground, used to, for example, play a sound.
+func (a Anvil) Landed(w *world.World, pos cube.Pos) {
+	w.PlaySound(pos.Vec3Centre(), sound.AnvilLand{})
+}
+
+// EncodeItem ...
+func (a Anvil) EncodeItem() (name string, meta int16) {
+	return "minecraft:anvil", int16(a.Type.Uint8())
+}
+
+// EncodeBlock ...
+func (a Anvil) EncodeBlock() (string, map[string]any) {
+	return "minecraft:anvil", map[string]any{
+		"damage":    a.Type.String(),
+		"direction": int32(horizontalDirection(a.Facing)),
+	}
+}
+
+// allAnvils ...
+func allAnvils() (anvils []world.Block) {
+	for _, t := range AnvilTypes() {
+		for _, d := range cube.Directions() {
+			anvils = append(anvils, Anvil{Type: t, Facing: d})
+		}
+	}
+	return
+}

server/block/anvil_type.go

@@ -0,0 +1,46 @@
+package block
+
+// AnvilType represents a type of anvil, such as undamaged, slightly damaged, or very damaged.
+type AnvilType struct {
+	anvil
+}
+
+// UndamagedAnvil returns the undamaged anvil type.
+func UndamagedAnvil() AnvilType {
+	return AnvilType{0}
+}
+
+// SlightlyDamagedAnvil returns the slightly damaged anvil type.
+func SlightlyDamagedAnvil() AnvilType {
+	return AnvilType{1}
+}
+
+// VeryDamagedAnvil returns the very damaged anvil type.
+func VeryDamagedAnvil() AnvilType {
+	return AnvilType{2}
+}
+
+// AnvilTypes returns all anvil types.
+func AnvilTypes() []AnvilType {
+	return []AnvilType{UndamagedAnvil(), SlightlyDamagedAnvil(), VeryDamagedAnvil()}
+}
+
+type anvil uint8
+
+// Uint8 returns the anvil type as a uint8.
+func (a anvil) Uint8() uint8 {
+	return uint8(a)
+}
+
+// String returns the anvil type as a string.
+func (a anvil) String() string {
+	switch a {
+	case 0:
+		return "undamaged"
+	case 1:
+		return "slightly_damaged"
+	case 2:
+		return "very_damaged"
+	}
+	panic("should never happen")
+}

server/block/block.go

@@ -141,6 +141,22 @@ func place(w *world.World, pos cube.Pos, b world.Block, user item.User, ctx *ite
 	w.PlaySound(pos.Vec3(), sound.BlockPlace{Block: b})
 }
 
+// horizontalDirection returns the horizontal direction of the given direction. This is a legacy type still used in
+// various blocks.
+func horizontalDirection(d cube.Direction) cube.Direction {
+	switch d {
+	case cube.South:
+		return cube.North
+	case cube.West:
+		return cube.South
+	case cube.North:
+		return cube.West
+	case cube.East:
+		return cube.East
+	}
+	panic("invalid direction")
+}
+
 // placed checks if an item was placed with the use context passed.
 func placed(ctx *item.UseContext) bool {
 	return ctx.CountSub > 0
@@ -185,9 +201,7 @@ func (g gravityAffected) fall(b world.Block, pos cube.Pos, w *world.World) {
 	_, liquid := w.Liquid(pos.Side(cube.FaceDown))
 	if air || liquid {
 		w.SetBlock(pos, nil, nil)
-
-		e := entity.NewFallingBlock(b, pos.Vec3Middle())
-		w.AddEntity(e)
+		w.AddEntity(entity.NewFallingBlock(b, pos.Vec3Middle()))
 	}
 }
 

server/block/coal_block.go

@@ -1,9 +1,5 @@
 package block
 
-import (
-	"github.com/df-mc/dragonfly/server/item"
-)
-
 // CoalBlock is a precious mineral block made from 9 coal.
 type CoalBlock struct {
 	solid
@@ -17,9 +13,7 @@ func (c CoalBlock) FlammabilityInfo() FlammabilityInfo {
 
 // BreakInfo ...
 func (c CoalBlock) BreakInfo() BreakInfo {
-	return newBreakInfo(5, func(t item.Tool) bool {
-		return t.ToolType() == item.TypePickaxe && t.HarvestLevel() >= item.ToolTierWood.HarvestLevel
-	}, pickaxeEffective, oneOf(c))
+	return newBreakInfo(5, pickaxeHarvestable, pickaxeEffective, oneOf(c))
 }
 
 // EncodeItem ...

server/block/cobblestone.go

@@ -15,6 +15,11 @@ func (c Cobblestone) BreakInfo() BreakInfo {
 	return newBreakInfo(2, pickaxeHarvestable, pickaxeEffective, oneOf(c))
 }
 
+// Cobblestone ...
+func (c Cobblestone) Cobblestone() bool {
+	return true
+}
+
 // EncodeItem ...
 func (c Cobblestone) EncodeItem() (name string, meta int16) {
 	if c.Mossy {

server/block/cocoa_bean.go

@@ -102,17 +102,7 @@ func (c CocoaBean) EncodeItem() (name string, meta int16) {
 
 // EncodeBlock ...
 func (c CocoaBean) EncodeBlock() (name string, properties map[string]any) {
-	direction := 2
-	switch c.Facing {
-	case cube.South:
-		direction = 0
-	case cube.West:
-		direction = 1
-	case cube.East:
-		direction = 3
-	}
-
-	return "minecraft:cocoa", map[string]any{"age": int32(c.Age), "direction": int32(direction)}
+	return "minecraft:cocoa", map[string]any{"age": int32(c.Age), "direction": int32(horizontalDirection(c.Facing))}
 }
 
 // Model ...

server/block/cube/direction.go

@@ -14,6 +14,11 @@ const (
 	East
 )
 
+// Face converts the direction to a Face and returns it.
+func (d Direction) Face() Face {
+	return Face(d + 2)
+}
+
 // Opposite returns Direction opposite to the current one.
 func (d Direction) Opposite() Direction {
 	switch d {
@@ -29,11 +34,6 @@ func (d Direction) Opposite() Direction {
 	panic("invalid direction")
 }
 
-// Face converts the direction to a Face and returns it.
-func (d Direction) Face() Face {
-	return Face(d + 2)
-}
-
 // RotateRight rotates the direction 90 degrees to the right horizontally and returns the new direction.
 func (d Direction) RotateRight() Direction {
 	switch d {

server/block/planks.go

@@ -27,6 +27,11 @@ func (p Planks) BreakInfo() BreakInfo {
 	return newBreakInfo(2, alwaysHarvestable, axeEffective, oneOf(p))
 }
 
+// Planks ...
+func (p Planks) Planks() bool {
+	return true
+}
+
 // EncodeItem ...
 func (p Planks) EncodeItem() (name string, meta int16) {
 	switch p.Wood {

server/block/pumpkin.go

@@ -78,20 +78,10 @@ func (p Pumpkin) EncodeItem() (name string, meta int16) {
 
 // EncodeBlock ...
 func (p Pumpkin) EncodeBlock() (name string, properties map[string]any) {
-	direction := 2
-	switch p.Facing {
-	case cube.South:
-		direction = 0
-	case cube.West:
-		direction = 1
-	case cube.East:
-		direction = 3
-	}
-
 	if p.Carved {
-		return "minecraft:carved_pumpkin", map[string]any{"direction": int32(direction)}
+		return "minecraft:carved_pumpkin", map[string]any{"direction": int32(horizontalDirection(p.Facing))}
 	}
-	return "minecraft:pumpkin", map[string]any{"direction": int32(direction)}
+	return "minecraft:pumpkin", map[string]any{"direction": int32(horizontalDirection(p.Facing))}
 }
 
 func allPumpkins() (pumpkins []world.Block) {

server/block/register.go

@@ -100,6 +100,7 @@ func init() {
 	world.RegisterBlock(ReinforcedDeepslate{})
 	world.RegisterBlock(MuddyMangroveRoots{})
 
+	registerAll(allAnvils())
 	registerAll(allBarrels())
 	registerAll(allBasalt())
 	registerAll(allBeetroot())
@@ -306,6 +307,9 @@ func init() {
 	for _, s := range allStoneBricks() {
 		world.RegisterItem(s.(world.Item))
 	}
+	for _, t := range AnvilTypes() {
+		world.RegisterItem(Anvil{Type: t})
+	}
 	for _, c := range item.Colours() {
 		world.RegisterItem(Concrete{Colour: c})
 		world.RegisterItem(ConcretePowder{Colour: c})