port: coloured torch (df-mc/dragonfly#1173)

- Move coloured torch implementation to dedicated files.
- Add TorchColour enum + registration helpers.
- Keep compatibility aliases for existing ColoredTorch API.
- Update blockhash generator for TorchColour and regenerate hashes.

Author: dm-vev

cmd/blockhash/main.go

@@ -262,7 +262,7 @@ func (b *hashBuilder) ftype(structName, s string, expr ast.Expr, directives map[
 		return "uint64(" + s + ".Uint8())", 3
 	case "AnvilType", "SandstoneType", "PrismarineType", "StoneBricksType", "NetherBricksType", "FroglightType",
 		"WallConnectionType", "BlackstoneType", "DeepslateType", "TallGrassType", "CopperType", "OxidationType",
-		"SeaGrassType", "MushroomBlockKind", "ColoredTorchColour":
+		"SeaGrassType", "MushroomBlockKind", "ColoredTorchColour", "TorchColour":
 		return "uint64(" + s + ".Uint8())", 2
 	case "ShulkerBoxType":
 		return "uint64(" + s + ".Uint8())", 5

server/block/colored_torch_compat.go

@@ -0,0 +1,33 @@
+package block
+
+import "github.com/df-mc/dragonfly/server/world"
+
+// ColoredTorch is an alias for ColouredTorch.
+type ColoredTorch = ColouredTorch
+
+// ColoredTorchColour is an alias for TorchColour.
+type ColoredTorchColour = TorchColour
+
+// BlueTorch returns the blue torch colour.
+func BlueTorch() ColoredTorchColour {
+	return TorchColourBlue()
+}
+
+// GreenTorch returns the green torch colour.
+func GreenTorch() ColoredTorchColour {
+	return TorchColourGreen()
+}
+
+// PurpleTorch returns the purple torch colour.
+func PurpleTorch() ColoredTorchColour {
+	return TorchColourPurple()
+}
+
+// RedTorch returns the red torch colour.
+func RedTorch() ColoredTorchColour {
+	return TorchColourRed()
+}
+
+func allColoredTorches() []world.Block {
+	return allColouredTorches()
+}

server/block/coloured_torch.go

@@ -0,0 +1,102 @@
+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/go-gl/mathgl/mgl64"
+)
+
+// ColouredTorch is a non-solid block that emits light.
+type ColouredTorch struct {
+	transparent
+	empty
+
+	// Facing is the direction from the torch to the block it is attached to.
+	Facing cube.Face
+	// Colour is the colour of the torch.
+	Colour TorchColour
+}
+
+// BreakInfo ...
+func (t ColouredTorch) BreakInfo() BreakInfo {
+	return newBreakInfo(0, alwaysHarvestable, nothingEffective, oneOf(t))
+}
+
+// LightEmissionLevel ...
+func (ColouredTorch) LightEmissionLevel() uint8 {
+	return 14
+}
+
+// UseOnBlock ...
+func (t ColouredTorch) UseOnBlock(pos cube.Pos, face cube.Face, _ mgl64.Vec3, tx *world.Tx, user item.User, ctx *item.UseContext) bool {
+	pos, face, used := firstReplaceable(tx, pos, face, t)
+	if !used {
+		return false
+	}
+	if face == cube.FaceDown {
+		return false
+	}
+	if !tx.Block(pos.Side(face.Opposite())).Model().FaceSolid(pos.Side(face.Opposite()), face, tx) {
+		found := false
+		for _, i := range []cube.Face{cube.FaceSouth, cube.FaceWest, cube.FaceNorth, cube.FaceEast, cube.FaceDown} {
+			if tx.Block(pos.Side(i)).Model().FaceSolid(pos.Side(i), i.Opposite(), tx) {
+				found = true
+				face = i.Opposite()
+				break
+			}
+		}
+		if !found {
+			return false
+		}
+	}
+	t.Facing = face.Opposite()
+
+	place(tx, pos, t, user, ctx)
+	return placed(ctx)
+}
+
+// NeighbourUpdateTick ...
+func (t ColouredTorch) NeighbourUpdateTick(pos, _ cube.Pos, tx *world.Tx) {
+	if !tx.Block(pos.Side(t.Facing)).Model().FaceSolid(pos.Side(t.Facing), t.Facing.Opposite(), tx) {
+		breakBlock(t, pos, tx)
+	}
+}
+
+// HasLiquidDrops ...
+func (ColouredTorch) HasLiquidDrops() bool {
+	return true
+}
+
+// EncodeItem ...
+func (t ColouredTorch) EncodeItem() (name string, meta int16) {
+	return "minecraft:colored_torch_" + t.Colour.String(), 0
+}
+
+// EncodeBlock ...
+func (t ColouredTorch) EncodeBlock() (name string, properties map[string]any) {
+	var face string
+	if t.Facing == cube.FaceDown {
+		face = "top"
+	} else if t.Facing == unknownFace {
+		face = "unknown"
+	} else {
+		face = t.Facing.String()
+	}
+
+	return "minecraft:colored_torch_" + t.Colour.String(), map[string]any{"torch_facing_direction": face}
+}
+
+// allColouredTorches returns all possible coloured torch states.
+func allColouredTorches() (torch []world.Block) {
+	for _, face := range cube.Faces() {
+		if face == cube.FaceUp {
+			face = unknownFace
+		}
+
+		for _, colour := range TorchColours() {
+			torch = append(torch, ColouredTorch{Facing: face, Colour: colour})
+		}
+	}
+	return
+}

server/block/hash.go

@@ -204,144 +204,6 @@ func (t UnderwaterTorch) EncodeBlock() (name string, properties map[string]any)
 	return "minecraft:underwater_torch", map[string]any{"torch_facing_direction": face}
 }
 
-// ColoredTorchColour is the colour of a colored torch.
-type ColoredTorchColour struct {
-	colour
-}
-
-type colour uint8
-
-// BlueTorch returns the blue torch colour.
-func BlueTorch() ColoredTorchColour {
-	return ColoredTorchColour{0}
-}
-
-// GreenTorch returns the green torch colour.
-func GreenTorch() ColoredTorchColour {
-	return ColoredTorchColour{1}
-}
-
-// PurpleTorch returns the purple torch colour.
-func PurpleTorch() ColoredTorchColour {
-	return ColoredTorchColour{2}
-}
-
-// RedTorch returns the red torch colour.
-func RedTorch() ColoredTorchColour {
-	return ColoredTorchColour{3}
-}
-
-// Uint8 returns the torch colour as a uint8.
-func (c colour) Uint8() uint8 {
-	return uint8(c)
-}
-
-// String returns the torch colour as a string.
-func (c colour) String() string {
-	switch c {
-	case 0:
-		return "blue"
-	case 1:
-		return "green"
-	case 2:
-		return "purple"
-	case 3:
-		return "red"
-	}
-	panic("unknown torch colour")
-}
-
-// ColoredTorch is a decorative torch with a colored flame.
-type ColoredTorch struct {
-	transparent
-	empty
-
-	Colour ColoredTorchColour
-	Facing cube.Face
-}
-
-// BreakInfo ...
-func (t ColoredTorch) BreakInfo() BreakInfo {
-	return newBreakInfo(0, alwaysHarvestable, nothingEffective, oneOf(t))
-}
-
-// LightEmissionLevel ...
-func (ColoredTorch) LightEmissionLevel() uint8 {
-	return 14
-}
-
-// UseOnBlock ...
-func (t ColoredTorch) UseOnBlock(pos cube.Pos, face cube.Face, _ mgl64.Vec3, tx *world.Tx, user item.User, ctx *item.UseContext) bool {
-	pos, face, used := firstReplaceable(tx, pos, face, t)
-	if !used {
-		return false
-	}
-	if face == cube.FaceDown {
-		return false
-	}
-	if !tx.Block(pos.Side(face.Opposite())).Model().FaceSolid(pos.Side(face.Opposite()), face, tx) {
-		found := false
-		for _, i := range []cube.Face{cube.FaceSouth, cube.FaceWest, cube.FaceNorth, cube.FaceEast, cube.FaceDown} {
-			if tx.Block(pos.Side(i)).Model().FaceSolid(pos.Side(i), i.Opposite(), tx) {
-				found = true
-				face = i.Opposite()
-				break
-			}
-		}
-		if !found {
-			return false
-		}
-	}
-	t.Facing = face.Opposite()
-
-	place(tx, pos, t, user, ctx)
-	return placed(ctx)
-}
-
-// NeighbourUpdateTick ...
-func (t ColoredTorch) NeighbourUpdateTick(pos, _ cube.Pos, tx *world.Tx) {
-	if !tx.Block(pos.Side(t.Facing)).Model().FaceSolid(pos.Side(t.Facing), t.Facing.Opposite(), tx) {
-		breakBlock(t, pos, tx)
-	}
-}
-
-// HasLiquidDrops ...
-func (ColoredTorch) HasLiquidDrops() bool {
-	return true
-}
-
-// EncodeItem ...
-func (t ColoredTorch) EncodeItem() (name string, meta int16) {
-	return "minecraft:colored_torch_" + t.Colour.String(), 0
-}
-
-// EncodeBlock ...
-func (t ColoredTorch) EncodeBlock() (name string, properties map[string]any) {
-	var face string
-	if t.Facing == cube.FaceDown {
-		face = "top"
-	} else if t.Facing == unknownFace {
-		face = "unknown"
-	} else {
-		face = t.Facing.String()
-	}
-	return "minecraft:colored_torch_" + t.Colour.String(), map[string]any{"torch_facing_direction": face}
-}
-
-// allColoredTorches returns all colored torch states.
-func allColoredTorches() (b []world.Block) {
-	colours := []ColoredTorchColour{BlueTorch(), GreenTorch(), PurpleTorch(), RedTorch()}
-	for _, colour := range colours {
-		for _, face := range cube.Faces() {
-			if face == cube.FaceUp {
-				face = unknownFace
-			}
-			b = append(b, ColoredTorch{Colour: colour, Facing: face})
-		}
-	}
-	return
-}
-
 // FireflyBush is a decorative plant.
 type FireflyBush struct {
 	transparent

server/block/plants_misc.go

@@ -0,0 +1,68 @@
+package block
+
+// TorchColour is the colour of a coloured torch.
+type TorchColour struct {
+	colouredTorch
+}
+
+type colouredTorch uint8
+
+// TorchColourPurple returns the purple torch colour.
+func TorchColourPurple() TorchColour {
+	return TorchColour{0}
+}
+
+// TorchColourBlue returns the blue torch colour.
+func TorchColourBlue() TorchColour {
+	return TorchColour{1}
+}
+
+// TorchColourGreen returns the green torch colour.
+func TorchColourGreen() TorchColour {
+	return TorchColour{2}
+}
+
+// TorchColourRed returns the red torch colour.
+func TorchColourRed() TorchColour {
+	return TorchColour{3}
+}
+
+// Name returns the human-readable name of the torch colour.
+func (c colouredTorch) Name() string {
+	switch c {
+	case 0:
+		return "Purple Torch"
+	case 1:
+		return "Blue Torch"
+	case 2:
+		return "Green Torch"
+	case 3:
+		return "Red Torch"
+	}
+	panic("unknown torch colour")
+}
+
+// String returns the torch colour as a string.
+func (c colouredTorch) String() string {
+	switch c {
+	case 0:
+		return "purple"
+	case 1:
+		return "blue"
+	case 2:
+		return "green"
+	case 3:
+		return "red"
+	}
+	panic("unknown torch colour")
+}
+
+// Uint8 returns the torch colour as a uint8.
+func (c colouredTorch) Uint8() uint8 {
+	return uint8(c)
+}
+
+// TorchColours returns all possible torch colours.
+func TorchColours() []TorchColour {
+	return []TorchColour{TorchColourPurple(), TorchColourBlue(), TorchColourGreen(), TorchColourRed()}
+}