1.20 update

27rogi · Jun 16, 2023 · ce38cb5 · ce38cb5
1 parent 7c82494
commit ce38cb5
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 98 deletions.
diff --git a/build.gradle b/build.gradle
@@ -50,9 +50,9 @@ dependencies {
 
     modImplementation include("net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}")
     modImplementation include("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")
-    modImplementation include("eu.pb4:sgui:1.2.1+1.19.3")
+    modImplementation include("eu.pb4:sgui:1.2.2+1.20")
     modImplementation include("com.github.Lortseam.completeconfig:base:2.3.1")
-    modImplementation include("xyz.nucleoid:server-translations-api:2.0.0-beta.2+1.19.4-pre2")
+    modImplementation include("xyz.nucleoid:server-translations-api:2.0.0+1.20")
 }
 
 processResources {

diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,21 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx4G
 
-minecraft_version_group=1.19.x
+minecraft_version_group=1.20.x
 
 # Fabric Properties
 # Check these on https://fabricmc.net/versions.html
-minecraft_version=1.19.4
-yarn_mappings=1.19.4+build.2
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.2
 loader_version=0.14.21
 
 #Fabric api
-fabric_version=0.83.0+1.19.4
+fabric_version=0.83.1+1.20.1
 
 loom_version=1.2-SNAPSHOT
 
 # Mod Properties
-mod_version = 2.0.4
+mod_version = 2.1.0
 maven_group = space.rogi27
 archives_base_name = homabric
 

diff --git a/src/main/kotlin/space/rogi27/homabric/commands/AdminCommands.kt b/src/main/kotlin/space/rogi27/homabric/commands/AdminCommands.kt
@@ -55,7 +55,7 @@ object AdminCommands {
         Homabric.config.load()
         Homabric.homesConfig.load()
         context.source.sendFeedback(
-            Text.translatable("text.homabric.admin_config_reloaded").formatted(Formatting.GRAY), false
+            { Text.translatable("text.homabric.admin_config_reloaded").formatted(Formatting.GRAY) }, false
         )
         return 1
     }
@@ -66,13 +66,15 @@ object AdminCommands {
             "%s by Rogi27", "%s", "%s", "%s"
         )
         context.source.sendFeedback(
-            Text.translatable(
-                java.lang.String.join("\n", info),
-                Text.literal("Homabric").formatted(Formatting.AQUA),
-                Text.translatable("text.homabric.admin_info_line1").formatted(Formatting.GRAY),
-                Text.literal(" - /help homabric").formatted(Formatting.GRAY),
-                Text.literal(" - /help home").formatted(Formatting.GRAY)
-            ).formatted(Formatting.GREEN), false
+            {
+                Text.translatable(
+                    java.lang.String.join("\n", info),
+                    Text.literal("Homabric").formatted(Formatting.AQUA),
+                    Text.translatable("text.homabric.admin_info_line1").formatted(Formatting.GRAY),
+                    Text.literal(" - /help homabric").formatted(Formatting.GRAY),
+                    Text.literal(" - /help home").formatted(Formatting.GRAY)
+                ).formatted(Formatting.GREEN)
+            }, false
         )
         return 1
     }
