resourcepacks rework/cleanup

utils/proxy/packcache.go

@@ -46,30 +46,22 @@ func (c *packCache) Create(id, ver string) (*closeMoveWriter, error) {
 
 	_ = os.MkdirAll(filepath.Dir(finalPath), 0777)
 
-	f, err := os.Create(tmpPath)
+	f, err := createTemp(tmpPath)
 	if err != nil {
 		return nil, err
 	}
 
 	return &closeMoveWriter{
-		f:         f,
+		File:      f,
 		FinalName: finalPath,
 	}, nil
 }
 
 type closeMoveWriter struct {
-	f         *os.File
+	*os.File
 	FinalName string
 }
 
-func (c *closeMoveWriter) Write(b []byte) (n int, err error) {
-	return c.f.Write(b)
-}
-
-func (c *closeMoveWriter) Close() error {
-	err := c.f.Close()
-	if err != nil {
-		return err
-	}
-	return os.Rename(c.f.Name(), c.FinalName)
+func (c *closeMoveWriter) Move() error {
+	return os.Rename(c.File.Name(), c.FinalName)
 }