finalize for stonecutter

build.gradle

@@ -1,7 +1,6 @@
 plugins {
     id 'fabric-loom' version '1.7-SNAPSHOT'
     id 'maven-publish'
-    id 'me.fallenbreath.yamlang' version '1.3.0'
     id "org.quiltmc.gradle.licenser" version "2.0.1"
 }
 
@@ -60,11 +59,6 @@ loom {
     accessWidenerPath = file("src/main/resources/skinshuffle.accesswidener")
 }
 
-yamlang {
-    targetSourceSets = [sourceSets.main]
-    inputDir = 'assets/skinshuffle/lang'
-}
-
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.'deps.yarn'}:v2"
@@ -94,8 +88,8 @@ processResources {
 
     filesMatching("fabric.mod.json") {
         expand "version": project.version,
-                "minecraft_version": project.minecraft_version,
-                "loader_version": project.'deps.loader'
+                "loader_version": project.'deps.loader',
+                "target_minecraft": project.'mod.target'
     }
 }
 

gradle.properties

@@ -6,6 +6,7 @@ minecraft_version=1.20.1
 deps.yarn=1.20.1+build.10
 deps.loader=0.15.11
 # Mod Properties
+mod.target=>=1.20 <=1.20.1
 mod.version=2.0.0+1.20.1
 mod.name=SkinShuffle
 # Dependencies

src/main/java/com/mineblock11/skinshuffle/util/NetworkingUtil.java

