lang move to Utl, make all references to language file use Utl.lang()

src/main/java/one/oth3r/sit/ModMenu.java

@@ -12,11 +12,8 @@ import net.minecraft.text.TextColor;
 import net.minecraft.util.Formatting;
 
 public class ModMenu implements ModMenuApi {
-    private static MutableText lang(String key) {
-        return Text.translatable("config.sit."+key);
-    }
     private static MutableText lang(String key, Object... args) {
-        return Text.translatable("config.sit."+key,args);
+        return Utl.lang("config."+key,args);
     }
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
@@ -24,7 +21,6 @@ public class ModMenu implements ModMenuApi {
                 .title(Text.of("Sit!"))
                 .category(ConfigCategory.createBuilder()
                         .name(lang("category.general"))
-                        .tooltip(lang("category.general.tooltip"))
                         .option(Option.<Boolean>createBuilder()
                                 .name(lang("general.keep_active"))
                                 .description(OptionDescription.of(lang("general.keep_active.description")))
@@ -93,7 +89,6 @@ public class ModMenu implements ModMenuApi {
                         .build())
                 .category(ConfigCategory.createBuilder()
                         .name(lang("category.main_hand"))
-                        .tooltip(lang("category.main_hand.tooltip"))
                         .option(Option.<config.HandRequirement>createBuilder()
                                 .name(lang("hand.requirement"))
                                 .description(OptionDescription.of(lang("hand.requirement.description")
@@ -145,7 +140,6 @@ public class ModMenu implements ModMenuApi {
                         .build())
                 .category(ConfigCategory.createBuilder()
                         .name(lang("category.off_hand"))
-                        .tooltip(lang("category.off_hand.tooltip"))
                         .option(Option.<config.HandRequirement>createBuilder()
                                 .name(lang("hand.requirement"))
                                 .description(OptionDescription.of(lang("hand.requirement.description")

src/main/java/one/oth3r/sit/Sit.java

@@ -3,23 +3,16 @@ package one.oth3r.sit;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import io.netty.buffer.ByteBuf;
-import io.netty.util.ReferenceCountUtil;
 import net.fabricmc.api.ModInitializer;
 
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.minecraft.network.PacketByteBuf;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.CommandManager;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.text.MutableText;
-import net.minecraft.text.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.HashMap;
 
 public class Sit implements ModInitializer {
@@ -50,8 +43,4 @@ public class Sit implements ModInitializer {
 					});
 				});
 	}
-	public static MutableText lang(String key, Object... args) {
-		if (isClient) return Text.translatable(key, args);
-		else return LangReader.of(key, args).getTxT();
-	}
 }

src/main/java/one/oth3r/sit/SitCommand.java

@@ -49,7 +49,7 @@ public class SitCommand {
         if (player == null) {
             if (args[0].equalsIgnoreCase("reload")) {
                 config.load();
-                Sit.LOGGER.info(Sit.lang("key.sit.msg.reloaded").getString());
+                Sit.LOGGER.info(Utl.lang("msg.reloaded").getString());
             }
             return 1;
         }
@@ -73,7 +73,7 @@ public class SitCommand {
         }
         if (args[0].equalsIgnoreCase("reload")) {
             config.load();
-            player.sendMessage(Sit.lang("key.sit.command.reloaded").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))));
+            player.sendMessage(Utl.lang("msg.reloaded").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN))));
         }
         if (args[0].equalsIgnoreCase("purgeChairEntities")) {
             String cmd = "kill @e[type=minecraft:text_display,name=\""+Sit.ENTITY_NAME+"\"]";
@@ -81,9 +81,9 @@ public class SitCommand {
                 ParseResults<ServerCommandSource> parse =
                         Sit.commandManager.getDispatcher().parse(cmd, player.getCommandSource());
                 Sit.commandManager.getDispatcher().execute(parse);
-                player.sendMessage(Sit.lang("key.sit.msg.purged"));
+                player.sendMessage(Utl.lang("msg.purged"));
             } catch (CommandSyntaxException e) {
-                player.sendMessage(Sit.lang("key.sit.msg.purged"));
+                player.sendMessage(Utl.lang("msg.purged"));
                 e.printStackTrace();
             }
         }

src/main/java/one/oth3r/sit/Utl.java

@@ -4,6 +4,8 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -11,6 +13,10 @@ import java.util.HashMap;
 import java.util.List;
 
 public class Utl {
+    public static MutableText lang(String key, Object... args) {
+        if (Sit.isClient) return Text.translatable(key, args);
+        else return LangReader.of(key, args).getTxT();
+    }
     public enum HandType {
         main,
         off

src/main/java/one/oth3r/sit/config.java

@@ -128,7 +128,7 @@ public class config {
         }
     }
     public static String lang(String key, Object... args) {
-        return LangReader.of("config.sit."+key, args).getTxT().getString();
+        return Utl.lang("config."+key, args).getString();
     }
     public static void save() {
         try (var file = Files.newBufferedWriter(configFile().toPath(), StandardCharsets.UTF_8)) {
@@ -147,7 +147,7 @@ public class config {
             file.write("\ncarpets=" + carpetsOn);
             file.write("\nfull-blocks=" + fullBlocksOn);
             file.write("\ncustom=" + customOn);
-            file.write("\n# "+Sit.lang("config.sit."+
+            file.write("\n# "+ Utl.lang("config."+
                             "general.sittable_blocks.description")
                     .append("\n# ").append(lang("example",Utl.Assets.CUSTOM_BLOCKS))
                     .append("\n# ").append(lang("general.sittable_blocks.description.2"))
@@ -157,7 +157,7 @@ public class config {
                     .append("\n# ").append(lang("general.sittable_blocks.description.6")).getString());
             file.write("\ncustom-blocks="+gson.toJson(customBlocks));
             file.write("\n\n# "+lang("hand"));
-            file.write("\n# "+Sit.lang("config.sit."+
+            file.write("\n# "+ Utl.lang("config."+
                             "hand.requirement.description")
                     .append("\n# ").append(lang("hand.requirement.description.2",HandRequirement.empty))
                     .append("\n# ").append(lang("hand.requirement.description.3",HandRequirement.restrictive))