Skip to content

Commit 4f2d8cf

Browse files
didntpotdidntpot
authored
dragonfly: Updated for 1.21.111 (#1123)
1 parent 93c8481 commit 4f2d8cf

17 files changed

+31
-75
lines changed

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ require (
88
github.com/brentp/intintmap v0.0.0-20190211203843-30dc0ade9af9
99
github.com/cespare/xxhash/v2 v2.3.0
1010
github.com/df-mc/goleveldb v1.1.9
11-
github.com/df-mc/worldupgrader v1.0.19
11+
github.com/df-mc/worldupgrader v1.0.20
1212
github.com/go-gl/mathgl v1.2.0
1313
github.com/google/uuid v1.6.0
1414
github.com/pelletier/go-toml v1.9.5
15-
github.com/sandertv/gophertunnel v1.49.0
15+
github.com/sandertv/gophertunnel v1.50.0
1616
github.com/segmentio/fasthash v1.0.3
1717
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
1818
golang.org/x/mod v0.22.0
@@ -21,10 +21,10 @@ require (
2121
)
2222

2323
require (
24+
github.com/df-mc/jsonc v1.0.5 // indirect
2425
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
2526
github.com/golang/snappy v0.0.4 // indirect
2627
github.com/klauspost/compress v1.17.11 // indirect
27-
github.com/muhammadmuzzammil1998/jsonc v1.0.0 // indirect
2828
github.com/sandertv/go-raknet v1.14.3-0.20250305181847-6af3e95113d6 // indirect
2929
golang.org/x/net v0.35.0 // indirect
3030
golang.org/x/oauth2 v0.25.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
66
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
77
github.com/df-mc/goleveldb v1.1.9 h1:ihdosZyy5jkQKrxucTQmN90jq/2lUwQnJZjIYIC/9YU=
88
github.com/df-mc/goleveldb v1.1.9/go.mod h1:+NHCup03Sci5q84APIA21z3iPZCuk6m6ABtg4nANCSk=
9-
github.com/df-mc/worldupgrader v1.0.19 h1:BnwRe/lVv9IhwRWZK5olvTYNTKWh7rhFdqNPDMnoKFM=
10-
github.com/df-mc/worldupgrader v1.0.19/go.mod h1:tsSOLTRm9mpG7VHvYpAjjZrkRHWmSbKZAm9bOLNnlDk=
9+
github.com/df-mc/jsonc v1.0.5 h1:O7oh07kbS5AYY+l2Fji6l4h0iHcdjKbxCtK5VlZlLMU=
10+
github.com/df-mc/jsonc v1.0.5/go.mod h1:+Q++JuCE9IKiP8v7sWImdf/RjQX0nfXyfX6PdfTTmc4=
11+
github.com/df-mc/worldupgrader v1.0.20 h1:wfJyG3bFeaM/HXy7TCiO4HKVw3Mf3N4gPFmgxMHsKnc=
12+
github.com/df-mc/worldupgrader v1.0.20/go.mod h1:tsSOLTRm9mpG7VHvYpAjjZrkRHWmSbKZAm9bOLNnlDk=
1113
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
1214
github.com/go-gl/mathgl v1.2.0 h1:v2eOj/y1B2afDxF6URV1qCYmo1KW08lAMtTbOn3KXCY=
1315
github.com/go-gl/mathgl v1.2.0/go.mod h1:pf9+b5J3LFP7iZ4XXaVzZrCle0Q/vNpB/vDe5+3ulRE=
@@ -26,8 +28,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
2628
github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
2729
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
2830
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
29-
github.com/muhammadmuzzammil1998/jsonc v1.0.0 h1:8o5gBQn4ZA3NBA9DlTujCj2a4w0tqWrPVjDwhzkgTIs=
30-
github.com/muhammadmuzzammil1998/jsonc v1.0.0/go.mod h1:saF2fIVw4banK0H4+/EuqfFLpRnoy5S+ECwTOCcRcSU=
3131
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
3232
github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
3333
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -39,8 +39,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
3939
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4040
github.com/sandertv/go-raknet v1.14.3-0.20250305181847-6af3e95113d6 h1:ZfK7NCzIDE+dzp5x6NIO4JDLsjsOxi762CNR1Obds2Q=
4141
github.com/sandertv/go-raknet v1.14.3-0.20250305181847-6af3e95113d6/go.mod h1:/yysjwfCXm2+2OY8mBazLzcxJ3irnylKCyG3FLgUPVU=
42-
github.com/sandertv/gophertunnel v1.49.0 h1:9FIl4GGYMrFTmBPgkOTUskGWRQHIg4NMpY8JdM6SrCg=
43-
github.com/sandertv/gophertunnel v1.49.0/go.mod h1:lmRarAmn25V/+QeiUbUDXeA26bEaNlX1wGEM/rj39ew=
42+
github.com/sandertv/gophertunnel v1.50.0 h1:uoXQBWOD823T8snohPjIkFo+pcYrlIalEmcY2S1FUPM=
43+
github.com/sandertv/gophertunnel v1.50.0/go.mod h1:WjTvUo02TmvPULY1y5oxxAhZIeH8ew31/LUkSUD6ABw=
4444
github.com/segmentio/fasthash v1.0.3 h1:EI9+KE1EwvMLBWwjpRDc+fEM+prwxDYbslddQGtrmhM=
4545
github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY=
4646
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=

‎server/block/hash.go‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

server/block/chain.go renamed to server/block/iron_chain.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/go-gl/mathgl/mgl64"
99
)
1010

11-
// Chain is a metallic decoration block.
12-
type Chain struct {
11+
// IronChain is a metallic decoration block.
12+
type IronChain struct {
1313
transparent
1414
sourceWaterDisplacer
1515

@@ -18,12 +18,12 @@ type Chain struct {
1818
}
1919

2020
// SideClosed ...
21-
func (Chain) SideClosed(cube.Pos, cube.Pos, *world.Tx) bool {
21+
func (IronChain) SideClosed(cube.Pos, cube.Pos, *world.Tx) bool {
2222
return false
2323
}
2424

2525
// UseOnBlock ...
26-
func (c Chain) UseOnBlock(pos cube.Pos, face cube.Face, _ mgl64.Vec3, tx *world.Tx, user item.User, ctx *item.UseContext) (used bool) {
26+
func (c IronChain) UseOnBlock(pos cube.Pos, face cube.Face, _ mgl64.Vec3, tx *world.Tx, user item.User, ctx *item.UseContext) (used bool) {
2727
pos, face, used = firstReplaceable(tx, pos, face, c)
2828
if !used {
2929
return
@@ -35,29 +35,29 @@ func (c Chain) UseOnBlock(pos cube.Pos, face cube.Face, _ mgl64.Vec3, tx *world.
3535
}
3636

3737
// BreakInfo ...
38-
func (c Chain) BreakInfo() BreakInfo {
38+
func (c IronChain) BreakInfo() BreakInfo {
3939
return newBreakInfo(5, pickaxeHarvestable, pickaxeEffective, oneOf(c)).withBlastResistance(30)
4040
}
4141

4242
// EncodeItem ...
43-
func (Chain) EncodeItem() (name string, meta int16) {
44-
return "minecraft:chain", 0
43+
func (IronChain) EncodeItem() (name string, meta int16) {
44+
return "minecraft:iron_chain", 0
4545
}
4646

4747
// EncodeBlock ...
48-
func (c Chain) EncodeBlock() (string, map[string]any) {
49-
return "minecraft:chain", map[string]any{"pillar_axis": c.Axis.String()}
48+
func (c IronChain) EncodeBlock() (string, map[string]any) {
49+
return "minecraft:iron_chain", map[string]any{"pillar_axis": c.Axis.String()}
5050
}
5151

5252
// Model ...
53-
func (c Chain) Model() world.BlockModel {
53+
func (c IronChain) Model() world.BlockModel {
5454
return model.Chain{Axis: c.Axis}
5555
}
5656

57-
// allChains ...
58-
func allChains() (chains []world.Block) {
57+
// allIronChains ...
58+
func allIronChains() (chains []world.Block) {
5959
for _, axis := range cube.Axes() {
60-
chains = append(chains, Chain{Axis: axis})
60+
chains = append(chains, IronChain{Axis: axis})
6161
}
6262
return
6363
}

‎server/block/lantern.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func (l Lantern) Model() world.BlockModel {
2828
func (l Lantern) NeighbourUpdateTick(pos, _ cube.Pos, tx *world.Tx) {
2929
if l.Hanging {
3030
up := pos.Side(cube.FaceUp)
31-
if _, ok := tx.Block(up).(Chain); !ok && !tx.Block(up).Model().FaceSolid(up, cube.FaceDown, tx) {
31+
if _, ok := tx.Block(up).(IronChain); !ok && !tx.Block(up).Model().FaceSolid(up, cube.FaceDown, tx) {
3232
breakBlock(l, pos, tx)
3333
}
3434
} else {
@@ -52,7 +52,7 @@ func (l Lantern) UseOnBlock(pos cube.Pos, face cube.Face, _ mgl64.Vec3, tx *worl
5252
}
5353
if face == cube.FaceDown {
5454
upPos := pos.Side(cube.FaceUp)
55-
if _, ok := tx.Block(upPos).(Chain); !ok && !tx.Block(upPos).Model().FaceSolid(upPos, cube.FaceDown, tx) {
55+
if _, ok := tx.Block(upPos).(IronChain); !ok && !tx.Block(upPos).Model().FaceSolid(upPos, cube.FaceDown, tx) {
5656
face = cube.FaceUp
5757
}
5858
}

‎server/block/register.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func init() {
136136
registerAll(allCampfires())
137137
registerAll(allCarpet())
138138
registerAll(allCarrots())
139-
registerAll(allChains())
139+
registerAll(allIronChains())
140140
registerAll(allChests())
141141
registerAll(allCocoaBeans())
142142
registerAll(allComposters())
@@ -235,7 +235,7 @@ func init() {
235235
world.RegisterItem(Cake{})
236236
world.RegisterItem(Calcite{})
237237
world.RegisterItem(Carrot{})
238-
world.RegisterItem(Chain{})
238+
world.RegisterItem(IronChain{})
239239
world.RegisterItem(Chest{})
240240
world.RegisterItem(ChiseledQuartz{})
241241
world.RegisterItem(Clay{})

‎server/item/creative/creative_items.nbt‎

7.94 KB
Binary file not shown.

‎server/item/recipe/crafting_data.nbt‎

20.8 KB
Binary file not shown.

‎server/item/recipe/furnace_data.nbt‎

-3.89 KB
Binary file not shown.

‎server/item/recipe/potion_data.nbt‎

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)