AY 4 سال پیش
والد
کامیت
ce48c0d308

BIN
__debug_bin


+ 26 - 4
main.go

@@ -1,7 +1,10 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
+	"io/ioutil"
+	"os"
 
 	"aytechnology.us/gominecraft/mod/config"
 
@@ -14,11 +17,30 @@ var MCServer *server.Handler
 //Config should not be exported
 var Config *config.Handler
 
-func main() {
-	MCServer = server.NewHandler("java", "server.jar", "1024M", "1024M", "")
-	Config = config.NewHandler("./server/")
+type startupConfig struct {
+	Java   string `json:"java"`
+	Min    string `json:"min"`
+	Max    string `json:"max"`
+	Jar    string `json:"jar"`
+	Folder string `json:"folder"`
+	Arg    string `json:"arg"`
+	Port   string `json:"port"`
+}
 
-	webServer("./webroot/", "./server/", "8080")
+func main() {
+	//init the startup configuration
+	jsonFile, err := os.Open("./startup.json")
+	if err != nil {
+		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)
+	Config = config.NewHandler(serverConfig.Folder)
+
+	webServer("./webroot/", serverConfig.Folder, serverConfig.Port)
 
 	go func() {
 		i := 0

+ 1 - 1
mc_misc.go

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

+ 10 - 0
mod/config/properties.go

@@ -47,6 +47,16 @@ func (mch *Handler) ChangeProperties(inputKey string, inputValue string) bool {
 	return true
 }
 
+//ReadProperties is exported function
+func (mch *Handler) ReadProperties(inputKey string) string {
+	for i, item := range mch.properties {
+		if strings.ToLower(inputKey) == strings.ToLower(item.Key) {
+			return mch.properties[i].Value
+		}
+	}
+	return ""
+}
+
 //SaveProperties is exported function
 func (mch *Handler) SaveProperties() bool {
 	TXT := "#Minecraft server properties"

+ 104 - 0
server/logs/latest 4.log

@@ -0,0 +1,104 @@
+[17:50:31] [main/INFO]: Environment: authHost='https://authserver.mojang.com', accountsHost='https://api.mojang.com', sessionHost='https://sessionserver.mojang.com', servicesHost='https://api.minecraftservices.com', name='PROD'
+[17:50:32] [main/WARN]: Ambiguity between arguments [teleport, destination] and [teleport, targets] with inputs: [Player, 0123, @e, dd12be42-52a9-4a91-a8a1-11c01849e498]
+[17:50:32] [main/WARN]: Ambiguity between arguments [teleport, location] and [teleport, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
+[17:50:32] [main/WARN]: Ambiguity between arguments [teleport, location] and [teleport, targets] with inputs: [0.1 -0.5 .9, 0 0 0]
+[17:50:32] [main/WARN]: Ambiguity between arguments [teleport, targets] and [teleport, destination] with inputs: [Player, 0123, dd12be42-52a9-4a91-a8a1-11c01849e498]
+[17:50:32] [main/WARN]: Ambiguity between arguments [teleport, targets, location] and [teleport, targets, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
+[17:50:32] [main/INFO]: Reloading ResourceManager: Default
+[17:50:34] [Worker-Main-14/INFO]: Loaded 7 recipes
+[17:50:34] [Worker-Main-14/INFO]: Loaded 927 advancements
+[17:50:37] [Server thread/INFO]: Starting minecraft server version 1.16.4
+[17:50:37] [Server thread/INFO]: Loading properties
+[17:50:37] [Server thread/INFO]: Default game type: CREATIVE
+[17:50:37] [Server thread/INFO]: Generating keypair
+[17:50:37] [Server thread/INFO]: Starting Minecraft server on *:25565
+[17:50:37] [Server thread/INFO]: Using default channel type
+[17:50:38] [Server thread/INFO]: Preparing level "world"
+[17:50:38] [Server thread/INFO]: Preparing start region for dimension minecraft:overworld
+[17:50:45] [Worker-Main-14/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-14/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:50:45] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:50:46] [Worker-Main-14/INFO]: Preparing spawn area: 0%
+[17:50:46] [Worker-Main-10/INFO]: Preparing spawn area: 0%
+[17:50:47] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:50:47] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:50:48] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[17:50:48] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[17:50:49] [Worker-Main-9/INFO]: Preparing spawn area: 0%
+[17:50:49] [Worker-Main-9/INFO]: Preparing spawn area: 0%
+[17:50:50] [Worker-Main-13/INFO]: Preparing spawn area: 2%
+[17:50:50] [Worker-Main-9/INFO]: Preparing spawn area: 2%
+[17:50:51] [Worker-Main-10/INFO]: Preparing spawn area: 3%
+[17:50:51] [Worker-Main-9/INFO]: Preparing spawn area: 3%
+[17:50:52] [Worker-Main-13/INFO]: Preparing spawn area: 4%
+[17:50:52] [Worker-Main-8/INFO]: Preparing spawn area: 4%
+[17:50:53] [Worker-Main-13/INFO]: Preparing spawn area: 6%
+[17:50:55] [Worker-Main-12/INFO]: Preparing spawn area: 6%
+[17:50:55] [Worker-Main-9/INFO]: Preparing spawn area: 6%
+[17:50:55] [Worker-Main-9/INFO]: Preparing spawn area: 6%
+[17:50:55] [Worker-Main-8/INFO]: Preparing spawn area: 10%
+[17:50:55] [Worker-Main-12/INFO]: Preparing spawn area: 10%
+[17:50:56] [Worker-Main-13/INFO]: Preparing spawn area: 10%
+[17:50:56] [Worker-Main-9/INFO]: Preparing spawn area: 10%
+[17:50:57] [Worker-Main-9/INFO]: Preparing spawn area: 15%
+[17:50:57] [Worker-Main-11/INFO]: Preparing spawn area: 15%
+[17:50:58] [Worker-Main-9/INFO]: Preparing spawn area: 17%
+[17:50:58] [Worker-Main-10/INFO]: Preparing spawn area: 17%
+[17:50:59] [Worker-Main-10/INFO]: Preparing spawn area: 17%
+[17:50:59] [Worker-Main-11/INFO]: Preparing spawn area: 20%
+[17:51:00] [Worker-Main-9/INFO]: Preparing spawn area: 20%
+[17:51:00] [Worker-Main-11/INFO]: Preparing spawn area: 21%
+[17:51:01] [Worker-Main-8/INFO]: Preparing spawn area: 21%
+[17:51:01] [Worker-Main-8/INFO]: Preparing spawn area: 21%
+[17:51:02] [Worker-Main-9/INFO]: Preparing spawn area: 21%
+[17:51:02] [Worker-Main-14/INFO]: Preparing spawn area: 24%
+[17:51:03] [Worker-Main-12/INFO]: Preparing spawn area: 25%
+[17:51:03] [Worker-Main-9/INFO]: Preparing spawn area: 25%
+[17:51:04] [Worker-Main-8/INFO]: Preparing spawn area: 25%
+[17:51:04] [Worker-Main-12/INFO]: Preparing spawn area: 27%
+[17:51:05] [Worker-Main-14/INFO]: Preparing spawn area: 29%
+[17:51:05] [Worker-Main-11/INFO]: Preparing spawn area: 32%
+[17:51:06] [Worker-Main-14/INFO]: Preparing spawn area: 34%
+[17:51:06] [Worker-Main-10/INFO]: Preparing spawn area: 38%
+[17:51:07] [Worker-Main-9/INFO]: Preparing spawn area: 42%
+[17:51:07] [Worker-Main-12/INFO]: Preparing spawn area: 45%
+[17:51:08] [Worker-Main-10/INFO]: Preparing spawn area: 46%
+[17:51:08] [Worker-Main-10/INFO]: Preparing spawn area: 46%
+[17:51:09] [Worker-Main-11/INFO]: Preparing spawn area: 55%
+[17:51:09] [Worker-Main-10/INFO]: Preparing spawn area: 59%
+[17:51:10] [Worker-Main-10/INFO]: Preparing spawn area: 64%
+[17:51:10] [Worker-Main-13/INFO]: Preparing spawn area: 69%
+[17:51:11] [Worker-Main-12/INFO]: Preparing spawn area: 73%
+[17:51:11] [Worker-Main-13/INFO]: Preparing spawn area: 78%
+[17:51:12] [Worker-Main-13/INFO]: Preparing spawn area: 83%
+[17:51:12] [Worker-Main-11/INFO]: Preparing spawn area: 87%
+[17:51:13] [Worker-Main-11/INFO]: Preparing spawn area: 92%
+[17:51:13] [Worker-Main-13/INFO]: Preparing spawn area: 98%
+[17:51:13] [Server thread/INFO]: Time elapsed: 35596 ms
+[17:51:13] [Server thread/INFO]: Done (35.737s)! For help, type "help"
+[17:52:45] [Server thread/INFO]: Stopping the server
+[17:52:45] [Server thread/INFO]: Stopping server
+[17:52:45] [Server thread/INFO]: Saving players
+[17:52:45] [Server thread/INFO]: Saving worlds
+[17:52:45] [Server thread/INFO]: Saving chunks for level 'ServerLevel[world]'/minecraft:overworld
+[17:52:47] [Server thread/INFO]: ThreadedAnvilChunkStorage (world): All chunks are saved
+[17:52:47] [Server thread/INFO]: Saving chunks for level 'ServerLevel[world]'/minecraft:the_nether
+[17:52:47] [Server thread/INFO]: ThreadedAnvilChunkStorage (DIM-1): All chunks are saved
+[17:52:47] [Server thread/INFO]: Saving chunks for level 'ServerLevel[world]'/minecraft:the_end
+[17:52:47] [Server thread/INFO]: ThreadedAnvilChunkStorage (DIM1): All chunks are saved
+[17:52:47] [Server thread/INFO]: ThreadedAnvilChunkStorage (world): All chunks are saved
+[17:52:47] [Server thread/INFO]: ThreadedAnvilChunkStorage (DIM-1): All chunks are saved
+[17:52:47] [Server thread/INFO]: ThreadedAnvilChunkStorage (DIM1): All chunks are saved

+ 99 - 0
server/logs/latest 5.log

@@ -0,0 +1,99 @@
+[17:53:47] [main/INFO]: Environment: authHost='https://authserver.mojang.com', accountsHost='https://api.mojang.com', sessionHost='https://sessionserver.mojang.com', servicesHost='https://api.minecraftservices.com', name='PROD'
+[17:53:48] [main/WARN]: Ambiguity between arguments [teleport, destination] and [teleport, targets] with inputs: [Player, 0123, @e, dd12be42-52a9-4a91-a8a1-11c01849e498]
+[17:53:48] [main/WARN]: Ambiguity between arguments [teleport, location] and [teleport, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
+[17:53:48] [main/WARN]: Ambiguity between arguments [teleport, location] and [teleport, targets] with inputs: [0.1 -0.5 .9, 0 0 0]
+[17:53:48] [main/WARN]: Ambiguity between arguments [teleport, targets] and [teleport, destination] with inputs: [Player, 0123, dd12be42-52a9-4a91-a8a1-11c01849e498]
+[17:53:48] [main/WARN]: Ambiguity between arguments [teleport, targets, location] and [teleport, targets, destination] with inputs: [0.1 -0.5 .9, 0 0 0]
+[17:53:48] [main/INFO]: Reloading ResourceManager: Default
+[17:53:49] [Worker-Main-13/INFO]: Loaded 7 recipes
+[17:53:49] [Worker-Main-13/INFO]: Loaded 927 advancements
+[17:53:52] [Server thread/INFO]: Starting minecraft server version 1.16.4
+[17:53:52] [Server thread/INFO]: Loading properties
+[17:53:52] [Server thread/INFO]: Default game type: CREATIVE
+[17:53:52] [Server thread/INFO]: Generating keypair
+[17:53:52] [Server thread/INFO]: Starting Minecraft server on *:25565
+[17:53:52] [Server thread/INFO]: Using default channel type
+[17:53:52] [Server thread/INFO]: Preparing level "world"
+[17:53:52] [Server thread/INFO]: Preparing start region for dimension minecraft:overworld
+[17:53:59] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-10/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-11/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-10/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-11/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-10/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-11/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-10/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-11/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-10/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-11/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-10/INFO]: Preparing spawn area: 0%
+[17:53:59] [Worker-Main-11/INFO]: Preparing spawn area: 0%
+[17:54:00] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[17:54:00] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:54:00] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:54:01] [Worker-Main-12/INFO]: Preparing spawn area: 0%
+[17:54:01] [Worker-Main-8/INFO]: Preparing spawn area: 0%
+[17:54:02] [Worker-Main-9/INFO]: Preparing spawn area: 0%
+[17:54:02] [Worker-Main-14/INFO]: Preparing spawn area: 0%
+[17:54:03] [Worker-Main-13/INFO]: Preparing spawn area: 0%
+[17:54:03] [Worker-Main-13/INFO]: Preparing spawn area: 1%
+[17:54:04] [Worker-Main-11/INFO]: Preparing spawn area: 2%
+[17:54:04] [Worker-Main-11/INFO]: Preparing spawn area: 3%
+[17:54:05] [Worker-Main-9/INFO]: Preparing spawn area: 4%
+[17:54:05] [Worker-Main-9/INFO]: Preparing spawn area: 5%
+[17:54:06] [Worker-Main-9/INFO]: Preparing spawn area: 6%
+[17:54:06] [Worker-Main-9/INFO]: Preparing spawn area: 7%
+[17:54:07] [Worker-Main-11/INFO]: Preparing spawn area: 7%
+[17:54:08] [Worker-Main-8/INFO]: Preparing spawn area: 7%
+[17:54:08] [Worker-Main-9/INFO]: Preparing spawn area: 7%
+[17:54:08] [Worker-Main-8/INFO]: Preparing spawn area: 9%
+[17:54:09] [Worker-Main-14/INFO]: Preparing spawn area: 9%
+[17:54:09] [Worker-Main-9/INFO]: Preparing spawn area: 15%
+[17:54:10] [Worker-Main-12/INFO]: Preparing spawn area: 17%
+[17:54:10] [Worker-Main-11/INFO]: Preparing spawn area: 17%
+[17:54:11] [Worker-Main-13/INFO]: Preparing spawn area: 17%
+[17:54:11] [Worker-Main-11/INFO]: Preparing spawn area: 20%
+[17:54:12] [Worker-Main-12/INFO]: Preparing spawn area: 20%
+[17:54:12] [Worker-Main-10/INFO]: Preparing spawn area: 20%
+[17:54:13] [Worker-Main-11/INFO]: Preparing spawn area: 20%
+[17:54:13] [Worker-Main-14/INFO]: Preparing spawn area: 25%
+[17:54:14] [Worker-Main-9/INFO]: Preparing spawn area: 25%
+[17:54:14] [Worker-Main-10/INFO]: Preparing spawn area: 27%
+[17:54:15] [Worker-Main-11/INFO]: Preparing spawn area: 28%
+[17:54:15] [Worker-Main-11/INFO]: Preparing spawn area: 30%
+[17:54:16] [Worker-Main-8/INFO]: Preparing spawn area: 30%
+[17:54:16] [Worker-Main-11/INFO]: Preparing spawn area: 32%
+[17:54:17] [Worker-Main-10/INFO]: Preparing spawn area: 32%
+[17:54:17] [Worker-Main-10/INFO]: Preparing spawn area: 35%
+[17:54:18] [Worker-Main-14/INFO]: Preparing spawn area: 35%
+[17:54:18] [Worker-Main-10/INFO]: Preparing spawn area: 37%
+[17:54:19] [Worker-Main-11/INFO]: Preparing spawn area: 39%
+[17:54:19] [Worker-Main-14/INFO]: Preparing spawn area: 42%
+[17:54:20] [Worker-Main-8/INFO]: Preparing spawn area: 45%
+[17:54:20] [Worker-Main-9/INFO]: Preparing spawn area: 49%
+[17:54:21] [Worker-Main-8/INFO]: Preparing spawn area: 54%
+[17:54:21] [Worker-Main-11/INFO]: Preparing spawn area: 58%
+[17:54:22] [Worker-Main-8/INFO]: Preparing spawn area: 63%
+[17:54:22] [Worker-Main-13/INFO]: Preparing spawn area: 68%
+[17:54:23] [Worker-Main-10/INFO]: Preparing spawn area: 72%
+[17:54:23] [Worker-Main-14/INFO]: Preparing spawn area: 76%
+[17:54:24] [Worker-Main-9/INFO]: Preparing spawn area: 82%
+[17:54:24] [Worker-Main-9/INFO]: Preparing spawn area: 86%
+[17:54:25] [Worker-Main-14/INFO]: Preparing spawn area: 92%
+[17:54:25] [Worker-Main-12/INFO]: Preparing spawn area: 98%
+[17:54:26] [Server thread/INFO]: Time elapsed: 33139 ms
+[17:54:26] [Server thread/INFO]: Done (33.342s)! For help, type "help"
+[18:06:27] [Server thread/INFO]: Stopping the server
+[18:06:27] [Server thread/INFO]: Stopping server
+[18:06:27] [Server thread/INFO]: Saving players
+[18:06:27] [Server thread/INFO]: Saving worlds
+[18:06:27] [Server thread/INFO]: Saving chunks for level 'ServerLevel[world]'/minecraft:overworld
+[18:06:27] [Server thread/INFO]: ThreadedAnvilChunkStorage (world): All chunks are saved
+[18:06:27] [Server thread/INFO]: Saving chunks for level 'ServerLevel[world]'/minecraft:the_nether
+[18:06:27] [Server thread/INFO]: ThreadedAnvilChunkStorage (DIM-1): All chunks are saved
+[18:06:27] [Server thread/INFO]: Saving chunks for level 'ServerLevel[world]'/minecraft:the_end
+[18:06:27] [Server thread/INFO]: ThreadedAnvilChunkStorage (DIM1): All chunks are saved
+[18:06:27] [Server thread/INFO]: ThreadedAnvilChunkStorage (world): All chunks are saved
+[18:06:27] [Server thread/INFO]: ThreadedAnvilChunkStorage (DIM-1): All chunks are saved
+[18:06:27] [Server thread/INFO]: ThreadedAnvilChunkStorage (DIM1): All chunks are saved

+ 1 - 1
server/server.properties

@@ -1,5 +1,5 @@
 #Minecraft server properties
-#Mon Dec 21 23:01:05 PST 2020
+#Tue Dec 22 17:53:47 PST 2020
 enable-jmx-monitoring=false
 rcon.port=25575
 level-seed=

BIN
server/world/DIM-1/data/raids.dat


BIN
server/world/DIM1/data/raids_end.dat


BIN
server/world/data/raids.dat


BIN
server/world/level.dat


BIN
server/world/level.dat_old


BIN
server/world/region/r.-1.-1 4.mca


BIN
server/world/region/r.-1.-1 5.mca


BIN
server/world/region/r.-1.0 4.mca


BIN
server/world/region/r.-1.0.mca


BIN
server/world/region/r.0.-1 4.mca


BIN
server/world/region/r.0.-1.mca


BIN
server/world/region/r.0.0 4.mca


BIN
server/world/region/r.0.0.mca


+ 9 - 0
startup.json

@@ -0,0 +1,9 @@
+{
+    "java": "java",
+    "min": "800M",
+    "max": "800M",
+    "jar": "server.jar",
+    "folder": "./server/",
+    "arg": "",
+    "port": "8080"
+}