resource pack

ZeppelinMC · Oct 16, 2023 · 2bb3574 · 2bb3574
1 parent b69c091
commit 2bb3574
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 19 deletions.
diff --git a/go.mod b/go.mod
@@ -10,7 +10,7 @@ require (
 )
 
 require (
-	github.com/aimjel/minecraft v0.0.0-20231016123343-3d3648ae6aeb
+	github.com/aimjel/minecraft v0.0.0-20231016125512-063b69722f8f
 	github.com/gorilla/websocket v1.5.0
 )
 

diff --git a/go.sum b/go.sum
@@ -4,6 +4,12 @@ github.com/aimjel/minecraft v0.0.0-20231016123215-874984727d9a h1:w41oaJZW2mg3el
 github.com/aimjel/minecraft v0.0.0-20231016123215-874984727d9a/go.mod h1:jb47g4nDw3J8JdA4WxQpDx25NoIZiyNCjFOtM1b3Urk=
 github.com/aimjel/minecraft v0.0.0-20231016123343-3d3648ae6aeb h1:fWvc3blQ39JvmJdZlgaqOrmbCZ2Yd79jek5hSb8sNuU=
 github.com/aimjel/minecraft v0.0.0-20231016123343-3d3648ae6aeb/go.mod h1:jb47g4nDw3J8JdA4WxQpDx25NoIZiyNCjFOtM1b3Urk=
+github.com/aimjel/minecraft v0.0.0-20231016124508-1ad471d8d2ed h1:nAwrz8wpb1/LtPuqq7kfwsnK9itCEVRkSKeMzyxYZNw=
+github.com/aimjel/minecraft v0.0.0-20231016124508-1ad471d8d2ed/go.mod h1:jb47g4nDw3J8JdA4WxQpDx25NoIZiyNCjFOtM1b3Urk=
+github.com/aimjel/minecraft v0.0.0-20231016125419-78278049998d h1:wq8vu+1LGlYoHIvQAHkt7qmsAsJtBBqNnNxFfyJcBTg=
+github.com/aimjel/minecraft v0.0.0-20231016125419-78278049998d/go.mod h1:jb47g4nDw3J8JdA4WxQpDx25NoIZiyNCjFOtM1b3Urk=
+github.com/aimjel/minecraft v0.0.0-20231016125512-063b69722f8f h1:Oji/qU1dxA1ooRs+8nXuLRtiXeyI8Mqnar39KkWojL4=
+github.com/aimjel/minecraft v0.0.0-20231016125512-063b69722f8f/go.mod h1:jb47g4nDw3J8JdA4WxQpDx25NoIZiyNCjFOtM1b3Urk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/server/player_controller.go b/server/player_controller.go
@@ -146,10 +146,20 @@ func (p *PlayerController) Login(dim string) error {
 
 	x, y, z, a := p.Server.World.Spawn()
 
-	return p.session.SendPacket(&packet.SetDefaultSpawnPosition{
+	v := p.session.SendPacket(&packet.SetDefaultSpawnPosition{
 		Location: ((uint64(x) & 0x3FFFFFF) << 38) | ((uint64(z) & 0x3FFFFFF) << 12) | (uint64(y) & 0xFFF),
 		Angle:    a,
 	})
+
+	if p.Server.Config.ResourcePack.Enable {
+		return p.session.SendPacket(&packet.ResourcePack{
+			URL:    p.Server.Config.ResourcePack.URL,
+			Hash:   p.Server.Config.ResourcePack.Hash,
+			Forced: p.Server.Config.ResourcePack.Force,
+			Prompt: p.Server.Config.Messages.ResourcePackPrompt,
+		})
+	}
+	return v
 }
 
 func (p *PlayerController) SystemChatMessage(s string) error {

diff --git a/server/server_config.go b/server/server_config.go
@@ -93,9 +93,10 @@ var DefaultConfig = Config{
 		ProtocolOld:             "Your protocol is too old!",
 		InsufficientPermissions: "§cYou aren't permitted to use this command.",
 		ReloadComplete:          "§aReload complete.",
-		ServerClosed:            "Server closed.",
+		ServerClosed:            "Server closed",
 		OnlineMode:              "The server is in online mode.",
 		Slain:                   "%player% was slain by %killer%",
+		ResourcePackPrompt:      "Please use our resource pack!!!",
 	},
 	Web: Web{
 		ServerIP:   "0.0.0.0",
@@ -137,6 +138,7 @@ type Messages struct {
 	ServerClosed            string `toml:"server_closed"`
 	OnlineMode              string `toml:"online_mode"`
 	Slain                   string `toml:"slain"`
+	ResourcePackPrompt      string `toml:"resource_pack_prompt"`
 }
 
 type Chat struct {
@@ -150,21 +152,29 @@ type Whitelist struct {
 	Enable  bool `toml:"enable"`
 }
 
+type ResourcePack struct {
+	URL    string `toml:"url"`
+	Hash   string `toml:"hash"`
+	Force  bool   `toml:"force"`
+	Enable bool   `toml:"enable"`
+}
+
 type Config struct {
-	ServerIP             string    `toml:"server_ip"`
-	ServerPort           int       `toml:"server_port"`
-	ViewDistance         int       `toml:"view_distance"`
-	SimulationDistance   int       `toml:"simulation_distance"`
-	Superflat            bool      `toml:"superflat"`
-	MOTD                 string    `toml:"motd"`
-	Whitelist            Whitelist `toml:"whitelist"`
-	Web                  Web       `toml:"web"`
-	Gamemode             string    `toml:"gamemode"`
-	Hardcore             bool      `toml:"hardcore"`
-	MaxPlayers           int       `toml:"max_players"`
-	Online               bool      `toml:"online_mode"`
-	CompressionThreshold int       `toml:"compression_threshold"`
-	Tablist              Tablist   `toml:"tablist"`
-	Chat                 Chat      `toml:"chat"`
-	Messages             Messages  `toml:"messages"`
+	ServerIP             string       `toml:"server_ip"`
+	ServerPort           int          `toml:"server_port"`
+	ViewDistance         int          `toml:"view_distance"`
+	SimulationDistance   int          `toml:"simulation_distance"`
+	Superflat            bool         `toml:"superflat"`
+	MOTD                 string       `toml:"motd"`
+	Whitelist            Whitelist    `toml:"whitelist"`
+	Web                  Web          `toml:"web"`
+	Gamemode             string       `toml:"gamemode"`
+	Hardcore             bool         `toml:"hardcore"`
+	MaxPlayers           int          `toml:"max_players"`
+	Online               bool         `toml:"online_mode"`
+	CompressionThreshold int          `toml:"compression_threshold"`
+	Tablist              Tablist      `toml:"tablist"`
+	Chat                 Chat         `toml:"chat"`
+	ResourcePack         ResourcePack `toml:"resource_pack"`
+	Messages             Messages     `toml:"messages"`
 }