@@ -44,7 +44,7 @@ public static void handleReconnect(MinecraftClient client) {
 
         if (isSingleplayer) {
             serverAddress = null;
-            folderName = client.server.getSavePath(WorldSavePath.ROOT).toFile().getName();
+            folderName = client.getServer().getSavePath(WorldSavePath.ROOT).toFile().getName();
             client.world.disconnect();
             client.disconnect(new MessageScreen(Text.translatable("skinshuffle.reconnect.rejoining")));
         } else {

src/main/resources/assets/skinshuffle/lang/en_us.json

@@ -0,0 +1,101 @@
+{
+  "skinshuffle.indicator": "Warning Indicator",
+  "skinshuffle.cape_provider.none": "None",
+  "skinshuffle.cape_provider.default": "Automatic",
+  "skinshuffle.cape_provider.minecraft": "Mojang",
+  "skinshuffle.cape_provider.optifine": "OptiFine",
+  "skinshuffle.cape_provider.minecraftcapes": "MinecraftCapes",
+  "skinshuffle.reconnect.warning": "You must %s to allow other players, including yourself, to see your skin.",
+  "skinshuffle.reconnect.reconnecting": "Reconnecting...",
+  "skinshuffle.reconnect.rejoining": "Rejoining...",
+  "skinshuffle.reconnect.rejoin": "rejoin",
+  "skinshuffle.reconnect.c_rejoin": "Rejoin",
+  "skinshuffle.reconnect.reconnect_to": "reconnect to",
+  "skinshuffle.reconnect.reconnect": "reconnect",
+  "skinshuffle.reconnect.c_reconnect": "Reconnect",
+  "skinshuffle.reconnect.world": "world",
+  "skinshuffle.reconnect.server": "server",
+  "skinshuffle.reconnect.realm": "realm",
+  "skinshuffle.reconnect.title": "%s Recommended",
+  "skinshuffle.reconnect.message": "If you want your skin to be visible to you and other players, you must %s the current %s.\n\nDo you want to %s?",
+  "skinshuffle.toasts.refused_reconnect.title": "Skin is not visible to others.",
+  "skinshuffle.toasts.refused_reconnect.message": "You will have to reconnect for your skin to be visible to other players.\n§7§oYou can disable this toast in the config.",
+  "skinshuffle.toasts.offline.title": "SkinShuffle cannot apply your skin.",
+  "skinshuffle.toasts.offline.message": "You are not authenticated, your skin will only be visible to you.\n§7§oYou can disable this toast in the config.",
+  "skinshuffle.toasts.editor_failure.title": "There was a failure with the editor.",
+  "skinshuffle.toasts.editor_failure.message": "Please check logs for more information.",
+  "skinshuffle.config.title": "SkinShuffle",
+  "skinshuffle.config.popups.title": "Popup Options",
+  "skinshuffle.config.popups.description": "Configuration options regarding toasts and other popups that appear in-game in certain circumstances.",
+  "skinshuffle.config.popups.reconnect.name": "Disable Skin Visibility Toast",
+  "skinshuffle.config.popups.reconnect.description": "Disable the toast that appears when you do not reconnect after changing your skin.\n\nThis only shows on servers without the mod installed.",
+  "skinshuffle.config.general.title": "General Options",
+  "skinshuffle.config.general.description": "General configuration options that change or toggle functionality.",
+  "skinshuffle.config.general.behaviour.title": "Behaviour",
+  "skinshuffle.config.general.display.title": "Display",
+  "skinshuffle.config.general.disable_api.name": "Disable Mojang API Uploading",
+  "skinshuffle.config.general.disable_api.description": "Should SkinShuffle not upload your skin to the Mojang API?\n\nIf enabled, this will mean that your skin will not be visible to yourself or other players.",
+  "skinshuffle.config.general.display_title_screen.name": "Display Widget In Title Screen",
+  "skinshuffle.config.general.display_title_screen.description": "Should the currently selected skin preset and the skin preset button be shown on the title screen?",
+  "skinshuffle.config.general.display_pause_screen.name": "Display Widget In Pause Screen",
+  "skinshuffle.config.general.display_pause_screen.description": "Should the currently selected skin preset and the skin preset button be shown on the pause screen?",
+  "skinshuffle.config.general.carousel_scroll_sensitivity.name": "Carousel Scroll Sensitivity",
+  "skinshuffle.config.general.carousel_scroll_sensitivity.description": "How sensitive should the carousel be to mouse scrolling?",
+  "skinshuffle.config.general.invert_carousel_scroll.name": "Invert Carousel Scroll",
+  "skinshuffle.config.general.invert_carousel_scroll.description": "Should the carousel scroll direction be inverted?",
+  "skinshuffle.config.rendering.title": "Rendering Options",
+  "skinshuffle.config.rendering.description": "Configuration options regarding how skin presets are rendered in the title screen, pause menu, carousel and edit screens.",
+  "skinshuffle.config.rendering.rotation": "Rotation",
+  "skinshuffle.config.rendering.cursor": "Cursor",
+  "skinshuffle.config.rendering.render_player_capes.name": "Render Player Capes",
+  "skinshuffle.config.rendering.render_player_capes.description": "Should SkinShuffle render player capes from Mojang, Optifine and Minecraft Capes providers?",
+  "skinshuffle.config.rendering.rendering_style": "§lROTATION§r rotates the rendered player at a fixed rate specified by the rotation speed multiplier.\n§lCURSOR§r makes the rendered player look at the mouse cursor at all times, similarly to the inventory screen.",
+  "skinshuffle.config.rendering.carousel_rendering_style.name": "Carousel Rendering Style",
+  "skinshuffle.config.rendering.carousel_rendering_style.description": "How should the currently selected skin preset be rendered in the carousel screen?\n",
+  "skinshuffle.config.rendering.preset_edit_screen_rendering_style.name": "Preview Rendering Style",
+  "skinshuffle.config.rendering.preset_edit_screen_rendering_style.description": "How should the skin preview be rendered in the preset edit screen?\n",
+  "skinshuffle.config.rendering.widget_rendering_style.name": "Widget Rendering Style",
+  "skinshuffle.config.rendering.widget_rendering_style.description": "How should the widget on the title screen and pause screen be rendered?\n",
+  "skinshuffle.config.rendering.rotation_speed.name": "Rotation Speed Multiplier",
+  "skinshuffle.config.rendering.rotation_speed.description": "What rotation speed multiplier should be applied to skins if rotation is enabled?",
+  "skinshuffle.button": "Skin Presets",
+  "skinshuffle.carousel.title": "Skin Presets",
+  "skinshuffle.carousel.config_button.tooltip": "Open the config screen.",
+  "skinshuffle.carousel.view_type_button.large.tooltip": "Large view.",
+  "skinshuffle.carousel.view_type_button.compact.tooltip": "Compact view.",
+  "skinshuffle.carousel.shuffle_button.tooltip.enable": "Enable shuffling.",
+  "skinshuffle.carousel.shuffle_button.tooltip.disable": "Disable shuffling.",
+  "skinshuffle.carousel.default_tooltip": "§4You cannot modify or copy the default preset.",
+  "skinshuffle.carousel.create": "Create",
+  "skinshuffle.carousel.new": "New Preset",
+  "skinshuffle.carousel.save_button": "Select Preset",
+  "skinshuffle.carousel.left": "Move Carousel Left",
+  "skinshuffle.carousel.right": "Move Carousel Right",
+  "skinshuffle.carousel.confirmations.delete_preset.title": "Preset Deletion",
+  "skinshuffle.carousel.confirmations.delete_preset.message": "Are you sure you want to delete this preset?\nIt will be lost forever! (A long time!)",
+  "skinshuffle.carousel.preset_widget.edit": "Edit",
+  "skinshuffle.carousel.preset_widget.copy": "Copy",
+  "skinshuffle.carousel.preset_widget.delete": "Delete",
+  "skinshuffle.carousel.preset_widget.select": "Select",
+  "skinshuffle.edit.customize.title": "Preset Settings",
+  "skinshuffle.edit.customize.default": "Classic",
+  "skinshuffle.edit.customize.slim": "Slim",
+  "skinshuffle.edit.customize.model_cycle_prefix": "Model Type",
+  "skinshuffle.edit.customize.preset_name": "Preset Name",
+  "skinshuffle.edit.customize.cape_provider": "Cape Provider",
+  "skinshuffle.edit.source.username": "Username",
+  "skinshuffle.edit.source.invalid_username": "§4§nInvalid Username§r\n\nUsername must only contain a-Z 0-9.\nUsername may contain underscores.\nUsername must be between 3-16 characters long.\nUsername must exist.",
+  "skinshuffle.edit.source.file": "File",
+  "skinshuffle.edit.source.invalid_file": "§4§nInvalid File§r\n\nFile must exist and must be in \nthe §l.png§r format.",
+  "skinshuffle.edit.source.url": "URL",
+  "skinshuffle.edit.source.invalid_url": "§4§nInvalid URL§r\n\nURL is invalid. Must be either a \nvalid §lhttp§r or §lhttps§r URL.",
+  "skinshuffle.edit.source.uuid": "UUID",
+  "skinshuffle.edit.source.invalid_uuid": "§4§nInvalid UUID§r\n\nUUID must be in the following format:\n§lxxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+  "skinshuffle.edit.source.resource_location": "Resource Location",
+  "skinshuffle.edit.source.invalid_resource_location": "§4§nInvalid Resource Location§r\n\nResource location must be a valid\ntexture file that is loaded by the game.",
+  "skinshuffle.edit.source.unchanged": "Keep Current",
+  "skinshuffle.edit.source.cycle_prefix": "Source",
+  "skinshuffle.edit.source.title": "Skin Source",
+  "skinshuffle.edit.source.skin_model": "Skin Model",
+  "skinshuffle.edit.source.load_skin": "Load Skin"
+}