server/block: Implement Copper Age Blocks (#1125)

Author: xNatsuri

server/block/copper_bars.go

@@ -0,0 +1,96 @@
+package block
+
+import (
+	"math/rand/v2"
+
+	"github.com/df-mc/dragonfly/server/block/cube"
+	"github.com/df-mc/dragonfly/server/world"
+	"github.com/df-mc/dragonfly/server/world/sound"
+	"github.com/go-gl/mathgl/mgl64"
+)
+
+// CopperBars are blocks that serve a similar purpose to glass panes, but made of copper instead of glass.
+type CopperBars struct {
+	transparent
+	thin
+	sourceWaterDisplacer
+
+	// Oxidation is the level of oxidation of the copper bars.
+	Oxidation OxidationType
+	// Waxed bool is whether the copper bars has been waxed with honeycomb.
+	Waxed bool
+}
+
+// BreakInfo ...
+func (c CopperBars) BreakInfo() BreakInfo {
+	return newBreakInfo(5, pickaxeHarvestable, pickaxeEffective, oneOf(c)).withBlastResistance(30)
+}
+
+// SideClosed ...
+func (c CopperBars) SideClosed(cube.Pos, cube.Pos, *world.Tx) bool {
+	return false
+}
+
+// Wax waxes the copper bars to stop it from oxidising further.
+func (c CopperBars) Wax(cube.Pos, mgl64.Vec3) (world.Block, bool) {
+	if c.Waxed {
+		return c, false
+	}
+	c.Waxed = true
+	return c, true
+}
+
+// Strip ...
+func (c CopperBars) Strip() (world.Block, world.Sound, bool) {
+	if c.Waxed {
+		c.Waxed = false
+		return c, sound.WaxRemoved{}, true
+	} else if ot, ok := c.Oxidation.Decrease(); ok {
+		c.Oxidation = ot
+		return c, sound.CopperScraped{}, true
+	}
+	return c, nil, false
+}
+
+// CanOxidate ...
+func (c CopperBars) CanOxidate() bool {
+	return !c.Waxed
+}
+
+// OxidationLevel ...
+func (c CopperBars) OxidationLevel() OxidationType {
+	return c.Oxidation
+}
+
+// WithOxidationLevel ...
+func (c CopperBars) WithOxidationLevel(o OxidationType) Oxidisable {
+	c.Oxidation = o
+	return c
+}
+
+// RandomTick ...
+func (c CopperBars) RandomTick(pos cube.Pos, tx *world.Tx, r *rand.Rand) {
+	attemptOxidation(pos, tx, r, c)
+}
+
+// EncodeItem ...
+func (c CopperBars) EncodeItem() (name string, meta int16) {
+	return copperBlockName("copper_bars", c.Oxidation, c.Waxed), 0
+}
+
+// EncodeBlock ...
+func (c CopperBars) EncodeBlock() (name string, properties map[string]any) {
+	return copperBlockName("copper_bars", c.Oxidation, c.Waxed), nil
+}
+
+// allCopperBars ...
+func allCopperBars() (bars []world.Block) {
+	f := func(waxed bool) {
+		for _, o := range OxidationTypes() {
+			bars = append(bars, CopperBars{Oxidation: o, Waxed: waxed})
+		}
+	}
+	f(true)
+	f(false)
+	return
+}

server/block/copper_chain.go

@@ -0,0 +1,118 @@
+package block
+
+import (
+	"math/rand/v2"
+
+	"github.com/df-mc/dragonfly/server/block/cube"
+	"github.com/df-mc/dragonfly/server/block/model"
+	"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"
+)
+
+// CopperChain is a metallic decoration block.
+type CopperChain struct {
+	transparent
+	sourceWaterDisplacer
+
+	// Axis is the axis which the chain faces.
+	Axis cube.Axis
+	// Oxidation is the level of oxidation of the copper chain.
+	Oxidation OxidationType
+	// Waxed bool is whether the copper chain has been waxed with honeycomb.
+	Waxed bool
+}
+
+// SideClosed ...
+func (CopperChain) SideClosed(cube.Pos, cube.Pos, *world.Tx) bool {
+	return false
+}
+
+// UseOnBlock ...
+func (c CopperChain) UseOnBlock(pos cube.Pos, face cube.Face, _ mgl64.Vec3, tx *world.Tx, user item.User, ctx *item.UseContext) (used bool) {
+	pos, face, used = firstReplaceable(tx, pos, face, c)
+	if !used {
+		return
+	}
+	c.Axis = face.Axis()
+
+	place(tx, pos, c, user, ctx)
+	return placed(ctx)
+}
+
+// BreakInfo ...
+func (c CopperChain) BreakInfo() BreakInfo {
+	return newBreakInfo(5, pickaxeHarvestable, pickaxeEffective, oneOf(c)).withBlastResistance(30)
+}
+
+// Wax waxes the copper chain to stop it from oxidising further.
+func (c CopperChain) Wax(cube.Pos, mgl64.Vec3) (world.Block, bool) {
+	if c.Waxed {
+		return c, false
+	}
+	c.Waxed = true
+	return c, true
+}
+
+// Strip ...
+func (c CopperChain) Strip() (world.Block, world.Sound, bool) {
+	if c.Waxed {
+		c.Waxed = false
+		return c, sound.WaxRemoved{}, true
+	} else if ot, ok := c.Oxidation.Decrease(); ok {
+		c.Oxidation = ot
+		return c, sound.CopperScraped{}, true
+	}
+	return c, nil, false
+}
+
+// CanOxidate ...
+func (c CopperChain) CanOxidate() bool {
+	return !c.Waxed
+}
+
+// OxidationLevel ...
+func (c CopperChain) OxidationLevel() OxidationType {
+	return c.Oxidation
+}
+
+// WithOxidationLevel ...
+func (c CopperChain) WithOxidationLevel(o OxidationType) Oxidisable {
+	c.Oxidation = o
+	return c
+}
+
+// RandomTick ...
+func (c CopperChain) RandomTick(pos cube.Pos, tx *world.Tx, r *rand.Rand) {
+	attemptOxidation(pos, tx, r, c)
+}
+
+// EncodeItem ...
+func (c CopperChain) EncodeItem() (name string, meta int16) {
+	return copperBlockName("copper_chain", c.Oxidation, c.Waxed), 0
+}
+
+// EncodeBlock ...
+func (c CopperChain) EncodeBlock() (name string, properties map[string]any) {
+	return copperBlockName("copper_chain", c.Oxidation, c.Waxed), map[string]any{"pillar_axis": c.Axis.String()}
+}
+
+// Model ...
+func (c CopperChain) Model() world.BlockModel {
+	return model.Chain{Axis: c.Axis}
+}
+
+// allCopperChains ...
+func allCopperChains() (chains []world.Block) {
+	f := func(waxed bool) {
+		for _, o := range OxidationTypes() {
+			for _, axis := range cube.Axes() {
+				chains = append(chains, CopperChain{Axis: axis, Oxidation: o, Waxed: waxed})
+			}
+		}
+	}
+	f(true)
+	f(false)
+	return
+}

server/block/copper_door.go

@@ -1,13 +1,14 @@
 package block
 
 import (
+	"math/rand/v2"
+
 	"github.com/df-mc/dragonfly/server/block/cube"
 	"github.com/df-mc/dragonfly/server/block/model"
 	"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"
-	"math/rand/v2"
 )
 
 // CopperDoor is a block that can be used as an openable 1x2 barrier.
@@ -167,26 +168,12 @@ func (d CopperDoor) SideClosed(cube.Pos, cube.Pos, *world.Tx) bool {
 
 // EncodeItem ...
 func (d CopperDoor) EncodeItem() (name string, meta int16) {
-	name = "copper_door"
-	if d.Oxidation != UnoxidisedOxidation() {
-		name = d.Oxidation.String() + "_" + name
-	}
-	if d.Waxed {
-		name = "waxed_" + name
-	}
-	return "minecraft:" + name, 0
+	return copperBlockName("copper_door", d.Oxidation, d.Waxed), 0
 }
 
 // EncodeBlock ...
 func (d CopperDoor) EncodeBlock() (name string, properties map[string]any) {
-	name = "copper_door"
-	if d.Oxidation != UnoxidisedOxidation() {
-		name = d.Oxidation.String() + "_" + name
-	}
-	if d.Waxed {
-		name = "waxed_" + name
-	}
-	return "minecraft:" + name, map[string]any{"minecraft:cardinal_direction": d.Facing.RotateRight().String(), "door_hinge_bit": d.Right, "open_bit": d.Open, "upper_block_bit": d.Top}
+	return copperBlockName("copper_door", d.Oxidation, d.Waxed), map[string]any{"minecraft:cardinal_direction": d.Facing.RotateRight().String(), "door_hinge_bit": d.Right, "open_bit": d.Open, "upper_block_bit": d.Top}
 }
 
 // allCopperDoors returns a list of all copper door types

server/block/copper_golem_pose.go

@@ -0,0 +1,53 @@
+package block
+
+// CopperGolemPose represents a pose of a copper golem statue.
+type CopperGolemPose struct {
+	pose
+}
+
+type pose uint8
+
+// StandingPose is the standing pose.
+func StandingPose() CopperGolemPose {
+	return CopperGolemPose{0}
+}
+
+// SittingPose is the sitting pose.
+func SittingPose() CopperGolemPose {
+	return CopperGolemPose{1}
+}
+
+// RunningPose is the running pose.
+func RunningPose() CopperGolemPose {
+	return CopperGolemPose{2}
+}
+
+// StarPose is the head button pressing pose.
+func StarPose() CopperGolemPose {
+	return CopperGolemPose{3}
+}
+
+// Uint8 returns the pose as a uint8.
+func (p pose) Uint8() uint8 {
+	return uint8(p)
+}
+
+// Name returns the pose as a string.
+func (p pose) Name() string {
+	switch p {
+	case 0:
+		return "Standing"
+	case 1:
+		return "Sitting"
+	case 2:
+		return "Running"
+	case 3:
+		return "Star"
+	}
+	panic("unknown copper golem pose")
+}
+
+// CopperGolemPoses returns all copper golem poses.
+func CopperGolemPoses() []CopperGolemPose {
+	return []CopperGolemPose{StandingPose(), SittingPose(), RunningPose(), StarPose()}
+}