a bit of cleanup

bedrock-tool · Jul 22, 2024 · a7f55ec · a7f55ec
1 parent 0f5c150
commit a7f55ec
Show file tree

Hide file tree

Showing 13 changed files with 262 additions and 252 deletions.
diff --git a/cmd/bedrocktool/main.go b/cmd/bedrocktool/main.go
@@ -7,6 +7,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"net/http"
 	"os"
 	"os/signal"
 	"runtime/pprof"
@@ -68,6 +69,15 @@ func setupLogging(isDebug bool) {
 	}))
 }
 
+type logTransport struct {
+	rt http.RoundTripper
+}
+
+func (t *logTransport) RoundTrip(req *http.Request) (*http.Response, error) {
+	logrus.Tracef("Request %s", req.URL.String())
+	return t.rt.RoundTrip(req)
+}
+
 func main() {
 	isDebug := updater.Version == ""
 
@@ -80,6 +90,8 @@ func main() {
 		}
 		pprof.StartCPUProfile(f)
 		defer pprof.StopCPUProfile()
+
+		http.DefaultTransport = &logTransport{rt: http.DefaultTransport}
 	}
 
 	log := logrus.WithField("part", "main")

diff --git a/cmd/entity-test/main.go b/cmd/entity-test/main.go
diff --git a/gophertunnel b/gophertunnel
diff --git a/handlers/worlds/world.go b/handlers/worlds/world.go
@@ -443,15 +443,16 @@ func (w *worldsHandler) saveWorldState(worldState *worldstate.World) error {
 	}
 	defer f.Close()
 	zw := zip.NewWriter(f)
+	utils.ZipCompressPool(zw)
 	err = zw.AddFS(os.DirFS(worldState.Folder))
 	if err != nil {
 		return err
 	}
-	zfs := &utils.ZipWriter{Writer: zw}
-	ofs := &utils.OSWriter{Base: worldState.Folder}
-	mfs := &utils.MultiWriterFS{FSs: []utils.WriterFS{zfs, ofs}}
 
-	err = w.AddPacks(worldState.Name, mfs)
+	err = w.AddPacks(worldState.Name, utils.MultiWriterFS{FSs: []utils.WriterFS{
+		utils.ZipWriter{Writer: zw},
+		utils.OSWriter{Base: worldState.Folder},
+	}})
 	if err != nil {
 		return err
 	}

diff --git a/subcommands/realms-list.go b/subcommands/realms-list.go
@@ -22,7 +22,7 @@ func (c *RealmListCMD) Execute(ctx context.Context) error {
 			return err
 		}
 	}
-	realms, err := utils.Auth.Realms.Realms(ctx)
+	realms, err := utils.Auth.Realms().Realms(ctx)
 	if err != nil {
 		return err
 	}

diff --git a/subcommands/resourcepack-d/resourcepack-d.go b/subcommands/resourcepack-d/resourcepack-d.go
diff --git a/ui/gui/popups/realmsinput.go b/ui/gui/popups/realmsinput.go
@@ -51,7 +51,7 @@ func (r *RealmsList) Load() error {
 	if !utils.Auth.LoggedIn() {
 		return errors.New("not Logged In")
 	}
-	realms, err := utils.Auth.Realms.Realms(context.Background())
+	realms, err := utils.Auth.Realms().Realms(context.Background())
 	if err != nil {
 		return err
 	}
+10 −0		minecraft/conn.go
+91 −65		minecraft/resource/pack.go
+27 −24		minecraft/resource/temp.go