@@ -83,24 +85,26 @@ object AdminCommands {
         val player = HomesConfig.getPlayer(context.getArgument("player", String::class.java))
         if (player == null) {
             context.source.sendFeedback(
-                Text.translatable("text.homabric.no_player_exists").formatted(Formatting.RED), false
+                { Text.translatable("text.homabric.no_player_exists").formatted(Formatting.RED) }, false
             )
             return 1
         }
 
         val home: HomeObject? = player.getHome(homeName)
         if (home == null) {
-            context.source.sendFeedback(Text.translatable("text.homabric.no_home").formatted(Formatting.RED), false)
+            context.source.sendFeedback({ Text.translatable("text.homabric.no_home").formatted(Formatting.RED) }, false)
             return 0
         }
 
         if (context.source.player == null) return 0
         TeleportHelper.runTeleport(context.source.player!!, fun() {
             home.teleportPlayer(context.source.player!!)
             context.source.sendFeedback(
-                Text.translatable(
-                    "text.homabric.teleport_done", Text.literal(homeName).formatted(Formatting.WHITE)
-                ).formatted(Formatting.GREEN), false
+                {
+                    Text.translatable(
+                        "text.homabric.teleport_done", Text.literal(homeName).formatted(Formatting.WHITE)
+                    ).formatted(Formatting.GREEN)
+                }, false
             )
         })
         return 1
@@ -117,26 +121,30 @@ object AdminCommands {
         val player = HomesConfig.getPlayer(context.getArgument("player", String::class.java))
         if (player == null) {
             context.source.sendFeedback(
-                Text.translatable("text.homabric.no_player_exists").formatted(Formatting.RED), false
+                { Text.translatable("text.homabric.no_player_exists").formatted(Formatting.RED) }, false
             )
             return 1
         }
         val result: PlayerObject.HomeCreationResult = player.createOrUpdateHome(context.source, homeName!!)
         if (result === PlayerObject.HomeCreationResult.HOME_CREATED) {
             context.source.sendFeedback(
-                Text.translatable(
-                    "text.homabric.admin_new_home_created", Text.literal(homeName).formatted(
-                        Formatting.WHITE
-                    ), context.getArgument("player", String::class.java).format(Formatting.AQUA)
-                ).formatted(Formatting.GREEN), false
+                {
+                    Text.translatable(
+                        "text.homabric.admin_new_home_created", Text.literal(homeName).formatted(
+                            Formatting.WHITE
+                        ), context.getArgument("player", String::class.java).format(Formatting.AQUA)
+                    ).formatted(Formatting.GREEN)
+                }, false
             )
         } else {
             context.source.sendFeedback(
-                Text.translatable(
-                    "text.homabric.admin_home_location_updated", Text.literal(homeName).formatted(
-                        Formatting.WHITE
-                    ), context.getArgument("player", String::class.java).format(Formatting.AQUA)
-                ).formatted(Formatting.GREEN), false
+                {
+                    Text.translatable(
+                        "text.homabric.admin_home_location_updated", Text.literal(homeName).formatted(
+                            Formatting.WHITE
+                        ), context.getArgument("player", String::class.java).format(Formatting.AQUA)
+                    ).formatted(Formatting.GREEN)
+                }, false
             )
         }
         Homabric.saveAndReloadConfig()
@@ -156,22 +164,24 @@ object AdminCommands {
         )
         if (player == null) {
             context.source.sendFeedback(
-                Text.translatable("text.homabric.no_player_exists").formatted(Formatting.RED), false
+                { Text.translatable("text.homabric.no_player_exists").formatted(Formatting.RED) }, false
             )
             return 1
         }
         val result: PlayerObject.HomeRemoveResult = player.removeHome(homeName)
         when (result) {
             PlayerObject.HomeRemoveResult.NO_HOME -> {
-                context.source.sendFeedback(Text.translatable("text.homabric.no_home").formatted(Formatting.RED), false)
+                context.source.sendFeedback({ Text.translatable("text.homabric.no_home").formatted(Formatting.RED) }, false)
             }
             PlayerObject.HomeRemoveResult.HOME_REMOVED -> {
                 context.source.sendFeedback(
-                    Text.translatable(
-                        "text.homabric.admin_home_removed", Text.literal(homeName).formatted(
-                            Formatting.WHITE
-                        ), context.getArgument("player", String::class.java).format(Formatting.AQUA)
-                    ).formatted(Formatting.GREEN), false
+                    {
+                        Text.translatable(
+                            "text.homabric.admin_home_removed", Text.literal(homeName).formatted(
+                                Formatting.WHITE
+                            ), context.getArgument("player", String::class.java).format(Formatting.AQUA)
+                        ).formatted(Formatting.GREEN)
+                    }, false
                 )
             }
         }
@@ -182,7 +192,7 @@ object AdminCommands {
     fun list(context: CommandContext<ServerCommandSource>): Int {
         val playerData = HomesConfig.getPlayer(context.getArgument("player", String::class.java))
         if (playerData == null) {
-            context.source.sendFeedback(Text.translatable("text.homabric.no_homes").formatted(Formatting.YELLOW), false)
+            context.source.sendFeedback({ Text.translatable("text.homabric.no_homes").formatted(Formatting.YELLOW) }, false)
             return 1
         }
         val gui = playerData.getHomesGUI(context.source)