AY il y a 4 ans
Parent
commit
7cd7cc4046

BIN
__debug_bin


+ 2 - 1
main.go

@@ -17,6 +17,8 @@ var MCServer *server.Handler
 //Config should not be exported
 var Config *config.Handler
 
+var serverConfig startupConfig
+
 type startupConfig struct {
 	Java   string `json:"java"`
 	Min    string `json:"min"`
@@ -34,7 +36,6 @@ func main() {
 		fmt.Println(err)
 	}
 	byte, _ := ioutil.ReadAll(jsonFile)
-	var serverConfig startupConfig
 	json.Unmarshal(byte, &serverConfig)
 
 	MCServer = server.NewHandler(serverConfig.Java, serverConfig.Jar, serverConfig.Min, serverConfig.Max, serverConfig.Arg)

+ 2 - 2
mc_core.go

@@ -7,7 +7,7 @@ import (
 )
 
 func StartMCServer(w http.ResponseWriter, r *http.Request) {
-	MCServer.StartService()
+	MCServer.StartService(serverConfig.Folder)
 	sendJSONResponse(w, "OK")
 }
 
@@ -24,7 +24,7 @@ func KillMCServer(w http.ResponseWriter, r *http.Request) {
 func RestartMCServer(w http.ResponseWriter, r *http.Request) {
 	MCServer.SendCommand("stop")
 	MCServer.Wait()
-	MCServer.StartService()
+	MCServer.StartService(serverConfig.Folder)
 	sendJSONResponse(w, "OK")
 }
 

+ 1 - 1
mc_misc.go

@@ -18,7 +18,7 @@ func SendCommand(w http.ResponseWriter, r *http.Request) {
 func ServerInfo(w http.ResponseWriter, r *http.Request) {
 	pingResp, _ := mcping.Ping("localhost:" + Config.ReadProperties("server-port"))
 	for _, item := range pingResp.Sample {
-		skin := mc.NewHandler(item.UUID, "./server/skin/")
+		skin := mc.NewHandler(item.UUID, serverConfig.Folder+"/skin/")
 		skin.DownloadSkin()
 	}
 	resp := ServerInfoStruct{

+ 14 - 0
mc_read.go

@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"net/http"
 	"strconv"
+
+	"aytechnology.us/gominecraft/mod/mc"
 )
 
 func ReadLog(w http.ResponseWriter, r *http.Request) {
@@ -34,6 +36,10 @@ func ReadBanIP(w http.ResponseWriter, r *http.Request) {
 
 func ReadBanPlayer(w http.ResponseWriter, r *http.Request) {
 	config := Config.ReadAllBannedPlayers()
+	for _, item := range config {
+		skin := mc.NewHandler(item.UUID, serverConfig.Folder+"/skin/")
+		skin.DownloadSkin()
+	}
 	jsonData, _ := json.Marshal(config)
 	sendJSONResponse(w, string(jsonData))
 }
@@ -46,6 +52,10 @@ func ReadEULA(w http.ResponseWriter, r *http.Request) {
 
 func ReadOps(w http.ResponseWriter, r *http.Request) {
 	config := Config.ReadAllOps()
+	for _, item := range config {
+		skin := mc.NewHandler(item.UUID, serverConfig.Folder+"/skin/")
+		skin.DownloadSkin()
+	}
 	jsonData, _ := json.Marshal(config)
 	sendJSONResponse(w, string(jsonData))
 }
@@ -58,6 +68,10 @@ func ReadProperties(w http.ResponseWriter, r *http.Request) {
 
 func ReadWhitelist(w http.ResponseWriter, r *http.Request) {
 	config := Config.ReadAllWhitelists()
+	for _, item := range config {
+		skin := mc.NewHandler(item.UUID, serverConfig.Folder+"/skin/")
+		skin.DownloadSkin()
+	}
 	jsonData, _ := json.Marshal(config)
 	sendJSONResponse(w, string(jsonData))
 }

+ 2 - 2
mod/server/server.go

@@ -10,7 +10,7 @@ import (
 )
 
 //StartService is exported
-func (server *Handler) StartService() {
+func (server *Handler) StartService(dir string) {
 	if server.isRunning == false {
 		//server.log = []Log{} //Clean up the log
 		cmdName := server.JavaPath + " -Xmx" + server.maxRAM + " -Xms" + server.minRAM + " -jar " + server.ServerJar + " nogui " + server.args
@@ -18,7 +18,7 @@ func (server *Handler) StartService() {
 		cmdArgs := strings.Fields(cmdName)
 
 		server.cmd = exec.Command(cmdArgs[0], cmdArgs[1:len(cmdArgs)]...)
-		server.cmd.Dir = "./server/"
+		server.cmd.Dir = dir
 		server.stdout, _ = server.cmd.StdoutPipe()
 		server.stdin, _ = server.cmd.StdinPipe()
 		server.cmd.Start()

BIN
server/skin/0e324e7f-e78e-4777-b501-7ae08a65b1eb.png


BIN
server/skin/2561594a-c282-4ab7-b50c-068770cb9c6c.png


BIN
server/skin/8667ba71-b85a-4004-af54-457a9734eed7.png


BIN
server/skin/f6591220-1b72-4c34-af36-6bae126bd825.png


BIN
server/skin/f680df9b-ac5c-4d3f-9bac-75bc0e316afa.png