Jelajahi Sumber

It works now :)

AY 4 tahun lalu
induk
melakukan
41058f4419

+ 55 - 18
main.go

@@ -1,39 +1,76 @@
 package main
 
 import (
-	//"aytechnology.us/gominecraft/mod/mcping"
-	"aytechnology.us/gominecraft/mod/config"
-	//"bufio"
 	"fmt"
-	//"os"
-	//"io"
-	//"os/exec"
-	//"strings"
-	//"time"
+
+	"aytechnology.us/gominecraft/mod/config"
 )
 
+//"os"
+//"io"
+//"os/exec"
+//"strings"
+//"time"
+
 func main() {
 	mcs := config.NewHandler("./server/")
-
-	p := mcs.ReadAllProperties()
-	fmt.Println(p)
-
-	mcs.ChangeProperties("max-players", "99")
-	p = mcs.ReadAllProperties()
-	fmt.Println(p)
-
+	/*
+		p := mcs.ReadAllProperties()
+		fmt.Println(p)
+		mcs.ChangeProperties("gamemode", "creative")
+		mcs.SaveProperties()
+	*/
 	/*
 		q := mcs.ReadAllBannedIPs()
 		fmt.Println(q)
+		mcs.WriteBannedIP("111.11.11.11", "2020-12-13", "Srv", "forever", "LLM")
+		q = mcs.ReadBannedIP("LLM", "reason")
+		fmt.Println(q)
+		mcs.RemoveBannedIP("dllmeaa", "reason")
+		q = mcs.ReadAllBannedIPs()
+		fmt.Println(q)
+		mcs.SaveAllBannedIPs()
+	*/
+	/*
 		r := mcs.ReadAllBannedPlayers()
 		fmt.Println(r)
+		mcs.WriteBannedPlayer("1234", "HyperXraft", "2020-12-12", "Serrver", "forever", "FUCK")
+		fmt.Println(mcs.ReadBannedPlayer("HyperXraft", "name"))
+		r = mcs.ReadAllBannedPlayers()
+		fmt.Println(r)
+		mcs.RemoveBannedPlayer("HyperXraft", "name")
+		r = mcs.ReadAllBannedPlayers()
+		fmt.Println(r)
+		mcs.SaveAllBannedPlayers()
+	*/
+	/*
 		s := mcs.ReadAllOps()
 		fmt.Println(s)
+		mcs.WriteOps("ffff", "Hyper", 3, true)
+		s = mcs.ReadAllOps()
+		fmt.Println(s)
+		fmt.Println(mcs.ReadOps("Hyper", "name"))
+		mcs.RemoveOps("TC", "name")
+		s = mcs.ReadAllOps()
+		fmt.Println(s)
+		mcs.SaveAllOps()
+	*/
+	/*
 		t := mcs.ReadAllWhitelists()
 		fmt.Println(t)
-		u := mcs.ReadEULA()
-		fmt.Println(u)
+		mcs.WriteWhitelist("1234", "TC")
+		t = mcs.ReadAllWhitelists()
+		fmt.Println(t)
+		fmt.Println(mcs.ReadWhitelist("TC", "name"))
+		mcs.RemoveWhitelist("Alanyeung", "name")
+		mcs.SaveAllWhitelists()
 	*/
+	u := mcs.ReadEULA()
+	fmt.Println(u)
+	mcs.WriteEULA(false)
+	u = mcs.ReadEULA()
+	fmt.Println(u)
+	mcs.SaveEULA()
 	/*
 		cmdName := "java -Xmx1024M -Xms1024M -jar server.jar nogui"
 		cmdArgs := strings.Fields(cmdName)

+ 7 - 3
mod/config/banIP.go

@@ -10,7 +10,7 @@ import (
 
 func initBannedIP(serverFolder string) BannedIP {
 
-	jsonFile, err := os.Open(serverFolder + "banned-ips.json")
+	jsonFile, err := os.Open(serverFolder + "/banned-ips.json")
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -67,7 +67,6 @@ func (mch *Handler) ReadBannedIP(search string, field string) BannedIP {
 
 //RemoveBannedIP is exported function
 func (mch *Handler) RemoveBannedIP(search string, field string) bool {
-	var list BannedIP
 	for i, item := range mch.bannedIPs {
 		fieldValue := ""
 		switch strings.ToLower(field) {
@@ -85,7 +84,12 @@ func (mch *Handler) RemoveBannedIP(search string, field string) bool {
 			fieldValue = ""
 		}
 		if fieldValue == search {
-			list = append(list[:i], list[i+1])
+			if len(mch.bannedIPs)-1 != i {
+				mch.bannedIPs = append(mch.bannedIPs[:i], mch.bannedIPs[i+1])
+			} else {
+				// if it is the last item, just remove it
+				mch.bannedIPs = mch.bannedIPs[:i]
+			}
 		}
 	}
 	return true

+ 7 - 4
mod/config/banPlayer.go

@@ -9,8 +9,7 @@ import (
 )
 
 func initBannedPlayer(serverFolder string) BannedPlayer {
-
-	jsonFile, err := os.Open(serverFolder + "banned-players.json")
+	jsonFile, err := os.Open(serverFolder + "/banned-players.json")
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -70,7 +69,6 @@ func (mch *Handler) ReadBannedPlayer(search string, field string) BannedPlayer {
 
 //RemoveBannedPlayer is exported function
 func (mch *Handler) RemoveBannedPlayer(search string, field string) bool {
-	var list BannedPlayer
 	for i, item := range mch.bannedPlayers {
 		fieldValue := ""
 		switch strings.ToLower(field) {
@@ -90,7 +88,12 @@ func (mch *Handler) RemoveBannedPlayer(search string, field string) bool {
 			fieldValue = ""
 		}
 		if fieldValue == search {
-			list = append(list[:i], list[i+1])
+			if len(mch.bannedPlayers)-1 != i {
+				mch.bannedPlayers = append(mch.bannedPlayers[:i], mch.bannedPlayers[i+1])
+			} else {
+				// if it is the last item, just remove it
+				mch.bannedPlayers = mch.bannedPlayers[:i]
+			}
 		}
 	}
 	return true

+ 7 - 3
mod/config/ops.go

@@ -65,7 +65,6 @@ func (mch *Handler) ReadOps(search string, field string) Op {
 
 //RemoveOps is exported function
 func (mch *Handler) RemoveOps(search string, field string) bool {
-	var list Op
 	for i, item := range mch.ops {
 		fieldValue := ""
 		switch strings.ToLower(field) {
@@ -81,7 +80,12 @@ func (mch *Handler) RemoveOps(search string, field string) bool {
 			fieldValue = ""
 		}
 		if fieldValue == search {
-			list = append(list[:i], list[i+1])
+			if len(mch.ops)-1 != i {
+				mch.ops = append(mch.ops[:i], mch.ops[i+1])
+			} else {
+				// if it is the last item, just remove it
+				mch.ops = mch.ops[:i]
+			}
 		}
 	}
 	return true
@@ -90,7 +94,7 @@ func (mch *Handler) RemoveOps(search string, field string) bool {
 //SaveAllOps is exported function
 func (mch *Handler) SaveAllOps() bool {
 	JSON, _ := json.Marshal(mch.ops)
-	err := ioutil.WriteFile(mch.serverFolder+"/banned-players.json", JSON, 0777)
+	err := ioutil.WriteFile(mch.serverFolder+"/ops.json", JSON, 0777)
 	if err != nil {
 		fmt.Println(err)
 	}

+ 2 - 2
mod/config/properties.go

@@ -39,9 +39,9 @@ func (mch *Handler) ReadAllProperties() []ServerConfig {
 
 //ChangeProperties is exported function
 func (mch *Handler) ChangeProperties(inputKey string, inputValue string) bool {
-	for _, item := range mch.properties {
+	for i, item := range mch.properties {
 		if strings.ToLower(inputKey) == strings.ToLower(item.key) {
-			item.value = inputValue
+			mch.properties[i].value = inputValue
 		}
 	}
 	return true

+ 6 - 2
mod/config/whitelist.go

@@ -58,7 +58,6 @@ func (mch *Handler) ReadWhitelist(search string, field string) Whitelist {
 
 //RemoveWhitelist is exported function
 func (mch *Handler) RemoveWhitelist(search string, field string) bool {
-	var list Whitelist
 	for i, item := range mch.whitelists {
 		fieldValue := ""
 		switch strings.ToLower(field) {
@@ -70,7 +69,12 @@ func (mch *Handler) RemoveWhitelist(search string, field string) bool {
 			fieldValue = ""
 		}
 		if fieldValue == search {
-			list = append(list[:i], list[i+1])
+			if len(mch.ops)-1 != i {
+				mch.whitelists = append(mch.whitelists[:i], mch.whitelists[i+1])
+			} else {
+				// if it is the last item, just remove it
+				mch.whitelists = mch.whitelists[:i]
+			}
 		}
 	}
 	return true

+ 1 - 16
server/banned-ips.json

@@ -1,16 +1 @@
-[
-  {
-    "ip": "127.0.0.1",
-    "created": "2020-12-13 14:08:44 -0800",
-    "source": "Alanyeung",
-    "expires": "forever",
-    "reason": "fuck you"
-  },
-  {
-    "ip": "192.168.0.1",
-    "created": "2020-12-13 14:08:44 -0800",
-    "source": "TC",
-    "expires": "forever",
-    "reason": "dllmeaa"
-  }
-]
+[{"ip":"127.0.0.1","created":"2020-12-13 14:08:44 -0800","source":"Alanyeung","expires":"forever","reason":"fuck you"},{"ip":"111.11.11.11","created":"2020-12-13","source":"Srv","expires":"forever","reason":"LLM"}]

+ 1 - 18
server/banned-players.json

@@ -1,18 +1 @@
-[
-  {
-    "uuid": "3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f",
-    "name": "Alanyeung",
-    "created": "2020-12-13 14:08:53 -0800",
-    "source": "Server",
-    "expires": "forever",
-    "reason": "Banned by an operator."
-  },
-  {
-    "uuid": "3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4e",
-    "name": "TC",
-    "created": "2020-12-13 14:08:53 -0800",
-    "source": "Alanyeung",
-    "expires": "forever",
-    "reason": "Banned by an fucker."
-  }
-]
+[{"uuid":"3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f","name":"Alanyeung","level":4,"bypassesPlayerLimit":false},{"uuid":"ffff","name":"Hyper","level":3,"bypassesPlayerLimit":true}]

+ 1 - 2
server/eula.txt

@@ -1,3 +1,2 @@
 #By changing the setting below to TRUE you are indicating your agreement to our EULA (https://account.mojang.com/documents/minecraft_eula).
-#Sun Dec 13 01:05:50 PST 2020
-eula=true
+eula=false

+ 1 - 14
server/ops.json

@@ -1,14 +1 @@
-[
-  {
-    "uuid": "3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f",
-    "name": "Alanyeung",
-    "level": 4,
-    "bypassesPlayerLimit": false
-  },
-  {
-    "uuid": "3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4e",
-    "name": "TC",
-    "level": 3,
-    "bypassesPlayerLimit": false
-  }
-]
+[{"uuid":"3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f","name":"Alanyeung","level":4,"bypassesPlayerLimit":false},{"uuid":"ffff","name":"Hyper","level":3,"bypassesPlayerLimit":true}]

+ 3 - 5
server/server.properties

@@ -1,9 +1,7 @@
-#Minecraft server properties
-#Sun Dec 13 14:15:23 PST 2020
-enable-jmx-monitoring=false
+#Minecraft server properties#Minecraft server propertiesenable-jmx-monitoring=false
 rcon.port=25575
 level-seed=
-gamemode=survival
+gamemode=creative
 enable-command-block=false
 enable-query=false
 generator-settings=
@@ -16,7 +14,7 @@ difficulty=easy
 network-compression-threshold=256
 max-tick-time=60000
 use-native-transport=true
-max-players=20
+max-players=99
 online-mode=true
 enable-status=true
 allow-flight=false

+ 1 - 6
server/whitelist.json

@@ -1,6 +1 @@
-[
-  {
-    "uuid": "3d1c0ed1-d4d0-42ae-ac5e-a7557d5a6c4f",
-    "name": "Alanyeung"
-  }
-]
+[{"uuid":"1234","name":"TC"}]