anygatecloud/strom
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix moving pains

Browse Source
This commit is contained in:
adman
2026-06-27 14:10:31 +02:00
parent 666f250b3e
commit 201e0dfa44
10 changed files with 84 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/strom/api/main.go
+6 -6
View File
@@ -6,7 +6,7 @@ import (
"flag"
"os"
api2 "github.com/admin-else/strom/mc/api"
"github.com/admin-else/strom/mc/api"
)
var cmd = flag.NewFlagSet("api", flag.ContinueOnError)
@@ -25,9 +25,9 @@ func Run(args []string) (err error) {
if err != nil {
return
}
a := &api2.Account{}
a := &api.Account{}
if *tokenFlag != "" {
a, err = api2.NewAccountFromYGG(*tokenFlag)
a, err = api.NewAccountFromYGG(*tokenFlag)
if err != nil {
return
}
@@ -40,14 +40,14 @@ func Run(args []string) (err error) {
}
} else if *uuidFlag != "" || *nameFlag != "" {
if *nameFlag != "" {
var idName api2.IdName
idName, err = api2.NameToId(*nameFlag)
var idName api.IdName
idName, err = api.NameToId(*nameFlag)
if err != nil {
return
}
*uuidFlag = idName.Id
}
data, err = api2.Profile(*uuidFlag, *unsignedFlag)
data, err = api.Profile(*uuidFlag, *unsignedFlag)
if err != nil {
return
}
cmd/strom/data/main.go
+5 -5
View File
@@ -7,7 +7,7 @@ import (
"os"
"slices"
data2 "github.com/admin-else/strom/mc/data"
mcdata "github.com/admin-else/strom/mc/data"
"github.com/admin-else/strom/mc/proto_generated"
"github.com/admin-else/strom/mc/util"
)
@@ -39,11 +39,11 @@ func Run(args []string) (err error) {
case 0: // print available versions
dataValues = proto_generated.SupportedVersions
case 1: // print available data for version
dataValues = slices.Collect(maps.Keys(data2.Paths.Data[args[0]]))
dataValues = slices.Collect(maps.Keys(mcdata.Paths.Data[args[0]]))
case 2:
err = data2.LoadVersionedJson(args[0], args[1], &dataValues)
err = mcdata.LoadVersionedJson(args[0], args[1], &dataValues)
case 3:
err = data2.LoadVersionedJson(args[0], args[1], &dataValues)
err = mcdata.LoadVersionedJson(args[0], args[1], &dataValues)
if err != nil {
return
}
@@ -68,7 +68,7 @@ func Run(args []string) (err error) {
}
dataValues = result
case 4, 5:
err = data2.LoadVersionedJson(args[0], args[1], &dataValues)
err = mcdata.LoadVersionedJson(args[0], args[1], &dataValues)
if err != nil {
return
}
cmd/strom/mca_to_tmcpr/main.go
+12 -12
View File
@@ -8,8 +8,8 @@ import (
"os"
"github.com/admin-else/strom/mc/level"
anvil2 "github.com/admin-else/strom/mc/level/anvil"
nbt2 "github.com/admin-else/strom/mc/nbt"
"github.com/admin-else/strom/mc/level/anvil"
"github.com/admin-else/strom/mc/nbt"
"github.com/admin-else/strom/mc/proto/replay"
"github.com/admin-else/strom/mc/proto_generated/v1_21_11"
"github.com/admin-else/strom/mc/util"
@@ -40,15 +40,15 @@ func init() {
}
func GetChunkFromMca(x, z int32, version string) (b []byte, err error) {
xmca := util.FloorDiv(x, anvil2.ChunksWidthRegionFile)
zmca := util.FloorDiv(z, anvil2.ChunksWidthRegionFile)
x = x % anvil2.ChunksWidthRegionFile
xmca := util.FloorDiv(x, anvil.ChunksWidthRegionFile)
zmca := util.FloorDiv(z, anvil.ChunksWidthRegionFile)
x = x % anvil.ChunksWidthRegionFile
if x < 0 {
x += anvil2.ChunksWidthRegionFile
x += anvil.ChunksWidthRegionFile
}
z = z % anvil2.ChunksWidthRegionFile
z = z % anvil.ChunksWidthRegionFile
if z < 0 {
z += anvil2.ChunksWidthRegionFile
z += anvil.ChunksWidthRegionFile
}
f, err := os.Open(fmt.Sprintf("./level/anvil/testdata/securechattestworld/region/r.%v.%v.mca", xmca, zmca))
@@ -56,12 +56,12 @@ func GetChunkFromMca(x, z int32, version string) (b []byte, err error) {
return
}
defer f.Close()
mca, err := anvil2.ReadChunkHeader(f)
mca, err := anvil.ReadChunkHeader(f)
if err != nil {
return
}
var n *nbt2.Tag
var n *nbt.Tag
n, err = mca.ChunkAt(f, x, z)
if err != nil {
return
@@ -70,8 +70,8 @@ func GetChunkFromMca(x, z int32, version string) (b []byte, err error) {
return
}
var chunk anvil2.Chunk
err = nbt2.Format.Decode(n.Value, &chunk)
var chunk anvil.Chunk
err = nbt.Format.Decode(n.Value, &chunk)
if err != nil {
return
}
cmd/strom/packet_inspector/main.go
+16 -16
View File
@@ -7,14 +7,14 @@ import (
"os"
"time"
api2 "github.com/admin-else/strom/mc/api"
client2 "github.com/admin-else/strom/mc/client"
"github.com/admin-else/strom/mc/api"
"github.com/admin-else/strom/mc/client"
"github.com/admin-else/strom/mc/event"
"github.com/admin-else/strom/mc/nbt"
proto2 "github.com/admin-else/strom/mc/proto"
"github.com/admin-else/strom/mc/proto"
"github.com/admin-else/strom/mc/proto_base"
"github.com/admin-else/strom/mc/proto_generated/v1_21_11"
server2 "github.com/admin-else/strom/mc/server"
"github.com/admin-else/strom/mc/server"
"github.com/admin-else/strom/mc/text"
)
@@ -28,7 +28,7 @@ var ListenAddr = Cmd.String("listen", "127.0.0.1:25566", "address to listen on")
var TrueForward = Cmd.Bool("true-forward", false, "forward packets without modification -name and custom server status wont work")
type Proxy struct {
Client, Servee *proto2.Conn
Client, Servee *proto.Conn
Data nbt.Tag
}
@@ -74,7 +74,7 @@ func (p *Proxy) OnAnything(e event.Anything) (err error) {
if !ok {
return
}
packetInfo, ok := proto2.LookupPacketInfoByType(packet)
packetInfo, ok := proto.LookupPacketInfoByType(packet)
if !ok {
return
}
@@ -145,12 +145,12 @@ func (p *Proxy) OnCompress(packet *v1_21_11.LoginToClientPacketCompress) (err er
return
}
var StatusResponse = server2.StatusResponse{
Version: server2.StatusResponseVersion{
var StatusResponse = server.StatusResponse{
Version: server.StatusResponseVersion{
Name: text.Pretty("STROM"),
Protocol: 772,
},
Players: server2.StatusResponsePlayers{},
Players: server.StatusResponsePlayers{},
Description: text.Pretty("Packet spy forwards to " + *TargetAddr),
Favicon: "",
EnforcesSecureChat: false,
@@ -162,33 +162,33 @@ func Run(args []string) (err error) {
return
}
slog.Info("Starting packet inspector", "listen", *ListenAddr)
err = server2.StartServerWithOnConn(*ListenAddr, func(serveeConn *proto2.Conn) (err error) {
err = server.StartServerWithOnConn(*ListenAddr, func(serveeConn *proto.Conn) (err error) {
p := &Proxy{Servee: serveeConn, Client: nil}
var acc = api2.NewOfflineAccount(*OfflineNameFlag)
var acc = api.NewOfflineAccount(*OfflineNameFlag)
if !*TrueForward {
if *Token != "" {
acc, err = api2.NewAccountFromYGG(*Token)
acc, err = api.NewAccountFromYGG(*Token)
if err != nil {
return
}
}
_, err = server2.ServeLogin(serveeConn, server2.WithOtherAccount(acc), server2.WithStatus(StatusResponse), server2.WithoutOnlineMode(), server2.WithoutEncryption())
_, err = server.ServeLogin(serveeConn, server.WithOtherAccount(acc), server.WithStatus(StatusResponse), server.WithoutOnlineMode(), server.WithoutEncryption())
if err != nil {
return
}
}
*TargetAddr, err = client2.DoDnsSimple(*TargetAddr)
*TargetAddr, err = client.DoDnsSimple(*TargetAddr)
if err != nil {
return
}
c, err := client2.Connect(*TargetAddr)
c, err := client.Connect(*TargetAddr)
if err != nil {
return
}
defer c.Close()
if !*TrueForward {
err = client2.LoginRaw(c, acc)
err = client.LoginRaw(c, acc)
if err != nil {
return
}
cmd/strom/print_nbt/main.go
+3 -3
View File
@@ -7,7 +7,7 @@ import (
"fmt"
"os"
nbt2 "github.com/admin-else/strom/mc/nbt"
"github.com/admin-else/strom/mc/nbt"
)
var (
@@ -29,14 +29,14 @@ func Run(args []string) (err error) {
return
}
defer f.Close()
n, err := nbt2.ReadUnstructuredFile(f)
n, err := nbt.ReadUnstructuredFile(f)
if err != nil {
return
}
var b []byte
if *HashFormatFlag {
bb := bytes.NewBuffer(nil)
err = nbt2.PrintSNBTAny(n.Value, bb)
err = nbt.PrintSNBTAny(n.Value, bb)
if err != nil {
return
}
cmd/strom/print_replay/main.go
+6 -6
View File
@@ -15,7 +15,7 @@ import (
"strings"
"github.com/admin-else/strom/mc/data"
proto2 "github.com/admin-else/strom/mc/proto"
"github.com/admin-else/strom/mc/proto"
"github.com/admin-else/strom/mc/proto_base"
)
@@ -32,7 +32,7 @@ var (
//go:embed failed_packet.go.tmpl
var TestSrcF string
func SaveUnCodeAbleAsTest(packet *proto2.UnCodablePacket) {
func SaveUnCodeAbleAsTest(packet *proto.UnCodablePacket) {
hUntrimmed := sha256.Sum256(packet.Data)
h := hUntrimmed[:8]
f, err := os.Create(fmt.Sprintf(*CreateTestsPath+"/%v_%10x_test.go", len(packet.Data), h))
@@ -87,15 +87,15 @@ func UnpackPacket(r io.Reader) (packet proto_base.EncodeDecodeAble, err error) {
// indexafterid represents how many bytes we've read so far
indexafterid := int(b.Size()) - b.Len()
i, ok := proto2.LookUpTypeByPacketInfo(proto_base.ToClient, state, packetId, int32(*ProtocolVersion))
i, ok := proto.LookUpTypeByPacketInfo(proto_base.ToClient, state, packetId, int32(*ProtocolVersion))
if !ok {
packet = &proto2.UnCodablePacket{Err: proto2.BadPacketIdErr, Data: packetData, Info: i}
packet = &proto.UnCodablePacket{Err: proto.BadPacketIdErr, Data: packetData, Info: i}
return
}
packet = reflect.New(reflect.TypeOf(i.Type).Elem()).Interface().(proto_base.EncodeDecodeAble)
err = packet.Decode(b)
if err != nil {
packet = &proto2.UnCodablePacket{Err: err, Data: packetData[indexafterid:], Info: i}
packet = &proto.UnCodablePacket{Err: err, Data: packetData[indexafterid:], Info: i}
return
}
switch i.Name {
@@ -138,7 +138,7 @@ func Run(args []string) (err error) {
for {
var packet proto_base.EncodeDecodeAble
packet, err = UnpackPacket(f)
unCodablePacket, ok := packet.(*proto2.UnCodablePacket)
unCodablePacket, ok := packet.(*proto.UnCodablePacket)
if ok {
if *CreateTestsPath != "" {
SaveUnCodeAbleAsTest(unCodablePacket)
cmd/strom/registry_data_hunter/main.go
+12 -12
View File
@@ -10,11 +10,11 @@ import (
"github.com/admin-else/strom/mc/client"
"github.com/admin-else/strom/mc/data"
"github.com/admin-else/strom/mc/event"
nbt2 "github.com/admin-else/strom/mc/nbt"
proto2 "github.com/admin-else/strom/mc/proto"
"github.com/admin-else/strom/mc/nbt"
"github.com/admin-else/strom/mc/proto"
"github.com/admin-else/strom/mc/proto_base"
"github.com/admin-else/strom/mc/proto_generated/v1_21_8"
server2 "github.com/admin-else/strom/mc/server"
"github.com/admin-else/strom/mc/server"
"github.com/admin-else/strom/mc/text"
)
@@ -33,8 +33,8 @@ var (
FinishedConfigErr = errors.New("finished configuration")
)
var Status = wontFail(json.Marshal(server2.StatusResponse{
Version: server2.StatusResponseVersion{
var Status = wontFail(json.Marshal(server.StatusResponse{
Version: server.StatusResponseVersion{
Name: nil,
Protocol: CompatibleProtocolVersion,
},
@@ -42,8 +42,8 @@ var Status = wontFail(json.Marshal(server2.StatusResponse{
}))
type Proxy struct {
Client, Servee *proto2.Conn
Data *nbt2.Tag
Client, Servee *proto.Conn
Data *nbt.Tag
}
func (p *Proxy) OnAnything(e event.Anything) (err error) {
@@ -51,7 +51,7 @@ func (p *Proxy) OnAnything(e event.Anything) (err error) {
if !ok {
return
}
packetInfo, ok := proto2.LookupPacketInfoByType(packet)
packetInfo, ok := proto.LookupPacketInfoByType(packet)
if !ok {
return
}
@@ -107,10 +107,10 @@ func (p *Proxy) OnTags(data *v1_21_8.ConfigurationToClientPacketTags) (err error
return
}
func handleClient(c *proto2.Conn) (err error) {
func handleClient(c *proto.Conn) (err error) {
acc := api.NewOfflineAccount("RegistryHunter")
_, err = server2.ServeLogin(c, server2.WithOtherAccount(acc), server2.WithCompatibleVersions(CompatibleProtocolVersion), server2.WithRawStatus(Status))
_, err = server.ServeLogin(c, server.WithOtherAccount(acc), server.WithCompatibleVersions(CompatibleProtocolVersion), server.WithRawStatus(Status))
if err != nil {
return
}
@@ -141,12 +141,12 @@ func handleClient(c *proto2.Conn) (err error) {
return
}
defer f.Close()
err = nbt2.WriteUnstructuredFile(f, p.Data)
err = nbt.WriteUnstructuredFile(f, p.Data)
slog.Info("saved", "file", SaveAs)
return
}
func Run(args []string) error {
slog.SetLogLoggerLevel(slog.LevelDebug)
return server2.StartServerWithOnConn(":25566", handleClient)
return server.StartServerWithOnConn(":25566", handleClient)
}
cmd/strom/serve_tmcpr/main.go
+4 -4
View File
@@ -13,7 +13,7 @@ import (
"github.com/admin-else/strom/mc/proto"
"github.com/admin-else/strom/mc/proto/replay"
"github.com/admin-else/strom/mc/proto_generated/v1_21_8"
server2 "github.com/admin-else/strom/mc/server"
"github.com/admin-else/strom/mc/server"
)
type Server struct {
@@ -30,12 +30,12 @@ var (
func Limbo(c *proto.Conn, tmcprPath string) (err error) {
s := &Server{Conn: c}
_, err = server2.ServeLogin(s.Conn, server2.WithoutOnlineMode())
_, err = server.ServeLogin(s.Conn, server.WithoutOnlineMode())
if err != nil {
return
}
err = server2.ServeConfig(s.Conn)
err = server.ServeConfig(s.Conn)
if err != nil {
return
}
@@ -91,7 +91,7 @@ func Run(args []string) error {
return nil
}
return server2.StartServerWithOnConn(*bindAddr, func(c *proto.Conn) error {
return server.StartServerWithOnConn(*bindAddr, func(c *proto.Conn) error {
return Limbo(c, *tmcprFile)
})
}
cmd/strom/serve_world/main.go
+16 -16
View File
@@ -10,11 +10,11 @@ import (
"github.com/admin-else/strom/mc/event"
"github.com/admin-else/strom/mc/level"
anvil2 "github.com/admin-else/strom/mc/level/anvil"
nbt2 "github.com/admin-else/strom/mc/nbt"
"github.com/admin-else/strom/mc/level/anvil"
"github.com/admin-else/strom/mc/nbt"
"github.com/admin-else/strom/mc/proto"
"github.com/admin-else/strom/mc/proto_generated/v1_21_8"
server2 "github.com/admin-else/strom/mc/server"
"github.com/admin-else/strom/mc/server"
"github.com/admin-else/strom/mc/util"
)
@@ -41,15 +41,15 @@ func init() {
}
func GetChunkFromMca(x, z int32, version string) (b []byte, err error) {
xmca := util.FloorDiv(x, anvil2.ChunksWidthRegionFile)
zmca := util.FloorDiv(z, anvil2.ChunksWidthRegionFile)
x = x % anvil2.ChunksWidthRegionFile
xmca := util.FloorDiv(x, anvil.ChunksWidthRegionFile)
zmca := util.FloorDiv(z, anvil.ChunksWidthRegionFile)
x = x % anvil.ChunksWidthRegionFile
if x < 0 {
x += anvil2.ChunksWidthRegionFile
x += anvil.ChunksWidthRegionFile
}
z = z % anvil2.ChunksWidthRegionFile
z = z % anvil.ChunksWidthRegionFile
if z < 0 {
z += anvil2.ChunksWidthRegionFile
z += anvil.ChunksWidthRegionFile
}
f, err := os.Open(fmt.Sprintf("./level/anvil/testdata/securechattestworld/region/r.%v.%v.mca", xmca, zmca))
@@ -57,12 +57,12 @@ func GetChunkFromMca(x, z int32, version string) (b []byte, err error) {
return
}
defer f.Close()
mca, err := anvil2.ReadChunkHeader(f)
mca, err := anvil.ReadChunkHeader(f)
if err != nil {
return
}
var n *nbt2.Tag
var n *nbt.Tag
n, err = mca.ChunkAt(f, x, z)
if err != nil {
return
@@ -71,8 +71,8 @@ func GetChunkFromMca(x, z int32, version string) (b []byte, err error) {
return
}
var chunk anvil2.Chunk
err = nbt2.Format.Decode(n.Value, &chunk)
var chunk anvil.Chunk
err = nbt.Format.Decode(n.Value, &chunk)
if err != nil {
return
}
@@ -95,12 +95,12 @@ func Limbo(c *proto.Conn) (err error) {
s := &Server{
Conn: c,
}
_, err = server2.ServeLogin(s.Conn, server2.WithoutOnlineMode())
_, err = server.ServeLogin(s.Conn, server.WithoutOnlineMode())
if err != nil {
return
}
err = server2.ServeConfig(s.Conn)
err = server.ServeConfig(s.Conn)
if err != nil {
return
}
@@ -176,5 +176,5 @@ func (s *Server) SendKeepAlive() (err error) {
func Run(args []string) error {
slog.SetLogLoggerLevel(slog.LevelDebug)
return server2.StartServerWithOnConn(":25566", Limbo)
return server.StartServerWithOnConn(":25566", Limbo)
}
cmd/strom/status/main.go
+4 -4
View File
@@ -6,7 +6,7 @@ import (
"log/slog"
"time"
client2 "github.com/admin-else/strom/mc/client"
"github.com/admin-else/strom/mc/client"
"github.com/admin-else/strom/mc/event"
"github.com/admin-else/strom/mc/proto"
"github.com/admin-else/strom/mc/proto_base"
@@ -46,7 +46,7 @@ func (s *StatusClient) OnPong(p *v1_21_8.StatusToClientPacketPing) (err error) {
// So ignore the resource leak warning. And maybe attach a warn ignore comment.
// It does not resolve SRV records.
func StatusRaw(addr string) (s *StatusClient, err error) {
c, err := client2.ConnectVersionLess(addr)
c, err := client.ConnectVersionLess(addr)
if err != nil {
return
}
@@ -61,7 +61,7 @@ func StatusRaw(addr string) (s *StatusClient, err error) {
s.RegisterCriticalUntilLatest(s.OnStatus)
s.RegisterCriticalUntilLatest(s.OnPong)
p, err := client2.MakeHandshakePacketAddr(s.Conn, proto_base.Status, addr)
p, err := client.MakeHandshakePacketAddr(s.Conn, proto_base.Status, addr)
if err != nil {
return
}
@@ -82,7 +82,7 @@ func Run(args []string) (err error) {
return
}
if *srvFlag {
*addrFlag, err = client2.DoDnsSimple(*addrFlag)
*addrFlag, err = client.DoDnsSimple(*addrFlag)
if err != nil {
return
}