bump version

remove unknown state packet
remove new parameter
2026-01-16 04:42:12 +00:00 · 2024-06-25 14:45:39 +03:00 · 2024-06-25 14:43:41 +03:00 · 2024-06-25 14:41:17 +03:00 · 2024-06-25 14:41:17 +03:00 · 2024-06-25 14:41:16 +03:00
111 changed files with 778 additions and 3531 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,262 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-end_of_line = crlf
-indent_size = 4
-indent_style = space
-insert_final_newline = true
-tab_width = 4
-trim_trailing_whitespace = false
-ij_continuation_indent_size = 8
-
-[*.properties]
-ij_any_keep_blank_lines_in_code = unset
-
-[*.java]
-ij_java_align_consecutive_assignments = false
-ij_java_align_consecutive_variable_declarations = false
-ij_java_align_group_field_declarations = false
-ij_java_align_multiline_annotation_parameters = true
-ij_java_align_multiline_array_initializer_expression = false
-ij_java_align_multiline_assignment = false
-ij_java_align_multiline_binary_operation = true
-ij_java_align_multiline_chained_methods = false
-ij_java_align_multiline_extends_list = false
-ij_java_align_multiline_for = true
-ij_java_align_multiline_method_parentheses = false
-ij_java_align_multiline_parameters = false
-ij_java_align_multiline_parameters_in_calls = false
-ij_java_align_multiline_parenthesized_expression = false
-ij_java_align_multiline_records = true
-ij_java_align_multiline_resources = true
-ij_java_align_multiline_ternary_operation = false
-ij_java_align_multiline_text_blocks = false
-ij_java_align_multiline_throws_list = false
-ij_java_align_subsequent_simple_methods = false
-ij_java_align_throws_keyword = false
-ij_java_annotation_parameter_wrap = normal
-ij_java_array_initializer_new_line_after_left_brace = false
-ij_java_array_initializer_right_brace_on_new_line = false
-ij_java_array_initializer_wrap = off
-ij_java_assert_statement_colon_on_next_line = false
-ij_java_assert_statement_wrap = off
-ij_java_assignment_wrap = off
-ij_java_binary_operation_sign_on_next_line = false
-ij_java_binary_operation_wrap = off
-ij_java_blank_lines_after_anonymous_class_header = 0
-ij_java_blank_lines_after_class_header = 0
-ij_java_blank_lines_after_imports = 1
-ij_java_blank_lines_after_package = 1
-ij_java_blank_lines_around_class = 1
-ij_java_blank_lines_around_field = 0
-ij_java_blank_lines_around_field_in_interface = 0
-ij_java_blank_lines_around_initializer = 1
-ij_java_blank_lines_around_method = 1
-ij_java_blank_lines_around_method_in_interface = 1
-ij_java_blank_lines_before_class_end = 0
-ij_java_blank_lines_before_imports = 1
-ij_java_blank_lines_before_method_body = 0
-ij_java_blank_lines_before_package = 0
-ij_java_block_brace_style = end_of_line
-ij_java_block_comment_at_first_column = true
-ij_java_call_parameters_new_line_after_left_paren = false
-ij_java_call_parameters_right_paren_on_new_line = false
-ij_java_call_parameters_wrap = off
-ij_java_case_statement_on_separate_line = true
-ij_java_catch_on_new_line = false
-ij_java_class_annotation_wrap = split_into_lines
-ij_java_class_brace_style = end_of_line
-ij_java_class_count_to_use_import_on_demand = 5
-ij_java_class_names_in_javadoc = 1
-ij_java_do_not_indent_top_level_class_members = false
-ij_java_do_not_wrap_after_single_annotation = false
-ij_java_do_while_brace_force = never
-ij_java_doc_add_blank_line_after_description = true
-ij_java_doc_add_blank_line_after_param_comments = false
-ij_java_doc_add_blank_line_after_return = false
-ij_java_doc_add_p_tag_on_empty_lines = true
-ij_java_doc_align_exception_comments = true
-ij_java_doc_align_param_comments = true
-ij_java_doc_do_not_wrap_if_one_line = false
-ij_java_doc_enable_formatting = true
-ij_java_doc_enable_leading_asterisks = true
-ij_java_doc_indent_on_continuation = false
-ij_java_doc_keep_empty_lines = true
-ij_java_doc_keep_empty_parameter_tag = true
-ij_java_doc_keep_empty_return_tag = true
-ij_java_doc_keep_empty_throws_tag = true
-ij_java_doc_keep_invalid_tags = true
-ij_java_doc_param_description_on_new_line = false
-ij_java_doc_preserve_line_breaks = false
-ij_java_doc_use_throws_not_exception_tag = true
-ij_java_else_on_new_line = false
-ij_java_entity_dd_suffix = EJB
-ij_java_entity_eb_suffix = Bean
-ij_java_entity_hi_suffix = Home
-ij_java_entity_lhi_prefix = Local
-ij_java_entity_lhi_suffix = Home
-ij_java_entity_li_prefix = Local
-ij_java_entity_pk_class = java.lang.String
-ij_java_entity_vo_suffix = VO
-ij_java_enum_constants_wrap = split_into_lines
-ij_java_extends_keyword_wrap = off
-ij_java_extends_list_wrap = off
-ij_java_field_annotation_wrap = on_every_item
-ij_java_finally_on_new_line = false
-ij_java_for_brace_force = never
-ij_java_for_statement_new_line_after_left_paren = false
-ij_java_for_statement_right_paren_on_new_line = false
-ij_java_for_statement_wrap = off
-ij_java_generate_final_locals = false
-ij_java_generate_final_parameters = false
-ij_java_if_brace_force = never
-ij_java_imports_layout = *, |, javax.**, java.**, |, $*
-ij_java_indent_case_from_switch = true
-ij_java_insert_inner_class_imports = false
-ij_java_insert_override_annotation = true
-ij_java_keep_blank_lines_before_right_brace = 2
-ij_java_keep_blank_lines_between_package_declaration_and_header = 2
-ij_java_keep_blank_lines_in_code = 2
-ij_java_keep_blank_lines_in_declarations = 2
-ij_java_keep_control_statement_in_one_line = true
-ij_java_keep_first_column_comment = true
-ij_java_keep_indents_on_empty_lines = true
-ij_java_keep_line_breaks = true
-ij_java_keep_multiple_expressions_in_one_line = false
-ij_java_keep_simple_blocks_in_one_line = false
-ij_java_keep_simple_classes_in_one_line = true
-ij_java_keep_simple_lambdas_in_one_line = true
-ij_java_keep_simple_methods_in_one_line = true
-ij_java_label_indent_absolute = false
-ij_java_label_indent_size = 0
-ij_java_lambda_brace_style = end_of_line
-ij_java_layout_static_imports_separately = true
-ij_java_line_comment_add_space = false
-ij_java_line_comment_at_first_column = true
-ij_java_message_dd_suffix = EJB
-ij_java_message_eb_suffix = Bean
-ij_java_method_annotation_wrap = split_into_lines
-ij_java_method_brace_style = end_of_line
-ij_java_method_call_chain_wrap = off
-ij_java_method_parameters_new_line_after_left_paren = false
-ij_java_method_parameters_right_paren_on_new_line = false
-ij_java_method_parameters_wrap = off
-ij_java_modifier_list_wrap = false
-ij_java_names_count_to_use_import_on_demand = 3
-ij_java_new_line_after_lparen_in_record_header = false
-ij_java_parameter_annotation_wrap = normal
-ij_java_parentheses_expression_new_line_after_left_paren = false
-ij_java_parentheses_expression_right_paren_on_new_line = false
-ij_java_place_assignment_sign_on_next_line = false
-ij_java_prefer_longer_names = true
-ij_java_prefer_parameters_wrap = false
-ij_java_record_components_wrap = normal
-ij_java_repeat_synchronized = true
-ij_java_replace_instanceof_and_cast = false
-ij_java_replace_null_check = true
-ij_java_replace_sum_lambda_with_method_ref = true
-ij_java_resource_list_new_line_after_left_paren = false
-ij_java_resource_list_right_paren_on_new_line = false
-ij_java_resource_list_wrap = off
-ij_java_rparen_on_new_line_in_record_header = false
-ij_java_session_dd_suffix = EJB
-ij_java_session_eb_suffix = Bean
-ij_java_session_hi_suffix = Home
-ij_java_session_lhi_prefix = Local
-ij_java_session_lhi_suffix = Home
-ij_java_session_li_prefix = Local
-ij_java_session_si_suffix = Service
-ij_java_space_after_closing_angle_bracket_in_type_argument = false
-ij_java_space_after_colon = true
-ij_java_space_after_comma = true
-ij_java_space_after_comma_in_type_arguments = true
-ij_java_space_after_for_semicolon = true
-ij_java_space_after_quest = true
-ij_java_space_after_type_cast = true
-ij_java_space_before_annotation_array_initializer_left_brace = false
-ij_java_space_before_annotation_parameter_list = false
-ij_java_space_before_array_initializer_left_brace = false
-ij_java_space_before_catch_keyword = true
-ij_java_space_before_catch_left_brace = true
-ij_java_space_before_catch_parentheses = true
-ij_java_space_before_class_left_brace = true
-ij_java_space_before_colon = true
-ij_java_space_before_colon_in_foreach = true
-ij_java_space_before_comma = false
-ij_java_space_before_do_left_brace = true
-ij_java_space_before_else_keyword = true
-ij_java_space_before_else_left_brace = true
-ij_java_space_before_finally_keyword = true
-ij_java_space_before_finally_left_brace = true
-ij_java_space_before_for_left_brace = true
-ij_java_space_before_for_parentheses = true
-ij_java_space_before_for_semicolon = false
-ij_java_space_before_if_left_brace = true
-ij_java_space_before_if_parentheses = true
-ij_java_space_before_method_call_parentheses = false
-ij_java_space_before_method_left_brace = true
-ij_java_space_before_method_parentheses = false
-ij_java_space_before_opening_angle_bracket_in_type_parameter = false
-ij_java_space_before_quest = true
-ij_java_space_before_switch_left_brace = true
-ij_java_space_before_switch_parentheses = true
-ij_java_space_before_synchronized_left_brace = true
-ij_java_space_before_synchronized_parentheses = true
-ij_java_space_before_try_left_brace = true
-ij_java_space_before_try_parentheses = true
-ij_java_space_before_type_parameter_list = false
-ij_java_space_before_while_keyword = true
-ij_java_space_before_while_left_brace = true
-ij_java_space_before_while_parentheses = true
-ij_java_space_inside_one_line_enum_braces = false
-ij_java_space_within_empty_array_initializer_braces = false
-ij_java_space_within_empty_method_call_parentheses = false
-ij_java_space_within_empty_method_parentheses = false
-ij_java_spaces_around_additive_operators = true
-ij_java_spaces_around_assignment_operators = true
-ij_java_spaces_around_bitwise_operators = true
-ij_java_spaces_around_equality_operators = true
-ij_java_spaces_around_lambda_arrow = true
-ij_java_spaces_around_logical_operators = true
-ij_java_spaces_around_method_ref_dbl_colon = false
-ij_java_spaces_around_multiplicative_operators = true
-ij_java_spaces_around_relational_operators = true
-ij_java_spaces_around_shift_operators = true
-ij_java_spaces_around_type_bounds_in_type_parameters = true
-ij_java_spaces_around_unary_operator = false
-ij_java_spaces_within_angle_brackets = false
-ij_java_spaces_within_annotation_parentheses = false
-ij_java_spaces_within_array_initializer_braces = false
-ij_java_spaces_within_braces = false
-ij_java_spaces_within_brackets = false
-ij_java_spaces_within_cast_parentheses = false
-ij_java_spaces_within_catch_parentheses = false
-ij_java_spaces_within_for_parentheses = false
-ij_java_spaces_within_if_parentheses = false
-ij_java_spaces_within_method_call_parentheses = false
-ij_java_spaces_within_method_parentheses = false
-ij_java_spaces_within_parentheses = false
-ij_java_spaces_within_record_header = false
-ij_java_spaces_within_switch_parentheses = false
-ij_java_spaces_within_synchronized_parentheses = false
-ij_java_spaces_within_try_parentheses = false
-ij_java_spaces_within_while_parentheses = false
-ij_java_special_else_if_treatment = true
-ij_java_subclass_name_suffix = Impl
-ij_java_ternary_operation_signs_on_next_line = false
-ij_java_ternary_operation_wrap = off
-ij_java_test_name_suffix = Test
-ij_java_throws_keyword_wrap = normal
-ij_java_throws_list_wrap = off
-ij_java_use_external_annotations = false
-ij_java_use_fq_class_names = false
-ij_java_use_relative_indents = false
-ij_java_use_single_class_imports = true
-ij_java_variable_annotation_wrap = normal
-ij_java_visibility = public
-ij_java_while_brace_force = never
-ij_java_while_on_new_line = false
-ij_java_wrap_comments = false
-ij_java_wrap_first_method_in_call_chain = false
-ij_java_wrap_long_lines = false
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,39 +1,33 @@
 name: build
-on:
-    push:
-        paths-ignore:
-            - '.github/**'
-            - '*.md'
-    pull_request:
-        paths-ignore:
-            - '.github/**'
-            - '*.md'
+on: [pull_request, push]

 jobs:
-    build:
-        runs-on: ubuntu-latest
-        
-        steps:
-            -   uses: actions/checkout@v4
-
-            -   uses: actions/setup-java@v4
-                with:
-                    distribution: temurin
-                    java-version: 21
-
-            -   name: Setup Gradle
-                uses: gradle/actions/setup-gradle@v3
-                with:
-                    cache-read-only: false
-
-            -   name: Change wrapper permissions
-                run: chmod +x ./gradlew
-
-            -   name: Run build with Gradle Wrapper
-                run: ./gradlew build
-
-            -   name: Upload built JARs
-                uses: actions/upload-artifact@v4
-                with:
-                    name: skin-restorer-artifacts
-                    path: ./*/build/libs/*.jar
+  build:
+    strategy:
+      matrix:
+        java: [
+          17,
+        ]
+        os: [ubuntu-22.04]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v3
+      - name: validate gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: setup jdk ${{ matrix.java }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.java }}
+          distribution: 'microsoft'
+      - name: make gradle wrapper executable
+        if: ${{ runner.os != 'Windows' }}
+        run: chmod +x ./gradlew
+      - name: build
+        run: ./gradlew build
+      - name: capture build artifacts
+        if: ${{ runner.os == 'Linux' && matrix.java == '17' }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: Artifacts
+          path: build/libs/
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,39 +0,0 @@
-name: release
-on:
-    push:
-        tags:
-            - "v**"
-    workflow_dispatch:
-
-jobs:
-    release:
-        environment: release
-        runs-on: ubuntu-latest
-        
-        steps:
-            -   uses: actions/checkout@v4
-
-            -   uses: actions/setup-java@v4
-                with:
-                    distribution: temurin
-                    java-version: 21
-
-            -   name: Setup Gradle
-                uses: gradle/actions/setup-gradle@v3
-                with:
-                    cache-read-only: false
-
-            -   name: Change wrapper permissions
-                run: chmod +x ./gradlew
-
-            -   name: Publish to CurseForge, Modrinth
-                run: ./gradlew build publishMods
-                env:
-                    CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
-                    MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
-
-            -   name: Upload built JARs
-                uses: actions/upload-artifact@v4
-                with:
-                    name: skin-restorer-artifacts
-                    path: ./*/build/libs/*.jar
--- a/.gitignore
+++ b/.gitignore
@@ -28,5 +28,6 @@ bin/

 *.DS_Store

-.architectury-transformer/
+# fabric
+
 run/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,87 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [2.1.0] - 2024-09-26
-### Added
- Added `config reload` command for dynamic configuration updates
- Added `refreshSkinOnJoin` config option (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#refreshskinonjoin))
- Implemented caching for skin providers
- Added provider configurations (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#providers))
- Added username and url validation for requests
-### Fixed
- Fixed old skin directory migration not working
- Prevented overwriting existing skin files during migration
-
-## [2.0.3] - 2024-08-20
-### Added
- Added `firstJoinSkinProvider` config option (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Config#firstjoinskinprovider))
-### Fixed
- Fixed ability to set config values to `null`
-
-## [2.0.2] - 2024-08-04
-### Added
- Backported to minecraft 1.20-1.20.2
- [Forge] Added support for Forge
-### Changed
- Changed minimum java version to 17 for minecraft 1.20-1.20.4
-
-## [2.0.1] - 2024-07-16
-### Added
- Added Traditional Chinese translation ([#24](https://github.com/Suiranoil/SkinRestorer/pull/24)) - *yichifauzi*, *notlin4*
-### Fixed
- Fixed concurrent modification exception
-
-## [2.0.0] - 2024-07-03
-### Added
- Added support for NeoForge
- Added support for singleplayer
- Added ely.by skin provider
- Added `/skin refresh` command to get up-to-date skin
- Added `/skin reset` command to remove skin data
- Added proper support for secure servers
- Added support for permissions api
- Added translations
-### Changed
- Changed to save skin data per world
-### Fixed
- Fixed entity flickering on skin reload
- Fixed player being left in invalid state on skin reload if on death screen
-
-## [1.2.6] - 2024-06-25
-### Added
- Added support for command blocks
-### Changed
- Changed to better skin refresh logic
-### Fixed
- Fixed no permission level for /skin clear targets
- Fixed loading world screen on skin change
-
-## [1.2.4] - 2023-09-30
-### Fixed
- Fixed player stops riding entity with skin change
- Fixed armor and hand items not displaying with skin change
-
-## [1.2.3] - 2023-06-10
-### Changed
- Updated to 1.20-1.20.1
-
-## [1.2.2] - 2022-12-21
-### Changed
- Updated to 1.19.3
-
-## [1.2.1] - 2022-11-24
-### Fixed
- Fixed incorrect filepath resolvement on linux systems
-
-## [1.2.0] - 2022-11-18
-### Added
- Added support for fake players ([#4](https://github.com/Suiranoil/SkinRestorer/pull/4)) - *CaveNightingale*
-### Changed
- Allow player to apply their skin changes immediately ([#4](https://github.com/Suiranoil/SkinRestorer/pull/4)) - _CaveNightingale_
-
-## [1.0.4] - 2021-08-28
-### Fixed
- Fixed "invalid player data" exception
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -1,9 +0,0 @@
-### Added
- Added `config reload` command for dynamic configuration updates
- Added `refreshSkinOnJoin` config option (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#refreshskinonjoin))
- Implemented caching for skin providers
- Added provider configurations (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#providers))
- Added username and url validation for requests
-### Fixed
- Fixed old skin directory migration not working
- Prevented overwriting existing skin files during migration
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2021-2024 Lionarius
+Copyright (c) 2021 LionariusPy

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@@ -1,34 +1,13 @@
 # SkinRestorer
+![GitHub License](https://img.shields.io/github/license/Suiranoil/SkinRestorer)
+![Build](https://github.com/Suiranoil/SkinRestorer/actions/workflows/build.yml/badge.svg)
+![Enviroment](https://img.shields.io/badge/enviroment-server-orangered)
+[![CurseForge Downloads](https://cf.way2muchnoise.eu/skinrestorer.svg)](https://www.curseforge.com/minecraft/mc-mods/skinrestorer)
+[![Modrinth Downloads](https://img.shields.io/modrinth/dt/skinrestorer?logo=modrinth)](https://modrinth.com/mod/skinrestorer)

-<a href="https://modrinth.com/mod/skinrestorer"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/minecraft/platform/modrinth/mini/badge.svg" alt="Modrinth" height="32"></a>
-<a href="https://www.curseforge.com/minecraft/mc-mods/skinrestorer"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/minecraft/platform/curseforge/mini/badge.svg" alt="CurseForge" height="32"></a>

-A server-side mod for managing and restoring player skins.
+This is a server-side only mod for fabric.

-## ✨ Features
+It allows you to use and change skins on servers that are in offline/insecure mode.

- **Set skins from Mojang Account**: Fetch and apply skins using a valid Minecraft username.
- **Set skins from Ely.by**: Fetch and apply skins using a valid [Ely.by](https://ely.by/) username.
- **Set skins from URL**: Fetch and apply skins from any image URL, supporting both classic (Steve) and slim (Alex) skin models.
- **Automatic skin fetching**: Automatically fetch skin from Mojang/Ely.by when a player joins the server running in offline/insecure mode ([configurable](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration)).
- **Singleplayer support**: Apply skins individually for each world.
- **Permissions API support**
-
-## 📜 Command Usage Guide
-
-For a detailed list of available commands and their usage, please visit the [commands wiki page](https://github.com/Suiranoil/SkinRestorer/wiki/Commands).
-
-## ❌ Known Incompatibilities
-
- **[Arclight](https://github.com/IzzelAliz/Arclight) (<=1.20.1)**: Trials or older versions are not compatible due to mixin conflicts.
-  As an alternative, consider using the [SkinsRestorer](https://www.spigotmc.org/resources/skinsrestorer.2124/) plugin.
-
-## 🪙 Donation
-
-If you enjoy using **SkinRestorer** and would like to support its development, you can contribute through cryptocurrency donations.
-
-Bitcoin (BTC): `1Ndbwny8pxdnWXFgadp95fp97y5JqMJKTX`\
-USDT (TRC20): `TGXn8wrqku5KLzwPWQAeH7wgnV4UzwHEae`\
-USDT (TON): `UQAQF18Xlmx-V1oZ90C2YOju5qI7q1LgrCP5QaIUhqIELmDS`
-
-Thank you for your generosity!
+After installation on server use /skin command to change skin. 
--- a/build.gradle
+++ b/build.gradle
@@ -1,13 +1,44 @@
 plugins {
-    // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.7-SNAPSHOT' apply false
-    // see https://projects.neoforged.net/neoforged/neogradle for new versions
-    id 'net.neoforged.gradle.userdev' version '7.0.153' apply false
-    // see https://files.minecraftforge.net/net/minecraftforge/gradle/ForgeGradle/ for new versions
-    id 'net.minecraftforge.gradle' version '6.0.26' apply false
-    id 'org.parchmentmc.librarian.forgegradle' version '1.+' apply false
-
-    id 'org.spongepowered.mixin' version '0.7-SNAPSHOT' apply false
-
-    id 'me.modmuss50.mod-publish-plugin' version '0.6.3' apply false
+	id 'fabric-loom' version '1.3-SNAPSHOT'
+}
+
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
+
+archivesBaseName = project.archives_base_name
+version = "${project.mod_version}+${project.minecraft_version}"
+group = project.maven_group
+
+repositories {
+	maven { url = "https://masa.dy.fi/maven" }
+}
+
+dependencies {
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+}
+
+processResources {
+	inputs.property "version", project.version
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.encoding = "UTF-8"
+
+	it.options.release.set(17)
+}
+
+java {
+	withSourcesJar()
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
 }
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -1,3 +0,0 @@
-plugins {
-    id 'groovy-gradle-plugin'
-}
--- a/buildSrc/src/main/groovy/multiloader-common.gradle
+++ b/buildSrc/src/main/groovy/multiloader-common.gradle
@@ -1,107 +0,0 @@
-plugins {
-    id 'java-library'
-}
-
-base {
-    archivesName = "${mod_id}"
-    version = "${mod_version}+${minecraft_version}-${project.name}"
-}
-
-java {
-    toolchain.languageVersion = JavaLanguageVersion.of(java_version)
-    withSourcesJar()
-}
-
-repositories {
-    mavenCentral()
-    maven {
-        name = 'ParchmentMC'
-        url = 'https://maven.parchmentmc.org'
-    }
-    maven {
-        name = 'Fabric'
-        url = 'https://maven.fabricmc.net'
-    }
-    maven {
-        name = 'Forge'
-        url = 'https://maven.minecraftforge.net'
-    }
-    maven {
-        name = 'NeoForge'
-        url = 'https://maven.neoforged.net/releases'
-    }
-    exclusiveContent {
-        forRepository {
-            maven {
-                name = 'Sponge'
-                url = 'https://repo.spongepowered.org/repository/maven-public'
-            }
-        }
-        filter {
-            includeGroupAndSubgroups('org.spongepowered')
-        }
-    }
-}
-
-// Declare capabilities on the outgoing configurations.
-// Read more about capabilities here: https://docs.gradle.org/current/userguide/component_capabilities.html#sec:declaring-additional-capabilities-for-a-local-component
-['apiElements', 'runtimeElements', 'sourcesElements'].each { variant ->
-    configurations."$variant".outgoing {
-        capability("$group:${base.archivesName.get()}:$version")
-        capability("$group:$mod_id-${project.name}:$version")
-        capability("$group:$mod_id:$version")
-    }
-}
-
-sourcesJar {
-    from(rootProject.file('LICENSE')) {
-        rename { "${it}_${mod_name}" }
-    }
-}
-
-jar {
-    from(rootProject.file('LICENSE')) {
-        rename { "${it}_${mod_name}" }
-    }
-
-    manifest {
-        attributes([
-                'Specification-Title'   : mod_name,
-                'Specification-Vendor'  : mod_author,
-                'Specification-Version' : project.jar.archiveVersion,
-                'Implementation-Title'  : project.name,
-                'Implementation-Version': project.jar.archiveVersion,
-                'Implementation-Vendor' : mod_author,
-                'Built-On-Minecraft'    : minecraft_version
-        ])
-    }
-}
-
-processResources {
-    def expandProps = [
-            'version'                      : version,
-            'group'                        : project.group, //Else we target the task's group.
-            'minecraft_version'            : minecraft_version,
-            'minecraft_version_range'      : minecraft_version_range,
-            'fabric_loader_version'        : fabric_loader_version,
-            'mod_name'                     : mod_name,
-            'mod_author'                   : mod_author,
-            'mod_id'                       : mod_id,
-            'mod_homepage'                 : mod_homepage,
-            'mod_sources'                  : mod_sources,
-            'mod_issues'                   : mod_issues,
-            'license'                      : license,
-            'description'                  : project.description,
-            'forge_version'                : forge_version,
-            'forge_loader_version_range'   : forge_loader_version_range,
-            'neoforge_version'             : neoforge_version,
-            'neoforge_loader_version_range': neoforge_loader_version_range,
-            'credits'                      : credits,
-            'java_version'                 : java_version
-    ]
-
-    filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', 'META-INF/neoforge.mods.toml', '*.mixins.json']) {
-        expand expandProps
-    }
-    inputs.properties(expandProps)
-}
--- a/buildSrc/src/main/groovy/multiloader-loader.gradle
+++ b/buildSrc/src/main/groovy/multiloader-loader.gradle
@@ -1,39 +0,0 @@
-plugins {
-    id 'multiloader-common'
-}
-
-configurations {
-    commonJava{
-        canBeResolved = true
-    }
-    commonResources{
-        canBeResolved = true
-    }
-}
-
-dependencies {
-    compileOnly(project(':common')) {
-        capabilities {
-            requireCapability "$group:$mod_id"
-        }
-    }
-    commonJava project(path: ':common', configuration: 'commonJava')
-    commonResources project(path: ':common', configuration: 'commonResources')
-}
-
-tasks.named('compileJava', JavaCompile) {
-    dependsOn(configurations.commonJava)
-    source(configurations.commonJava)
-}
-
-processResources {
-    dependsOn(configurations.commonResources)
-    from(configurations.commonResources)
-}
-
-tasks.named('sourcesJar', Jar) {
-    dependsOn(configurations.commonJava)
-    from(configurations.commonJava)
-    dependsOn(configurations.commonResources)
-    from(configurations.commonResources)
-}
--- a/buildSrc/src/main/groovy/multiloader-publish.gradle
+++ b/buildSrc/src/main/groovy/multiloader-publish.gradle
@@ -1,35 +0,0 @@
-plugins {
-    id "me.modmuss50.mod-publish-plugin"
-}
-
-publishMods {
-    if (project.name == 'fabric')
-        file = remapJar.archiveFile
-    else
-        file = jar.archiveFile
-
-    modLoaders.add(project.name)
-    type = STABLE
-    version = project.version
-    displayName = "[${project.name.capitalize()}] ${mod_name} ${mod_version}"
-    changelog = rootProject.file('CHANGELOG_LATEST.md').text
-
-    curseforge {
-        projectId = curseforge_id
-
-        dryRun = providers.environmentVariable("CURSEFORGE_API_KEY").getOrNull() == null
-        accessToken = providers.environmentVariable("CURSEFORGE_API_KEY")
-
-        minecraftVersions.addAll(minecraft_version_list.split(','))
-        serverRequired = true
-    }
-
-    modrinth {
-        projectId = modrinth_id
-
-        dryRun = providers.environmentVariable("MODRINTH_TOKEN").getOrNull() == null
-        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-
-        minecraftVersions.addAll(minecraft_version_list.split(','))
-    }
-}
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,41 +0,0 @@
-plugins {
-    id 'multiloader-common'
-    
-    id 'fabric-loom'
-}
-
-dependencies {
-    minecraft "com.mojang:minecraft:${minecraft_version}"
-    mappings loom.layered {
-        officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
-    }
-    compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
-}
-
-loom {
-    def aw = project.file("src/main/resources/${mod_id}.accesswidener")
-    if (aw.exists()) {
-        accessWidenerPath.set(aw)
-    }
-    
-    mixin {
-        useLegacyMixinAp = false
-    }
-}
-
-configurations {
-    commonJava {
-        canBeResolved = false
-        canBeConsumed = true
-    }
-    commonResources {
-        canBeResolved = false
-        canBeConsumed = true
-    }
-}
-
-artifacts {
-    commonJava sourceSets.main.java.sourceDirectories.singleFile
-    commonResources sourceSets.main.resources.sourceDirectories.singleFile
-}
--- a/common/gradle.properties
+++ b/common/gradle.properties
@@ -1 +0,0 @@
-fabric.loom.dontRemap = true
--- a/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
@@ -1,158 +0,0 @@
-package net.lionarius.skinrestorer;
-
-import com.mojang.authlib.GameProfile;
-import net.lionarius.skinrestorer.config.BuiltInProviderConfig;
-import net.lionarius.skinrestorer.config.Config;
-import net.lionarius.skinrestorer.platform.Services;
-import net.lionarius.skinrestorer.skin.SkinIO;
-import net.lionarius.skinrestorer.skin.SkinStorage;
-import net.lionarius.skinrestorer.skin.SkinValue;
-import net.lionarius.skinrestorer.skin.provider.*;
-import net.lionarius.skinrestorer.translation.Translation;
-import net.lionarius.skinrestorer.util.FileUtils;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.lionarius.skinrestorer.util.Result;
-import net.lionarius.skinrestorer.util.WebUtils;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.storage.LevelResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-
-public final class SkinRestorer {
-    public static final String MOD_ID = "skinrestorer";
-    public static final Logger LOGGER = LoggerFactory.getLogger("SkinRestorer");
-    
-    private static final SkinProviderRegistry providersRegistry = new SkinProviderRegistry();
-    private static SkinStorage skinStorage;
-    private static Path configDir;
-    private static Config config;
-    
-    private SkinRestorer() {}
-    
-    public static SkinStorage getSkinStorage() {
-        return SkinRestorer.skinStorage;
-    }
-    
-    public static Path getConfigDir() {
-        return SkinRestorer.configDir;
-    }
-    
-    public static Config getConfig() {
-        return SkinRestorer.config;
-    }
-    
-    public static SkinProviderRegistry getProvidersRegistry() {
-        return SkinRestorer.providersRegistry;
-    }
-    
-    public static Optional<SkinProvider> getProvider(String name) {
-        return Optional.ofNullable(SkinRestorer.providersRegistry.get(name));
-    }
-    
-    public static void onInitialize() {
-        SkinRestorer.configDir = Services.PLATFORM.getConfigDirectory().resolve(SkinRestorer.MOD_ID);
-        SkinRestorer.reloadConfig();
-        
-        SkinRestorer.providersRegistry.register(EmptySkinProvider.PROVIDER_NAME, SkinProvider.EMPTY, false);
-        
-        SkinRestorer.registerDefaultSkinProvider(MojangSkinProvider.PROVIDER_NAME, SkinProvider.MOJANG, SkinRestorer.getConfig().providersConfig().mojang());
-        SkinRestorer.registerDefaultSkinProvider(ElyBySkinProvider.PROVIDER_NAME, SkinProvider.ELY_BY, SkinRestorer.getConfig().providersConfig().ely_by());
-        SkinRestorer.registerDefaultSkinProvider(MineskinSkinProvider.PROVIDER_NAME, SkinProvider.MINESKIN, SkinRestorer.getConfig().providersConfig().mineskin());
-    }
-    
-    private static void registerDefaultSkinProvider(String defaultName, SkinProvider provider, BuiltInProviderConfig config) {
-        var isDefaultName = config.name().equals(defaultName);
-        SkinRestorer.providersRegistry.register(defaultName, provider, config.enabled() && isDefaultName);
-        
-        if (!isDefaultName && Arrays.stream(SkinProvider.BUILTIN_PROVIDER_NAMES).noneMatch(name -> name.equals(config.name())))
-            SkinRestorer.providersRegistry.register(config.name(), provider, config.enabled());
-    }
-    
-    public static void onServerStarted(MinecraftServer server) {
-        Path worldSkinDirectory = server.getWorldPath(LevelResource.ROOT).resolve(SkinRestorer.MOD_ID);
-        FileUtils.tryMigrateOldSkinDirectory(SkinRestorer.getConfigDir(), worldSkinDirectory);
-        
-        SkinRestorer.skinStorage = new SkinStorage(new SkinIO(worldSkinDirectory));
-    }
-    
-    public static void reloadConfig() {
-        SkinRestorer.config = Config.load(SkinRestorer.getConfigDir());
-        Translation.reloadTranslations();
-        WebUtils.recreateHttpClient();
-        
-        MojangSkinProvider.createCache();
-        ElyBySkinProvider.createCache();
-        MineskinSkinProvider.createCache();
-    }
-    
-    public static String assetPath(String name) {
-        return String.format("/assets/%s/%s", SkinRestorer.MOD_ID, name);
-    }
-    
-    public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<GameProfile> targets, SkinValue value, boolean save) {
-        var acceptedPlayers = new HashSet<ServerPlayer>();
-        
-        for (var profile : targets) {
-            if (!SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId()))
-                value = value.setOriginalValue(PlayerUtils.getPlayerSkin(profile));
-            
-            if (save)
-                SkinRestorer.getSkinStorage().setSkin(profile.getId(), value);
-            
-            if (PlayerUtils.areSkinPropertiesEquals(value.value(), PlayerUtils.getPlayerSkin(profile)))
-                continue;
-            
-            PlayerUtils.applyRestoredSkin(profile, value.value());
-            
-            var player = server.getPlayerList().getPlayer(profile.getId());
-            if (player == null)
-                continue;
-            
-            PlayerUtils.refreshPlayer(player);
-            acceptedPlayers.add(player);
-        }
-        
-        return acceptedPlayers;
-    }
-    
-    public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<GameProfile> targets, SkinValue value) {
-        return SkinRestorer.applySkin(server, targets, value, true);
-    }
-    
-    public static CompletableFuture<Result<Collection<ServerPlayer>, String>> setSkinAsync(
-            MinecraftServer server,
-            Collection<GameProfile> targets,
-            SkinProviderContext context,
-            boolean save
-    ) {
-        return CompletableFuture.supplyAsync(
-                        () -> SkinRestorer.getProvider(context.name()).map(provider -> provider.fetchSkin(context.argument(), context.variant()))
-                )
-                .thenApplyAsync(result -> {
-                    if (result.isEmpty())
-                        return Result.<Collection<ServerPlayer>, String>error("provider '" + context.name() + "' is not registered");
-                    
-                    var skinResult = result.get();
-                    if (skinResult.isError())
-                        return Result.<Collection<ServerPlayer>, String>error(skinResult.getErrorValue().getMessage());
-                    
-                    var skinValue = SkinValue.fromProviderContextWithValue(context, skinResult.getSuccessValue().orElse(null));
-                    
-                    var acceptedPlayers = SkinRestorer.applySkin(server, targets, skinValue, save);
-                    
-                    return Result.<Collection<ServerPlayer>, String>success(acceptedPlayers);
-                }, server)
-                .exceptionally(e -> {
-                    SkinRestorer.LOGGER.error(e.toString());
-                    return Result.error(e.getMessage());
-                });
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
@@ -1,265 +0,0 @@
-package net.lionarius.skinrestorer.command;
-
-import com.mojang.authlib.GameProfile;
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.StringArgumentType;
-import com.mojang.brigadier.builder.ArgumentBuilder;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
-import com.mojang.brigadier.context.CommandContext;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.SkinValue;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
-import net.lionarius.skinrestorer.skin.provider.SkinProvider;
-import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
-import net.lionarius.skinrestorer.translation.Translation;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.arguments.GameProfileArgument;
-import net.minecraft.server.level.ServerPlayer;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
-
-import static net.minecraft.commands.Commands.argument;
-import static net.minecraft.commands.Commands.literal;
-
-public final class SkinCommand {
-    
-    private SkinCommand() {}
-    
-    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-        LiteralArgumentBuilder<CommandSourceStack> base =
-                literal("skin")
-                        .then(buildSetSubcommand("clear", SkinValue.EMPTY::toProviderContext))
-                        .then(literal("reset")
-                                .executes(context -> resetSubcommand(context.getSource()))
-                                .then(makeTargetsArgument(
-                                        (context, profiles) -> resetSubcommand(context.getSource(), profiles, true)
-                                )))
-                        .then(literal("refresh").executes(context -> refreshSubcommand(context.getSource())));
-        
-        LiteralArgumentBuilder<CommandSourceStack> set = literal("set");
-        
-        var providers = SkinRestorer.getProvidersRegistry().getPublicProviders();
-        for (var entry : providers)
-            set.then(buildSetSubcommand(entry.first(), entry.second()));
-        if (!providers.isEmpty())
-            base.then(set);
-        
-        base.then(
-                literal("config")
-                        .requires(commandSourceStack -> commandSourceStack.hasPermission(4))
-                        .then(literal("reload").executes(SkinCommand::configReloadSubcommand))
-        );
-        
-        dispatcher.register(base);
-    }
-    
-    private static int refreshSubcommand(
-            CommandSourceStack src
-    ) {
-        var player = src.getPlayer();
-        if (player == null)
-            return 0;
-        
-        var profile = player.getGameProfile();
-        
-        SkinProviderContext context = null;
-        var save = true;
-        if (!SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {
-            if (profile.getProperties().containsKey(PlayerUtils.TEXTURES_KEY)) {
-                save = false;
-                context = MojangSkinProvider.skinProviderContextFromProfile(profile);
-            }
-        } else {
-            context = SkinRestorer.getSkinStorage().getSkin(profile.getId()).toProviderContext();
-        }
-        
-        if (context == null)
-            return 0;
-        
-        return SkinCommand.setSubcommand(src, Collections.singleton(profile), context, save, false);
-    }
-    
-    private static int resetSubcommand(
-            CommandSourceStack src,
-            Collection<GameProfile> targets,
-            boolean setByOperator
-    ) {
-        Collection<ServerPlayer> updatedPlayers = new HashSet<>();
-        for (var profile : targets) {
-            SkinValue skin = null;
-            if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId()))
-                skin = SkinRestorer.getSkinStorage().getSkin(profile.getId()).replaceValueWithOriginal();
-            
-            if (skin == null)
-                continue;
-            
-            var updatedPlayer = SkinRestorer.applySkin(src.getServer(), Collections.singleton(profile), skin, false);
-            SkinRestorer.getSkinStorage().deleteSkin(profile.getId());
-            
-            updatedPlayers.addAll(updatedPlayer);
-        }
-        
-        SkinCommand.sendResponse(src, updatedPlayers, setByOperator);
-        
-        return targets.size();
-    }
-    
-    private static int resetSubcommand(
-            CommandSourceStack src
-    ) {
-        if (src.getPlayer() == null)
-            return 0;
-        
-        return resetSubcommand(src, Collections.singleton(src.getPlayer().getGameProfile()), false);
-    }
-    
-    private static int setSubcommand(
-            CommandSourceStack src,
-            Collection<GameProfile> targets,
-            SkinProviderContext context,
-            boolean save,
-            boolean setByOperator
-    ) {
-        src.sendSystemMessage(Translation.translatableWithFallback(Translation.COMMAND_SKIN_LOADING_KEY));
-        
-        SkinRestorer.setSkinAsync(src.getServer(), targets, context, save).thenAccept(result -> {
-            if (result.isError()) {
-                src.sendFailure(Translation.translatableWithFallback(
-                        Translation.COMMAND_SKIN_FAILED_KEY,
-                        result.getErrorValue()
-                ));
-                return;
-            }
-            
-            var updatedPlayers = result.getSuccessValue();
-            
-            SkinCommand.sendResponse(src, updatedPlayers, setByOperator);
-        });
-        
-        return targets.size();
-    }
-    
-    private static int setSubcommand(
-            CommandSourceStack src,
-            Collection<GameProfile> targets,
-            SkinProviderContext context,
-            boolean setByOperator
-    ) {
-        return SkinCommand.setSubcommand(src, targets, context, true, setByOperator);
-    }
-    
-    private static int setSubcommand(
-            CommandSourceStack src,
-            SkinProviderContext context
-    ) {
-        if (src.getPlayer() == null)
-            return 0;
-        
-        return setSubcommand(src, Collections.singleton(src.getPlayer().getGameProfile()), context, false);
-    }
-    
-    private static int configReloadSubcommand(CommandContext<CommandSourceStack> context) {
-        SkinRestorer.reloadConfig();
-        
-        context.getSource().sendSuccess(() -> Translation.translatableWithFallback(
-                Translation.COMMAND_SKIN_CONFIG_RELOADED_KEY
-        ), true);
-        
-        return 0;
-    }
-    
-    private static void sendResponse(CommandSourceStack src, Collection<ServerPlayer> updatedPlayers, boolean setByOperator) {
-        if (updatedPlayers.isEmpty()) {
-            src.sendSuccess(() -> Translation.translatableWithFallback(
-                    Translation.COMMAND_SKIN_NO_CHANGES_KEY
-            ), true);
-            return;
-        }
-        
-        if (setByOperator) {
-            var playersComponent = PlayerUtils.createPlayerListComponent(updatedPlayers);
-            
-            src.sendSuccess(() -> Translation.translatableWithFallback(
-                    Translation.COMMAND_SKIN_AFFECTED_PLAYERS_KEY,
-                    playersComponent
-            ), true);
-        } else {
-            src.sendSuccess(() -> Translation.translatableWithFallback(
-                    Translation.COMMAND_SKIN_OK_KEY
-            ), true);
-        }
-    }
-    
-    private static LiteralArgumentBuilder<CommandSourceStack> buildSetSubcommand(String name, SkinProvider provider) {
-        LiteralArgumentBuilder<CommandSourceStack> action = literal(name);
-        
-        if (provider.hasVariantSupport()) {
-            for (SkinVariant variant : SkinVariant.values()) {
-                action.then(
-                        literal(variant.toString())
-                                .then(buildSetSubcommandArgument(
-                                        argument(provider.getArgumentName(), StringArgumentType.string()),
-                                        context -> {
-                                            var argument = StringArgumentType.getString(context, provider.getArgumentName());
-                                            return new SkinProviderContext(name, argument, variant);
-                                        }
-                                ))
-                );
-            }
-        } else {
-            action.then(
-                    buildSetSubcommandArgument(
-                            argument(provider.getArgumentName(), StringArgumentType.string()),
-                            context -> {
-                                var argument = StringArgumentType.getString(context, provider.getArgumentName());
-                                return new SkinProviderContext(name, argument, null);
-                            }
-                    )
-            );
-        }
-        
-        return action;
-    }
-    
-    private static ArgumentBuilder<CommandSourceStack, LiteralArgumentBuilder<CommandSourceStack>> buildSetSubcommand(
-            String name,
-            Supplier<SkinProviderContext> supplier
-    ) {
-        return buildSetSubcommandArgument(literal(name), context -> supplier.get());
-    }
-    
-    private static <T extends ArgumentBuilder<CommandSourceStack, T>> ArgumentBuilder<CommandSourceStack, T> buildSetSubcommandArgument(
-            ArgumentBuilder<CommandSourceStack, T> argument,
-            Function<CommandContext<CommandSourceStack>, SkinProviderContext> provider
-    ) {
-        return argument
-                .executes(context -> setSubcommand(
-                        context.getSource(),
-                        provider.apply(context)
-                ))
-                .then(makeTargetsArgument(
-                        (context, targets) -> setSubcommand(
-                                context.getSource(),
-                                targets,
-                                provider.apply(context),
-                                true
-                        )
-                ));
-    }
-    
-    private static RequiredArgumentBuilder<CommandSourceStack, GameProfileArgument.Result> makeTargetsArgument(
-            BiFunction<CommandContext<CommandSourceStack>, Collection<GameProfile>, Integer> consumer
-    ) {
-        return argument("targets", GameProfileArgument.gameProfile())
-                .requires(source -> source.hasPermission(2))
-                .executes(context -> consumer.apply(context, GameProfileArgument.getGameProfiles(context, "targets")));
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/BuiltInProviderConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/BuiltInProviderConfig.java
@@ -1,7 +0,0 @@
-package net.lionarius.skinrestorer.config;
-
-public record BuiltInProviderConfig(boolean enabled, String name, CacheConfig cache) {
-    public boolean isValid() {
-        return this.name != null && this.cache != null && !this.name.isEmpty() && this.cache.isValid();
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/CacheConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/CacheConfig.java
@@ -1,7 +0,0 @@
-package net.lionarius.skinrestorer.config;
-
-public record CacheConfig(boolean enabled, long duration) {
-    public boolean isValid() {
-        return this.duration > 0;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/Config.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/Config.java
@@ -1,116 +0,0 @@
-package net.lionarius.skinrestorer.config;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.util.FileUtils;
-import net.lionarius.skinrestorer.util.JsonUtils;
-
-import java.nio.file.Path;
-import java.util.Optional;
-
-public final class Config {
-    
-    public static final String CONFIG_FILENAME = "config.json";
-    
-    
-    private String language = "en_us";
-    
-    private boolean refreshSkinOnJoin = true;
-    
-    private boolean fetchSkinOnFirstJoin = true;
-    
-    private FirstJoinSkinProvider firstJoinSkinProvider = FirstJoinSkinProvider.MOJANG;
-    
-    private String proxy = "";
-    private transient Proxy parsedProxy = null;
-    
-    private long requestTimeout = 10;
-    
-    private ProvidersConfig providers = ProvidersConfig.DEFAULT;
-    
-    public String language() {
-        return this.language;
-    }
-    
-    public boolean refreshSkinOnJoin() {
-        return this.refreshSkinOnJoin;
-    }
-    
-    public boolean fetchSkinOnFirstJoin() {
-        return this.fetchSkinOnFirstJoin;
-    }
-    
-    public FirstJoinSkinProvider firstJoinSkinProvider() {
-        return this.firstJoinSkinProvider;
-    }
-    
-    public Optional<Proxy> proxy() {
-        return Optional.ofNullable(this.parsedProxy);
-    }
-    
-    public long requestTimeout() {
-        return this.requestTimeout;
-    }
-    
-    public ProvidersConfig providersConfig() {
-        return this.providers;
-    }
-    
-    public static Config load(Path path) {
-        var configFile = path.resolve(Config.CONFIG_FILENAME);
-        
-        Config config = null;
-        try {
-            config = JsonUtils.fromJson(FileUtils.readFile(configFile), Config.class);
-        } catch (Exception e) {
-            SkinRestorer.LOGGER.warn("Could not load config", e);
-        }
-        
-        if (config == null)
-            config = new Config();
-        
-        config.verifyAndFix();
-        
-        FileUtils.writeFile(path.resolve(Config.CONFIG_FILENAME), JsonUtils.toJson(config));
-        
-        return config;
-    }
-    
-    private void verifyAndFix() {
-        if (this.language == null || this.language.isEmpty()) {
-            SkinRestorer.LOGGER.warn("Language config is null or empty, defaulting to 'en_us'");
-            this.language = "en_us";
-        }
-        
-        if (this.firstJoinSkinProvider == null) {
-            SkinRestorer.LOGGER.warn("FirstJoinSkinProvider config is null, defaulting to MOJANG");
-            this.firstJoinSkinProvider = FirstJoinSkinProvider.MOJANG;
-        }
-        
-        if (this.proxy == null) {
-            SkinRestorer.LOGGER.warn("Proxy config is null, defaulting to an empty string");
-            this.proxy = "";
-        }
-        
-        if (!this.proxy.isEmpty()) {
-            try {
-                this.parsedProxy = Proxy.parse(this.proxy);
-            } catch (Exception e) {
-                SkinRestorer.LOGGER.warn("Could not parse proxy config", e);
-                this.parsedProxy = null;
-            }
-        }
-        
-        if (this.requestTimeout <= 0) {
-            SkinRestorer.LOGGER.warn("Request timeout config is less than or equal to 0, defaulting to 10");
-            this.requestTimeout = 10;
-        }
-        
-        if (this.providers == null) {
-            SkinRestorer.LOGGER.warn("Providers config is null, using default");
-            this.providers = ProvidersConfig.DEFAULT;
-        }
-        
-        if (!this.providers.isValid())
-            this.providers.fix();
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/FirstJoinSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/FirstJoinSkinProvider.java
@@ -1,22 +0,0 @@
-package net.lionarius.skinrestorer.config;
-
-import com.google.gson.annotations.SerializedName;
-import net.lionarius.skinrestorer.skin.provider.ElyBySkinProvider;
-import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
-
-public enum FirstJoinSkinProvider {
-    @SerializedName(value = "MOJANG", alternate = {"mojang"})
-    MOJANG(MojangSkinProvider.PROVIDER_NAME),
-    @SerializedName(value = "ELY.BY", alternate = {"ely.by", "ELY_BY", "ely_by"})
-    ELY_BY(ElyBySkinProvider.PROVIDER_NAME);
-    
-    private final String name;
-    
-    FirstJoinSkinProvider(String name) {
-        this.name = name;
-    }
-    
-    public String getName() {
-        return this.name;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/ProvidersConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/ProvidersConfig.java
@@ -1,65 +0,0 @@
-package net.lionarius.skinrestorer.config;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.provider.ElyBySkinProvider;
-import net.lionarius.skinrestorer.skin.provider.MineskinSkinProvider;
-import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
-
-public final class ProvidersConfig {
-    public static final ProvidersConfig DEFAULT = new ProvidersConfig(
-            new BuiltInProviderConfig(true, MojangSkinProvider.PROVIDER_NAME, new CacheConfig(true, 60)),
-            new BuiltInProviderConfig(true, ElyBySkinProvider.PROVIDER_NAME, new CacheConfig(true, 60)),
-            new BuiltInProviderConfig(true, MineskinSkinProvider.PROVIDER_NAME, new CacheConfig(true, 300))
-    );
-    
-    private BuiltInProviderConfig mojang;
-    private BuiltInProviderConfig ely_by;
-    private BuiltInProviderConfig mineskin;
-    
-    public ProvidersConfig(BuiltInProviderConfig mojang, BuiltInProviderConfig ely_by, BuiltInProviderConfig mineskin) {
-        this.mojang = mojang;
-        this.ely_by = ely_by;
-        this.mineskin = mineskin;
-    }
-    
-    public boolean isValid() {
-        if (this == ProvidersConfig.DEFAULT)
-            return true;
-        
-        return this.mojang == null || !this.mojang.isValid()
-               || this.ely_by == null || !this.ely_by.isValid()
-               || this.mineskin == null || !this.mineskin.isValid();
-    }
-    
-    public void fix() {
-        if (this == ProvidersConfig.DEFAULT)
-            return;
-        
-        if (this.mojang == null || !this.mojang.isValid()) {
-            SkinRestorer.LOGGER.warn("Mojang provider config is invalid, using default");
-            this.mojang = ProvidersConfig.DEFAULT.mojang();
-        }
-        
-        if (this.ely_by == null || !this.ely_by.isValid()) {
-            SkinRestorer.LOGGER.warn("Ely.By provider config is invalid, using default");
-            this.ely_by = ProvidersConfig.DEFAULT.ely_by();
-        }
-        
-        if (this.mineskin == null || !this.mineskin.isValid()) {
-            SkinRestorer.LOGGER.warn("Mineskin provider config is invalid, using default");
-            this.mineskin = ProvidersConfig.DEFAULT.mineskin();
-        }
-    }
-    
-    public BuiltInProviderConfig mojang() {
-        return this.mojang;
-    }
-    
-    public BuiltInProviderConfig ely_by() {
-        return this.ely_by;
-    }
-    
-    public BuiltInProviderConfig mineskin() {
-        return this.mineskin;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/Proxy.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/Proxy.java
@@ -1,21 +0,0 @@
-package net.lionarius.skinrestorer.config;
-
-import org.jetbrains.annotations.NotNull;
-
-public record Proxy(@NotNull String host, int port) {
-    
-    public static Proxy parse(@NotNull String proxy) {
-        var colonIndex = proxy.lastIndexOf(':');
-        if (colonIndex == -1)
-            throw new IllegalArgumentException("no port in hostname");
-        
-        var port = Integer.parseInt(proxy.substring(colonIndex + 1));
-        
-        if (port < 0 || port > 0xFFFF)
-            throw new IllegalArgumentException("port out of range: " + port);
-        
-        var host = proxy.substring(0, colonIndex);
-        
-        return new Proxy(host, port);
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/ChunkMapAccessor.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/ChunkMapAccessor.java
@@ -1,13 +0,0 @@
-package net.lionarius.skinrestorer.mixin;
-
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import net.minecraft.server.level.ChunkMap;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-@Mixin(ChunkMap.class)
-public interface ChunkMapAccessor {
-    
-    @Accessor
-    Int2ObjectMap<Object> getEntityMap();
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
@@ -1,45 +0,0 @@
-package net.lionarius.skinrestorer.mixin;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.minecraft.network.Connection;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.CommonListenerCookie;
-import net.minecraft.server.players.PlayerList;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Collections;
-import java.util.List;
-
-@Mixin(PlayerList.class)
-public abstract class PlayerListMixin {
-    
-    @Shadow
-    public abstract List<ServerPlayer> getPlayers();
-    
-    @Shadow @Final
-    private MinecraftServer server;
-    
-    @Inject(method = "remove", at = @At("TAIL"))
-    private void remove(ServerPlayer player, CallbackInfo ci) {
-        SkinRestorer.getSkinStorage().removeSkin(player.getUUID());
-    }
-    
-    @Inject(method = "removeAll", at = @At("HEAD"))
-    private void removeAll(CallbackInfo ci) {
-        for (ServerPlayer player : getPlayers()) {
-            SkinRestorer.getSkinStorage().removeSkin(player.getUUID());
-        }
-    }
-    
-    @Inject(method = "placeNewPlayer", at = @At("HEAD"))
-    private void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie, CallbackInfo ci) {
-        if (SkinRestorer.getSkinStorage().hasSavedSkin(player.getUUID()))
-            SkinRestorer.applySkin(server, Collections.singleton(player.getGameProfile()), SkinRestorer.getSkinStorage().getSkin(player.getUUID()));
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
@@ -1,88 +0,0 @@
-package net.lionarius.skinrestorer.mixin;
-
-import com.mojang.authlib.GameProfile;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.SkinValue;
-import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.lionarius.skinrestorer.util.Result;
-import net.minecraft.server.network.ServerLoginPacketListenerImpl;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.concurrent.CompletableFuture;
-
-@Mixin(ServerLoginPacketListenerImpl.class)
-public abstract class ServerLoginPacketListenerImplMixin {
-    
-    @Shadow @Nullable
-    private GameProfile authenticatedProfile;
-    
-    @Unique
-    private CompletableFuture<Void> skinrestorer$pendingSkin;
-    
-    @Inject(method = "verifyLoginAndFinishConnectionSetup", at = @At(value = "INVOKE",
-                                                                     target = "Lnet/minecraft/server/players/PlayerList;canPlayerLogin(Ljava/net/SocketAddress;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/network/chat/Component;"),
-            cancellable = true)
-    public void waitForSkin(CallbackInfo ci) {
-        if (skinrestorer$pendingSkin == null) {
-            skinrestorer$pendingSkin = CompletableFuture.supplyAsync(() -> {
-                final var profile = authenticatedProfile;
-                
-                assert profile != null;
-                var originalSkin = PlayerUtils.getPlayerSkin(profile);
-                
-                if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {
-                    if (originalSkin != null) { // update to the latest official skin
-                        var value = SkinRestorer.getSkinStorage().getSkin(profile.getId());
-                        SkinRestorer.getSkinStorage().setSkin(profile.getId(), value.setOriginalValue(originalSkin));
-                    }
-                    
-                    if (SkinRestorer.getConfig().refreshSkinOnJoin()) {
-                        var currentSkin = SkinRestorer.getSkinStorage().getSkin(profile.getId());
-                        var context = currentSkin.toProviderContext();
-                        
-                        skinrestorer$fetchSkin(profile, context);
-                    }
-                    
-                    return null;
-                }
-                
-                if (originalSkin == null && SkinRestorer.getConfig().fetchSkinOnFirstJoin()) {
-                    var context = new SkinProviderContext(
-                            SkinRestorer.getConfig().firstJoinSkinProvider().getName(),
-                            profile.getName(),
-                            null
-                    );
-                    skinrestorer$fetchSkin(profile, context);
-                }
-                
-                return null;
-            });
-        }
-        
-        if (!skinrestorer$pendingSkin.isDone())
-            ci.cancel();
-    }
-    
-    @Unique
-    private static void skinrestorer$fetchSkin(GameProfile profile, SkinProviderContext context) {
-        SkinRestorer.LOGGER.debug("fetching {}'s skin", profile.getName());
-        
-        var result = SkinRestorer.getProvider(context.name()).map(
-                provider -> provider.fetchSkin(context.argument(), context.variant())
-        ).orElseGet(() -> Result.error(new IllegalArgumentException("skin provider is not registered: " + context.name())));
-        
-        if (!result.isError()) {
-            var value = SkinValue.fromProviderContextWithValue(context, result.getSuccessValue().orElse(null));
-            SkinRestorer.getSkinStorage().setSkin(profile.getId(), value);
-        } else {
-            SkinRestorer.LOGGER.warn("failed to fetch skin", result.getErrorValue());
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/TrackedEntityAccessorInvoker.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/TrackedEntityAccessorInvoker.java
@@ -1,22 +0,0 @@
-package net.lionarius.skinrestorer.mixin;
-
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ServerPlayerConnection;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
-import org.spongepowered.asm.mixin.gen.Invoker;
-
-import java.util.Set;
-
-@Mixin(targets = "net.minecraft.server.level.ChunkMap$TrackedEntity")
-public interface TrackedEntityAccessorInvoker {
-    
-    @Accessor
-    Set<ServerPlayerConnection> getSeenBy();
-    
-    @Invoker
-    void invokeRemovePlayer(ServerPlayer player);
-    
-    @Invoker
-    void invokeUpdatePlayer(ServerPlayer player);
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/platform/Services.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/platform/Services.java
@@ -1,21 +0,0 @@
-package net.lionarius.skinrestorer.platform;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.platform.services.PlatformHelper;
-
-import java.util.ServiceLoader;
-
-public final class Services {
-    
-    private Services() {}
-
-    public final static PlatformHelper PLATFORM = load(PlatformHelper.class);
-    
-    private static <T> T load(Class<T> clazz) {
-        final T loadedService = ServiceLoader.load(clazz)
-                .findFirst()
-                .orElseThrow(() -> new NullPointerException("Failed to load service for " + clazz.getName()));
-        SkinRestorer.LOGGER.debug("Loaded {} for service {}", loadedService, clazz);
-        return loadedService;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/platform/services/PlatformHelper.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/platform/services/PlatformHelper.java
@@ -1,12 +0,0 @@
-package net.lionarius.skinrestorer.platform.services;
-
-import java.nio.file.Path;
-
-public interface PlatformHelper {
-    
-    String getPlatformName();
-    
-    boolean isModLoaded(String modId);
-    
-    Path getConfigDirectory();
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinIO.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinIO.java
@@ -1,87 +0,0 @@
-package net.lionarius.skinrestorer.skin;
-
-import com.mojang.authlib.properties.Property;
-import net.lionarius.skinrestorer.skin.provider.MineskinSkinProvider;
-import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
-import net.lionarius.skinrestorer.util.FileUtils;
-import net.lionarius.skinrestorer.util.JsonUtils;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Objects;
-import java.util.UUID;
-
-public class SkinIO {
-    
-    public static final String FILE_EXTENSION = ".json";
-    
-    private final Path savePath;
-    
-    public SkinIO(Path savePath) {
-        this.savePath = savePath;
-    }
-    
-    public boolean skinExists(UUID uuid) {
-        return Files.exists(savePath.resolve(SkinIO.uuidToFilename(uuid)));
-    }
-    
-    public SkinValue loadSkin(UUID uuid) {
-        try {
-            var value = SkinIO.loadSkin(savePath.resolve(SkinIO.uuidToFilename(uuid)));
-            Objects.requireNonNull(value.provider());
-            return value;
-        } catch (Exception e) {
-            return SkinValue.EMPTY;
-        }
-    }
-    
-    private static SkinValue loadSkin(Path file) {
-        var json = FileUtils.readFile(file);
-        try {
-            return JsonUtils.fromJson(json, SkinValue.class);
-        } catch (Exception e) {
-            var property = JsonUtils.fromJson(json, Property.class);
-            return SkinIO.convertFromOldFormat(property);
-        }
-    }
-    
-    public void saveSkin(UUID uuid, SkinValue skin) {
-        FileUtils.writeFile(savePath.resolve(SkinIO.uuidToFilename(uuid)), JsonUtils.toJson(skin));
-    }
-    
-    public void deleteSkin(UUID uuid) {
-        FileUtils.deleteFile(savePath.resolve(SkinIO.uuidToFilename(uuid)));
-    }
-    
-    private static String uuidToFilename(UUID uuid) {
-        return uuid + FILE_EXTENSION;
-    }
-    
-    private static SkinValue convertFromOldFormat(Property property) {
-        try {
-            var propertyJson = Objects.requireNonNull(JsonUtils.skinPropertyToJson(property));
-            var textures = propertyJson.getAsJsonObject("textures");
-            
-            var capeTexture = textures.getAsJsonObject("CAPE");
-            if (capeTexture != null) {
-                var profileName = propertyJson.get("profileName").getAsString();
-                return new SkinValue(MojangSkinProvider.PROVIDER_NAME, profileName, null, property);
-            }
-            
-            var skinTexture = textures.getAsJsonObject("SKIN");
-            var url = skinTexture.get("url").getAsString();
-            
-            var variant = SkinVariant.CLASSIC;
-            var metadata = skinTexture.getAsJsonObject("metadata");
-            if (metadata != null) {
-                var model = metadata.get("model");
-                if (model != null && "slim".equals(model.getAsString()))
-                    variant = SkinVariant.SLIM;
-            }
-            
-            return new SkinValue(MineskinSkinProvider.PROVIDER_NAME, url, variant, property);
-        } catch (Exception e) {
-            return SkinValue.EMPTY;
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinStorage.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinStorage.java
@@ -1,53 +0,0 @@
-package net.lionarius.skinrestorer.skin;
-
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class SkinStorage {
-    
-    private final Map<UUID, SkinValue> skinMap = new ConcurrentHashMap<>();
-    private final SkinIO skinIO;
-    
-    public SkinStorage(SkinIO skinIO) {
-        this.skinIO = skinIO;
-    }
-    
-    public boolean hasSavedSkin(UUID uuid) {
-        return this.skinMap.containsKey(uuid) || this.skinIO.skinExists(uuid);
-    }
-    
-    public SkinValue getSkin(UUID uuid) {
-        if (!skinMap.containsKey(uuid)) {
-            var skin = skinIO.loadSkin(uuid);
-            setSkin(uuid, skin);
-        }
-        
-        return skinMap.get(uuid);
-    }
-    
-    public void removeSkin(UUID uuid, boolean save) {
-        var skin = skinMap.remove(uuid);
-        if (skin != null && save)
-            skinIO.saveSkin(uuid, skin);
-    }
-    
-    public void removeSkin(UUID uuid) {
-        this.removeSkin(uuid, true);
-    }
-    
-    public void deleteSkin(UUID uuid) {
-        this.removeSkin(uuid, false);
-        this.skinIO.deleteSkin(uuid);
-    }
-    
-    public void setSkin(UUID uuid, SkinValue skin) {
-        if (skin == null)
-            skin = SkinValue.EMPTY;
-        
-        if (skinMap.containsKey(uuid) && skin.originalValue() == null)
-            skin = skin.setOriginalValue(skinMap.get(uuid).originalValue());
-        
-        skinMap.put(uuid, skin);
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinValue.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinValue.java
@@ -1,33 +0,0 @@
-package net.lionarius.skinrestorer.skin;
-
-import com.mojang.authlib.properties.Property;
-import net.lionarius.skinrestorer.skin.provider.EmptySkinProvider;
-import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public record SkinValue(@NotNull String provider, @Nullable String argument, @Nullable SkinVariant variant,
-                        @Nullable Property value, @Nullable Property originalValue) {
-    
-    public static final SkinValue EMPTY = new SkinValue(EmptySkinProvider.PROVIDER_NAME, null, null, null);
-    
-    public SkinValue(String provider, String argument, SkinVariant variant, Property value) {
-        this(provider, argument, variant, value, null);
-    }
-    
-    public static SkinValue fromProviderContextWithValue(SkinProviderContext context, Property value) {
-        return new SkinValue(context.name(), context.argument(), context.variant(), value);
-    }
-    
-    public SkinProviderContext toProviderContext() {
-        return new SkinProviderContext(this.provider, this.argument, this.variant);
-    }
-    
-    public SkinValue replaceValueWithOriginal() {
-        return new SkinValue(this.provider, this.argument, this.variant, this.originalValue, this.originalValue);
-    }
-    
-    public SkinValue setOriginalValue(Property originalValue) {
-        return new SkinValue(this.provider, this.argument, this.variant, this.value, originalValue);
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/ElyBySkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/ElyBySkinProvider.java
@@ -1,107 +0,0 @@
-package net.lionarius.skinrestorer.skin.provider;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.JsonUtils;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.lionarius.skinrestorer.util.Result;
-import net.lionarius.skinrestorer.util.WebUtils;
-import net.minecraft.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpRequest;
-import java.util.Locale;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-public final class ElyBySkinProvider implements SkinProvider {
-    
-    public static final String PROVIDER_NAME = "ely.by";
-    
-    private static final URI API_URI;
-    
-    private static LoadingCache<String, Optional<Property>> SKIN_CACHE;
-    
-    static {
-        try {
-            API_URI = new URI("http://skinsystem.ely.by");
-        } catch (URISyntaxException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-    
-    public static void createCache() {
-        var config = SkinRestorer.getConfig().providersConfig().ely_by();
-        var time = config.cache().enabled() ? config.cache().duration() : 0;
-        
-        SKIN_CACHE = CacheBuilder.newBuilder()
-                .expireAfterWrite(time, TimeUnit.SECONDS)
-                .build(new CacheLoader<>() {
-                    @Override
-                    public @NotNull Optional<Property> load(@NotNull String key) throws Exception {
-                        return ElyBySkinProvider.loadSkin(key);
-                    }
-                });
-    }
-    
-    @Override
-    public String getArgumentName() {
-        return "username";
-    }
-    
-    @Override
-    public boolean hasVariantSupport() {
-        return false;
-    }
-    
-    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
-        try {
-            if (!StringUtil.isValidPlayerName(username))
-                throw new IllegalArgumentException("invalid username");
-            
-            var usernameLowerCase = username.toLowerCase(Locale.ROOT);
-            
-            return Result.success(SKIN_CACHE.get(usernameLowerCase));
-        } catch (UncheckedExecutionException e) {
-            return Result.error((Exception) e.getCause());
-        } catch (Exception e) {
-            return Result.error(e);
-        }
-    }
-    
-    private static Optional<Property> loadSkin(String username) throws Exception {
-        var profile = ElyBySkinProvider.getElyByProfile(username);
-        var textures = PlayerUtils.getPlayerSkin(profile);
-        
-        return Optional.ofNullable(textures);
-    }
-    
-    private static GameProfile getElyByProfile(String username) throws IOException {
-        var request = HttpRequest.newBuilder()
-                .uri(ElyBySkinProvider.API_URI
-                        .resolve("/textures/signed/")
-                        .resolve(username + "?unsigned=false")
-                )
-                .GET()
-                .build();
-        
-        var response = WebUtils.executeRequest(request);
-        WebUtils.throwOnClientErrors(response);
-        
-        if (response.statusCode() != 200)
-            throw new IllegalArgumentException("no profile with name " + username);
-        
-        return JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class).toProfile();
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/EmptySkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/EmptySkinProvider.java
@@ -1,31 +0,0 @@
-package net.lionarius.skinrestorer.skin.provider;
-
-import com.mojang.authlib.properties.Property;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.Result;
-
-import java.util.Optional;
-
-public final class EmptySkinProvider implements SkinProvider {
-    
-    public static final String PROVIDER_NAME = "empty";
-    
-    @Override
-    public String getArgumentName() {
-        return "placeholder";
-    }
-    
-    @Override
-    public boolean hasVariantSupport() {
-        return false;
-    }
-    
-    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String argument, SkinVariant variant) {
-        return this.fetchSkin();
-    }
-    
-    public Result<Optional<Property>, Exception> fetchSkin() {
-        return Result.ofNullable(null);
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java
@@ -1,104 +0,0 @@
-package net.lionarius.skinrestorer.skin.provider;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-import com.google.gson.JsonObject;
-import com.mojang.authlib.properties.Property;
-import it.unimi.dsi.fastutil.Pair;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.JsonUtils;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.lionarius.skinrestorer.util.Result;
-import net.lionarius.skinrestorer.util.WebUtils;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpRequest;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-public final class MineskinSkinProvider implements SkinProvider {
-    
-    public static final String PROVIDER_NAME = "web";
-    
-    private static final URI API_URI;
-    
-    private static LoadingCache<Pair<URI, SkinVariant>, Optional<Property>> SKIN_CACHE;
-    
-    static {
-        try {
-            API_URI = new URI("https://api.mineskin.org");
-        } catch (URISyntaxException e) {
-            throw new IllegalArgumentException(e);
-        }
-    }
-    
-    public static void createCache() {
-        var config = SkinRestorer.getConfig().providersConfig().mineskin();
-        var time = config.cache().enabled() ? config.cache().duration() : 0;
-        
-        SKIN_CACHE = CacheBuilder.newBuilder()
-                .expireAfterWrite(time, TimeUnit.SECONDS)
-                .build(new CacheLoader<>() {
-                    @Override
-                    public @NotNull Optional<Property> load(@NotNull Pair<URI, SkinVariant> key) throws Exception {
-                        return MineskinSkinProvider.loadSkin(key.first(), key.second());
-                    }
-                });
-    }
-    
-    @Override
-    public String getArgumentName() {
-        return "url";
-    }
-    
-    @Override
-    public boolean hasVariantSupport() {
-        return true;
-    }
-    
-    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String url, SkinVariant variant) {
-        try {
-            var uri = new URI(url);
-            
-            return Result.success(SKIN_CACHE.get(Pair.of(uri, variant)));
-        } catch (UncheckedExecutionException e) {
-            return Result.error((Exception) e.getCause());
-        } catch (Exception e) {
-            return Result.error(e);
-        }
-    }
-    
-    private static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
-        var result = MineskinSkinProvider.uploadToMineskin(uri, variant);
-        var texture = result.getAsJsonObject("data").getAsJsonObject("texture");
-        var textures = new Property(PlayerUtils.TEXTURES_KEY, texture.get("value").getAsString(), texture.get("signature").getAsString());
-        
-        return Optional.of(textures);
-    }
-    
-    private static JsonObject uploadToMineskin(URI url, SkinVariant variant) throws IOException {
-        var body = ("{\"variant\":\"%s\",\"name\":\"%s\",\"visibility\":%d,\"url\":\"%s\"}")
-                .formatted(variant.toString(), "none", 0, url);
-        
-        var request = HttpRequest.newBuilder()
-                .uri(MineskinSkinProvider.API_URI.resolve("/generate/url"))
-                .POST(HttpRequest.BodyPublishers.ofString(body))
-                .header("Content-Type", "application/json")
-                .build();
-        
-        var response = WebUtils.executeRequest(request);
-        WebUtils.throwOnClientErrors(response);
-        
-        if (response.statusCode() != 200)
-            throw new IllegalArgumentException("could not get mineskin skin");
-        
-        return JsonUtils.parseJson(response.body());
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java
@@ -1,151 +0,0 @@
-package net.lionarius.skinrestorer.skin.provider;
-
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.util.concurrent.UncheckedExecutionException;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
-import com.mojang.util.UndashedUuid;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.JsonUtils;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.lionarius.skinrestorer.util.Result;
-import net.lionarius.skinrestorer.util.WebUtils;
-import net.minecraft.server.players.GameProfileCache;
-import net.minecraft.util.StringUtil;
-import org.jetbrains.annotations.NotNull;
-
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.http.HttpRequest;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-public final class MojangSkinProvider implements SkinProvider {
-    
-    public static final String PROVIDER_NAME = "mojang";
-    
-    private static final URI API_URI;
-    private static final URI SESSION_SERVER_URI;
-    
-    public static final String PROFILE_CACHE_FILENAME = "mojang_profile_cache.json";
-    private static final GameProfileCache PROFILE_CACHE;
-    
-    private static LoadingCache<UUID, Optional<Property>> SKIN_CACHE;
-    
-    static {
-        try {
-            API_URI = new URI("https://api.mojang.com");
-            SESSION_SERVER_URI = new URI("https://sessionserver.mojang.com");
-        } catch (URISyntaxException e) {
-            throw new IllegalArgumentException(e);
-        }
-        
-        PROFILE_CACHE = new GameProfileCache((names, callback) -> {
-            for (var name : names) {
-                try {
-                    var profile = MojangSkinProvider.getProfile(name);
-                    callback.onProfileLookupSucceeded(profile);
-                } catch (IOException e) {
-                    callback.onProfileLookupFailed(name, e);
-                }
-            }
-        }, SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile());
-        
-        
-    }
-    
-    public static void createCache() {
-        var config = SkinRestorer.getConfig().providersConfig().mojang();
-        var time = config.cache().enabled() ? config.cache().duration() : 0;
-        
-        SKIN_CACHE = CacheBuilder.newBuilder()
-                .expireAfterWrite(time, TimeUnit.SECONDS)
-                .build(new CacheLoader<>() {
-                    @Override
-                    public @NotNull Optional<Property> load(@NotNull UUID key) throws Exception {
-                        return MojangSkinProvider.loadSkin(key);
-                    }
-                });
-    }
-    
-    public static SkinProviderContext skinProviderContextFromProfile(GameProfile gameProfile) {
-        return new SkinProviderContext(MojangSkinProvider.PROVIDER_NAME, gameProfile.getName(), null);
-    }
-    
-    @Override
-    public String getArgumentName() {
-        return "username";
-    }
-    
-    @Override
-    public boolean hasVariantSupport() {
-        return false;
-    }
-    
-    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
-        try {
-            if (!StringUtil.isValidPlayerName(username))
-                throw new IllegalArgumentException("invalid username");
-            
-            var cachedProfile = MojangSkinProvider.PROFILE_CACHE.get(username);
-            if (cachedProfile.isEmpty())
-                throw new IllegalArgumentException("no profile found for " + username);
-            
-            return Result.success(SKIN_CACHE.get(cachedProfile.get().getId()));
-        } catch (UncheckedExecutionException e) {
-            return Result.error((Exception) e.getCause());
-        } catch (Exception e) {
-            return Result.error(e);
-        }
-    }
-    
-    private static Optional<Property> loadSkin(UUID uuid) throws Exception {
-        var profile = MojangSkinProvider.getProfileWithProperties(uuid);
-        var textures = PlayerUtils.getPlayerSkin(profile);
-        
-        return Optional.ofNullable(textures);
-    }
-    
-    private static GameProfile getProfile(final String name) throws IOException {
-        var request = HttpRequest.newBuilder()
-                .uri(MojangSkinProvider.API_URI
-                        .resolve("/users/profiles/minecraft/")
-                        .resolve(name)
-                )
-                .GET()
-                .build();
-        
-        var response = WebUtils.executeRequest(request);
-        WebUtils.throwOnClientErrors(response);
-        
-        if (response.statusCode() != 200)
-            throw new IllegalArgumentException("no profile with name " + name);
-        
-        return JsonUtils.fromJson(response.body(), GameProfile.class);
-    }
-    
-    private static GameProfile getProfileWithProperties(UUID uuid) throws IOException {
-        var request = HttpRequest.newBuilder()
-                .uri(MojangSkinProvider.SESSION_SERVER_URI
-                        .resolve("/session/minecraft/profile/")
-                        .resolve(UndashedUuid.toString(uuid) + "?unsigned=false")
-                )
-                .GET()
-                .build();
-        
-        var response = WebUtils.executeRequest(request);
-        WebUtils.throwOnClientErrors(response);
-        
-        if (response.statusCode() != 200)
-            throw new IllegalArgumentException("no profile with uuid " + uuid);
-        
-        return JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class).toProfile();
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProvider.java
@@ -1,22 +0,0 @@
-package net.lionarius.skinrestorer.skin.provider;
-
-import com.mojang.authlib.properties.Property;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.Result;
-
-import java.util.Optional;
-
-public interface SkinProvider {
-    EmptySkinProvider EMPTY = new EmptySkinProvider();
-    MojangSkinProvider MOJANG = new MojangSkinProvider();
-    ElyBySkinProvider ELY_BY = new ElyBySkinProvider();
-    MineskinSkinProvider MINESKIN = new MineskinSkinProvider();
-    
-    String[] BUILTIN_PROVIDER_NAMES = new String[]{EmptySkinProvider.PROVIDER_NAME, MojangSkinProvider.PROVIDER_NAME, ElyBySkinProvider.PROVIDER_NAME, MineskinSkinProvider.PROVIDER_NAME};
-    
-    String getArgumentName();
-    
-    boolean hasVariantSupport();
-    
-    Result<Optional<Property>, Exception> fetchSkin(String argument, SkinVariant variant);
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProviderContext.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProviderContext.java
@@ -1,6 +0,0 @@
-package net.lionarius.skinrestorer.skin.provider;
-
-import net.lionarius.skinrestorer.skin.SkinVariant;
-
-public record SkinProviderContext(String name, String argument, SkinVariant variant) {
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProviderRegistry.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProviderRegistry.java
@@ -1,52 +0,0 @@
-package net.lionarius.skinrestorer.skin.provider;
-
-import it.unimi.dsi.fastutil.Pair;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-public final class SkinProviderRegistry {
-    
-    private final Map<String, Entry> registry = new HashMap<>();
-    
-    public SkinProvider get(String name) {
-        var entry = this.registry.get(name);
-        if (entry == null)
-            return null;
-        
-        return entry.provider;
-    }
-    
-    public Collection<Pair<String, SkinProvider>> getProviders() {
-        return this.registry
-                .entrySet()
-                .stream()
-                .map(entry -> Pair.of(entry.getKey(), entry.getValue().provider))
-                .toList();
-    }
-    
-    public Collection<Pair<String, SkinProvider>> getPublicProviders() {
-        return this.registry
-                .entrySet()
-                .stream()
-                .filter(entry -> entry.getValue().isPublic)
-                .map(entry -> Pair.of(entry.getKey(), entry.getValue().provider))
-                .toList();
-    }
-    
-    public void register(@NotNull String name, @NotNull SkinProvider provider) {
-        this.register(name, provider, true);
-    }
-    
-    public void register(@NotNull String name, @NotNull SkinProvider provider, boolean isPublic) {
-        if (this.registry.containsKey(name))
-            return;
-        
-        this.registry.put(name, new Entry(provider, isPublic));
-    }
-    
-    private record Entry(SkinProvider provider, boolean isPublic) {
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java
@@ -1,69 +0,0 @@
-package net.lionarius.skinrestorer.translation;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.reflect.TypeToken;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.util.FileUtils;
-import net.lionarius.skinrestorer.util.JsonUtils;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-
-import java.util.Map;
-import java.util.Objects;
-
-public final class Translation {
-    public static final String LEGACY_TRANSLATION_FILENAME = "translation";
-    
-    public static final String COMMAND_SKIN_AFFECTED_PLAYERS_KEY = "skinrestorer.command.skin.affected_players";
-    public static final String COMMAND_SKIN_NO_CHANGES_KEY = "skinrestorer.command.skin.no_changes";
-    public static final String COMMAND_SKIN_FAILED_KEY = "skinrestorer.command.skin.failed";
-    public static final String COMMAND_SKIN_OK_KEY = "skinrestorer.command.skin.ok";
-    public static final String COMMAND_SKIN_LOADING_KEY = "skinrestorer.command.skin.loading";
-    public static final String COMMAND_SKIN_CONFIG_RELOADED_KEY = "skinrestorer.command.skin.config_reloaded";
-    
-    private static Map<String, String> translations;
-    private static final Map<String, String> fallback;
-    
-    static {
-        fallback = Translation.loadTranslationMap("en_us");
-    }
-    
-    private Translation() {}
-    
-    public static String get(String key) {
-        var value = translations.get(key);
-        if (value == null)
-            value = fallback.get(key);
-        
-        return value;
-    }
-    
-    public static MutableComponent translatableWithFallback(String key) {
-        return Component.translatableWithFallback(key, Translation.get(key));
-    }
-    
-    public static MutableComponent translatableWithFallback(String key, Object... args) {
-        return Component.translatableWithFallback(key, Translation.get(key), args);
-    }
-    
-    public static void reloadTranslations() {
-        translations = Translation.loadTranslationMap(SkinRestorer.getConfig().language());
-    }
-    
-    private static ImmutableMap<String, String> loadTranslationMap(String lang) {
-        var json = FileUtils.readResource(SkinRestorer.assetPath(String.format("lang/%s.json", lang)));
-        
-        var type = new TypeToken<Map<String, String>>() {}.getType();
-        Map<String, String> map = null;
-        try {
-            map = JsonUtils.fromJson(Objects.requireNonNull(json), type);
-        } catch (Exception e) {
-            SkinRestorer.LOGGER.error("Failed to load translation map", e);
-        }
-        
-        if (map == null)
-            return ImmutableMap.<String, String>builder().build();
-        
-        return ImmutableMap.copyOf(map);
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/util/FileUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/FileUtils.java
@@ -1,98 +0,0 @@
-package net.lionarius.skinrestorer.util;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.config.Config;
-import net.lionarius.skinrestorer.skin.SkinIO;
-import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
-import net.lionarius.skinrestorer.translation.Translation;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-
-public final class FileUtils {
-    
-    private FileUtils() {}
-    
-    public static void tryMigrateOldSkinDirectory(Path oldDirectory, Path newDirectory) {
-        try {
-            try (var stream = Files.list(oldDirectory)) {
-                var files = stream.filter(file -> {
-                    var name = file.getFileName().toString();
-                    return Files.isRegularFile(file)
-                           && !name.startsWith(Translation.LEGACY_TRANSLATION_FILENAME)
-                           && !name.startsWith(Config.CONFIG_FILENAME)
-                           && !name.startsWith(MojangSkinProvider.PROFILE_CACHE_FILENAME)
-                           && name.endsWith(SkinIO.FILE_EXTENSION);
-                }).toList();
-                
-                if (!files.isEmpty() && !Files.exists(newDirectory))
-                    Files.createDirectories(newDirectory);
-                
-                for (var file : files) {
-                    var newFile = newDirectory.resolve(file.getFileName());
-                    if (!Files.exists(newFile))
-                        Files.move(file, newFile, StandardCopyOption.ATOMIC_MOVE);
-                    else
-                        Files.delete(file);
-                }
-            }
-        } catch (Exception e) {
-            SkinRestorer.LOGGER.error("could not migrate skin directory", e);
-        }
-    }
-    
-    public static String readResource(String name) {
-        try (var stream = SkinRestorer.class.getResourceAsStream(name)) {
-            if (stream == null)
-                return null;
-            
-            try (var reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
-                return StringUtils.readString(reader);
-            }
-        } catch (IOException e) {
-            SkinRestorer.LOGGER.error("failed to read resource", e);
-            return null;
-        }
-    }
-    
-    public static String readFile(Path file) {
-        try {
-            if (!Files.exists(file))
-                return null;
-            
-            return Files.readString(file);
-        } catch (Exception e) {
-            SkinRestorer.LOGGER.error("failed to read file", e);
-            return null;
-        }
-    }
-    
-    public static void writeFile(Path file, String content) {
-        try {
-            var parent = file.getParent();
-            if (parent != null)
-                Files.createDirectories(parent);
-            
-            if (!Files.exists(file))
-                Files.createFile(file);
-            
-            Files.writeString(file, content);
-        } catch (IOException e) {
-            SkinRestorer.LOGGER.error("failed to write file", e);
-        }
-    }
-    
-    public static void deleteFile(Path file) {
-        try {
-            if (Files.exists(file))
-                Files.delete(file);
-        } catch (IOException e) {
-            SkinRestorer.LOGGER.error("failed to delete file", e);
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/util/JsonUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/JsonUtils.java
@@ -1,61 +0,0 @@
-package net.lionarius.skinrestorer.util;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.properties.PropertyMap;
-import com.mojang.util.UUIDTypeAdapter;
-import net.lionarius.skinrestorer.SkinRestorer;
-
-import java.lang.reflect.Type;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.UUID;
-
-public final class JsonUtils {
-    
-    private static final Gson GSON = new GsonBuilder()
-            .registerTypeAdapter(UUID.class, new UUIDTypeAdapter())
-            .registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer())
-            .registerTypeAdapter(GameProfile.class, new GameProfile.Serializer())
-            .setPrettyPrinting()
-            .create();
-    
-    private JsonUtils() {}
-    
-    public static <T> T fromJson(String json, Class<T> clazz) {
-        return GSON.fromJson(json, clazz);
-    }
-    
-    public static <T> T fromJson(JsonElement json, Class<T> clazz) {
-        return GSON.fromJson(json, clazz);
-    }
-    
-    public static <T> T fromJson(String json, Type type) {
-        return GSON.fromJson(json, type);
-    }
-    
-    public static <T> String toJson(T obj) {
-        return GSON.toJson(obj);
-    }
-    
-    public static JsonObject parseJson(String json) {
-        return GSON.fromJson(json, JsonObject.class);
-    }
-    
-    public static JsonObject skinPropertyToJson(Property property) {
-        try {
-            JsonObject json = GSON.fromJson(new String(Base64.getDecoder().decode(property.value()), StandardCharsets.UTF_8), JsonObject.class);
-            if (json != null)
-                json.remove("timestamp");
-            
-            return json;
-        } catch (Exception e) {
-            SkinRestorer.LOGGER.error(e.toString());
-            return null;
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java
@@ -1,134 +0,0 @@
-package net.lionarius.skinrestorer.util;
-
-import com.google.common.collect.Iterables;
-import com.google.gson.JsonObject;
-import com.mojang.authlib.GameProfile;
-import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
-import net.lionarius.skinrestorer.mixin.ChunkMapAccessor;
-import net.lionarius.skinrestorer.mixin.TrackedEntityAccessorInvoker;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.protocol.game.*;
-import net.minecraft.server.level.ChunkMap;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.players.PlayerList;
-
-import java.util.*;
-
-public final class PlayerUtils {
-    
-    public static final String TEXTURES_KEY = "textures";
-    
-    private PlayerUtils() {}
-    
-    public static Component createPlayerListComponent(Collection<ServerPlayer> players) {
-        var component = Component.empty();
-        int index = 0;
-        for (var player : players) {
-            component.append(Objects.requireNonNull(player.getDisplayName()));
-            index++;
-            if (index < players.size())
-                component.append(", ");
-        }
-        return component;
-    }
-    
-    public static boolean isFakePlayer(ServerPlayer player) {
-        return player.getClass() != ServerPlayer.class; // if the player isn't a server player entity, it must be someone's fake player
-    }
-    
-    public static void refreshPlayer(ServerPlayer player) {
-        ServerLevel serverLevel = player.serverLevel();
-        PlayerList playerList = serverLevel.getServer().getPlayerList();
-        ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap;
-        
-        playerList.broadcastAll(new ClientboundBundlePacket(
-                List.of(
-                        new ClientboundPlayerInfoRemovePacket(List.of(player.getUUID())),
-                        ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(Collections.singleton(player))
-                )
-        ));
-        
-        var trackedEntity = (TrackedEntityAccessorInvoker) ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId());
-        if (trackedEntity != null) {
-            var seenBy = Set.copyOf(trackedEntity.getSeenBy());
-            for (var observerConnection : seenBy) {
-                var observer = observerConnection.getPlayer();
-                trackedEntity.invokeRemovePlayer(observer);
-                
-                var trackedObserverEntity = (TrackedEntityAccessorInvoker) ((ChunkMapAccessor) chunkMap).getEntityMap().get(observer.getId());
-                if (trackedObserverEntity != null) {
-                    trackedObserverEntity.invokeRemovePlayer(player);
-                    trackedObserverEntity.invokeUpdatePlayer(player);
-                }
-                trackedEntity.invokeUpdatePlayer(observer);
-            }
-        }
-        
-        if (!player.isDeadOrDying()) {
-            player.connection.send(new ClientboundBundlePacket(
-                    List.of(
-                            new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA),
-                            new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0)
-                    )
-            ));
-            player.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
-            player.connection.send(new ClientboundSetEntityMotionPacket(player));
-            var vehicle = player.getVehicle();
-            if (vehicle != null)
-                player.connection.send(new ClientboundSetPassengersPacket(vehicle));
-            if (!player.getPassengers().isEmpty())
-                player.connection.send(new ClientboundSetPassengersPacket(player));
-            
-            player.onUpdateAbilities();
-            player.giveExperiencePoints(0);
-            playerList.sendPlayerPermissionLevel(player);
-            playerList.sendLevelInfo(player, serverLevel);
-            playerList.sendAllPlayerInfo(player);
-            PlayerUtils.sendActivePlayerEffects(player);
-        }
-    }
-    
-    private static void sendActivePlayerEffects(ServerPlayer player) {
-        for (var effect : player.getActiveEffects()) {
-            player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect, false));
-        }
-    }
-    
-    public static Property getPlayerSkin(GameProfile profile) {
-        return Iterables.getFirst(profile.getProperties().get(TEXTURES_KEY), null);
-    }
-    
-    public static void applyRestoredSkin(GameProfile profile, Property skin) {
-        profile.getProperties().removeAll(TEXTURES_KEY);
-        
-        if (skin != null)
-            profile.getProperties().put(TEXTURES_KEY, skin);
-    }
-    
-    public static boolean areSkinPropertiesEquals(Property x, Property y) {
-        if (x == y)
-            return true;
-        
-        if (x == null || y == null)
-            return false;
-        
-        if (x.equals(y))
-            return true;
-        
-        JsonObject xJson = JsonUtils.skinPropertyToJson(x);
-        JsonObject yJson = JsonUtils.skinPropertyToJson(y);
-        
-        if (xJson == null || yJson == null)
-            return false;
-        
-        return xJson.equals(yJson);
-    }
-    
-    public static GameProfile toProfile(MinecraftProfilePropertiesResponse response) {
-        final GameProfile profile = new GameProfile(response.id(), response.name());
-        profile.getProperties().putAll(response.properties());
-        return profile;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/util/Result.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/Result.java
@@ -1,84 +0,0 @@
-package net.lionarius.skinrestorer.util;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-
-public class Result<S, E> {
-    
-    private final S successValue;
-    private final E errorValue;
-    
-    private Result(S successValue, E errorValue) {
-        if (successValue == null && errorValue == null)
-            throw new IllegalArgumentException("Cannot create result of null values");
-        
-        this.successValue = successValue;
-        this.errorValue = errorValue;
-    }
-    
-    public S getSuccessValue() {
-        return successValue;
-    }
-    
-    public E getErrorValue() {
-        return errorValue;
-    }
-    
-    public boolean isSuccess() {
-        return successValue != null;
-    }
-    
-    public boolean isError() {
-        return errorValue != null;
-    }
-    
-    public <N> Result<N, E> map(Function<S, N> mapper) {
-        if (successValue == null)
-            return new Result<>(null, errorValue);
-        
-        return new Result<>(mapper.apply(successValue), errorValue);
-    }
-    
-    public <N> Result<S, N> mapError(Function<E, N> mapper) {
-        if (errorValue == null)
-            return new Result<>(successValue, null);
-        
-        return new Result<>(successValue, mapper.apply(errorValue));
-    }
-    
-    public Optional<S> toOptional() {
-        return Optional.ofNullable(successValue);
-    }
-    
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        
-        if (o == null || getClass() != o.getClass())
-            return false;
-        
-        Result<?, ?> result = (Result<?, ?>) o;
-        return Objects.equals(successValue, result.successValue) && Objects.equals(errorValue, result.errorValue);
-    }
-    
-    @Override
-    public int hashCode() {
-        return Objects.hash(successValue, errorValue);
-    }
-    
-    public static <S, E> Result<S, E> success(@NotNull S successValue) {
-        return new Result<>(successValue, null);
-    }
-    
-    public static <S, E> Result<S, E> error(@NotNull E errorValue) {
-        return new Result<>(null, errorValue);
-    }
-    
-    public static <S, E> Result<Optional<S>, E> ofNullable(S successValue) {
-        return Result.success(Optional.ofNullable(successValue));
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java
@@ -1,79 +0,0 @@
-package net.lionarius.skinrestorer.util;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.ProxySelector;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpResponse;
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-
-public final class WebUtils {
-    
-    private WebUtils() {}
-    
-    public static final String USER_AGENT;
-    
-    private static HttpClient HTTP_CLIENT = null;
-    
-    static {
-        USER_AGENT = String.format("SkinRestorer/%d", System.currentTimeMillis() % 65535);
-    }
-    
-    public static void recreateHttpClient() {
-        HTTP_CLIENT = WebUtils.buildClient();
-    }
-    
-    private static HttpClient buildClient() {
-        var builder = HttpClient.newBuilder();
-        
-        var proxy = SkinRestorer.getConfig().proxy();
-        proxy.ifPresent(value -> builder.proxy(ProxySelector.of(InetSocketAddress.createUnresolved(value.host(), value.port()))));
-        
-        try {
-            builder.connectTimeout(Duration.of(SkinRestorer.getConfig().requestTimeout(), ChronoUnit.SECONDS));
-        } catch (IllegalArgumentException e) {
-            SkinRestorer.LOGGER.error("failed to set request timeout", e);
-            builder.connectTimeout(Duration.of(10, ChronoUnit.SECONDS));
-        }
-        
-        return builder.build();
-    }
-    
-    public static HttpResponse<String> executeRequest(HttpRequest request) throws IOException {
-        try {
-            var modifiedRequest = HttpRequest.newBuilder(request, (name, value) -> true)
-                    .header("User-Agent", WebUtils.USER_AGENT)
-                    .build();
-            
-            final var response = WebUtils.HTTP_CLIENT.send(modifiedRequest, HttpResponse.BodyHandlers.ofString());
-            
-            if (response.statusCode() >= 500)
-                throw new IOException("server error " + response.statusCode());
-            
-            return response;
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new IOException(e);
-        }
-    }
-    
-    public static void throwOnClientErrors(HttpResponse<?> response) {
-        String message = switch (response.statusCode()) {
-            case 400 -> "bad request";
-            case 401 -> "unauthorized";
-            case 403 -> "forbidden";
-            case 404 -> "not found";
-            case 405 -> "method not allowed";
-            case 408 -> "request timeout";
-            case 429 -> "too many requests";
-            default -> null;
-        };
-        
-        if (message != null)
-            throw new IllegalStateException(message);
-    }
-}
--- a/common/src/main/resources/assets/skinrestorer/icon.png
+++ b/common/src/main/resources/assets/skinrestorer/icon.png
--- a/common/src/main/resources/assets/skinrestorer/lang/cs_cz.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/cs_cz.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Změny skinu použity pro %s",
-    "skinrestorer.command.skin.no_changes": "Žádné změny skinu",
-    "skinrestorer.command.skin.failed": "Nepodařilo se změnit skin: %s",
-    "skinrestorer.command.skin.ok": "Skin změněn",
-    "skinrestorer.command.skin.loading": "Načítání skinu...",
-    "skinrestorer.command.skin.config_reloaded": "Konfigurace byla znovu načtena"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/de_de.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/de_de.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Skin änderungen für %s angewendet",
-    "skinrestorer.command.skin.no_changes": "Keine Skinänderungen",
-    "skinrestorer.command.skin.failed": "Skin konnte nicht geändert werden: %s",
-    "skinrestorer.command.skin.ok": "Skin geändert",
-    "skinrestorer.command.skin.loading": "Skin wird geladen...",
-    "skinrestorer.command.skin.config_reloaded": "Konfiguration wurde neu geladen"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/en_us.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/en_us.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Applied skin changes for %s",
-    "skinrestorer.command.skin.no_changes": "No skin changes",
-    "skinrestorer.command.skin.failed": "Failed to change skin: %s",
-    "skinrestorer.command.skin.ok": "Skin changed",
-    "skinrestorer.command.skin.loading": "Loading skin...",
-    "skinrestorer.command.skin.config_reloaded": "Config has been reloaded"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/es_ar.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/es_ar.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Cambios de skin aplicados para %s",
-    "skinrestorer.command.skin.no_changes": "No hay cambios de skin",
-    "skinrestorer.command.skin.failed": "Error al cambiar el skin: %s",
-    "skinrestorer.command.skin.ok": "Skin cambiado",
-    "skinrestorer.command.skin.loading": "Cargando skin...",
-    "skinrestorer.command.skin.config_reloaded": "La configuración se ha recargado"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/es_es.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/es_es.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Cambios de skin aplicados para %s",
-    "skinrestorer.command.skin.no_changes": "No hay cambios de skin",
-    "skinrestorer.command.skin.failed": "Error al cambiar el skin: %s",
-    "skinrestorer.command.skin.ok": "Skin cambiado",
-    "skinrestorer.command.skin.loading": "Cargando skin...",
-    "skinrestorer.command.skin.config_reloaded": "La configuración se ha recargado"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/es_mx.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/es_mx.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Cambios de skin aplicados para %s",
-    "skinrestorer.command.skin.no_changes": "No hay cambios de skin",
-    "skinrestorer.command.skin.failed": "Error al cambiar el skin: %s",
-    "skinrestorer.command.skin.ok": "Skin cambiado",
-    "skinrestorer.command.skin.loading": "Cargando skin...",
-    "skinrestorer.command.skin.config_reloaded": "La configuración se ha recargado"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/fil_ph.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/fil_ph.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Na-apply ang pagbabago ng skin para kay %s",
-    "skinrestorer.command.skin.no_changes": "Walang pagbabago sa skin",
-    "skinrestorer.command.skin.failed": "Nabigo sa pagbabago ng skin: %s",
-    "skinrestorer.command.skin.ok": "Nabago ang skin",
-    "skinrestorer.command.skin.loading": "Naglo-load ng skin...",
-    "skinrestorer.command.skin.config_reloaded": "Na-reload ang config"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/fr_ca.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/fr_ca.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Modifications de skin appliquées pour %s",
-    "skinrestorer.command.skin.no_changes": "Aucun changement de skin",
-    "skinrestorer.command.skin.failed": "Échec du changement de skin : %s",
-    "skinrestorer.command.skin.ok": "Skin changé",
-    "skinrestorer.command.skin.loading": "Chargement du skin...",
-    "skinrestorer.command.skin.config_reloaded": "La configuration a été rechargée"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/fr_fr.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/fr_fr.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Modifications de skin appliquées pour %s",
-    "skinrestorer.command.skin.no_changes": "Aucun changement de skin",
-    "skinrestorer.command.skin.failed": "Échec du changement de skin : %s",
-    "skinrestorer.command.skin.ok": "Skin changé",
-    "skinrestorer.command.skin.loading": "Chargement du skin...",
-    "skinrestorer.command.skin.config_reloaded": "La configuration a été rechargée"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/hi_in.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/hi_in.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "त्वचा परिवर्तन %s के लिए लागू किए गए",
-    "skinrestorer.command.skin.no_changes": "कोई त्वचा परिवर्तन नहीं",
-    "skinrestorer.command.skin.failed": "त्वचा बदलने में विफल: %s",
-    "skinrestorer.command.skin.ok": "त्वचा बदल दी गई",
-    "skinrestorer.command.skin.loading": "त्वचा लोड हो रही है...",
-    "skinrestorer.command.skin.config_reloaded": "कॉन्फ़िगरेशन फिर से लोड किया गया है"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/hu_hu.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/hu_hu.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Skin változások alkalmazva: %s",
-    "skinrestorer.command.skin.no_changes": "Nincsenek skin változások",
-    "skinrestorer.command.skin.failed": "Skin változtatás sikertelen: %s",
-    "skinrestorer.command.skin.ok": "Skin megváltoztatva",
-    "skinrestorer.command.skin.loading": "Skin betöltése...",
-    "skinrestorer.command.skin.config_reloaded": "A konfiguráció újratöltve"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/id_id.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/id_id.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Perubahan skin diterapkan untuk %s",
-    "skinrestorer.command.skin.no_changes": "Tidak ada perubahan skin",
-    "skinrestorer.command.skin.failed": "Gagal mengubah skin: %s",
-    "skinrestorer.command.skin.ok": "Skin diubah",
-    "skinrestorer.command.skin.loading": "Memuat skin...",
-    "skinrestorer.command.skin.config_reloaded": "Konfigurasi telah dimuat ulang"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/it_it.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/it_it.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Modifiche della skin applicate per %s",
-    "skinrestorer.command.skin.no_changes": "Nessuna modifica alla skin",
-    "skinrestorer.command.skin.failed": "Impossibile cambiare la skin: %s",
-    "skinrestorer.command.skin.ok": "Skin cambiata",
-    "skinrestorer.command.skin.loading": "Caricamento della skin...",
-    "skinrestorer.command.skin.config_reloaded": "La configurazione è stata ricaricata"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/pl_pl.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/pl_pl.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Zastosowano zmiany skina dla %s",
-    "skinrestorer.command.skin.no_changes": "Brak zmian skina",
-    "skinrestorer.command.skin.failed": "Nie udało się zmienić skina: %s",
-    "skinrestorer.command.skin.ok": "Skin zmieniony",
-    "skinrestorer.command.skin.loading": "Ładowanie skina...",
-    "skinrestorer.command.skin.config_reloaded": "Konfiguracja została przeładowana"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/pt_br.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/pt_br.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Alterações de skin aplicadas para %s",
-    "skinrestorer.command.skin.no_changes": "Nenhuma alteração de skin",
-    "skinrestorer.command.skin.failed": "Falha ao alterar a skin: %s",
-    "skinrestorer.command.skin.ok": "Skin alterada",
-    "skinrestorer.command.skin.loading": "Carregando skin...",
-    "skinrestorer.command.skin.config_reloaded": "Configuração recarregada"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/pt_pt.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/pt_pt.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Alterações de skin aplicadas para %s",
-    "skinrestorer.command.skin.no_changes": "Nenhuma alteração de skin",
-    "skinrestorer.command.skin.failed": "Falha ao alterar a skin: %s",
-    "skinrestorer.command.skin.ok": "Skin alterada",
-    "skinrestorer.command.skin.loading": "Carregando skin...",
-    "skinrestorer.command.skin.config_reloaded": "Configuração recarregada"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/ru_ru.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/ru_ru.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Применены изменения скина для %s",
-    "skinrestorer.command.skin.no_changes": "Изменений скина нет",
-    "skinrestorer.command.skin.failed": "Не удалось изменить скин: %s",
-    "skinrestorer.command.skin.ok": "Скин изменён",
-    "skinrestorer.command.skin.loading": "Загрузка скина...",
-    "skinrestorer.command.skin.config_reloaded": "Конфигурация была перезагружена"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/tr_tr.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/tr_tr.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "%s için skin değişiklikleri uygulandı",
-    "skinrestorer.command.skin.no_changes": "Skin değişikliği yok",
-    "skinrestorer.command.skin.failed": "Skin değiştirme başarısız: %s",
-    "skinrestorer.command.skin.ok": "Skin değiştirildi",
-    "skinrestorer.command.skin.loading": "Skin yükleniyor...",
-    "skinrestorer.command.skin.config_reloaded": "Yapılandırma yeniden yüklendi"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/uk_ua.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/uk_ua.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Зміни скіна застосовані для %s",
-    "skinrestorer.command.skin.no_changes": "Змін скіна немає",
-    "skinrestorer.command.skin.failed": "Не вдалося змінити скіна: %s",
-    "skinrestorer.command.skin.ok": "Скін змінено",
-    "skinrestorer.command.skin.loading": "Завантаження скіна...",
-    "skinrestorer.command.skin.config_reloaded": "Конфігурацію перезавантажено"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/vi_vn.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/vi_vn.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "Áp dụng thay đổi skin cho %s",
-    "skinrestorer.command.skin.no_changes": "Không có thay đổi skin",
-    "skinrestorer.command.skin.failed": "Thay đổi skin thất bại: %s",
-    "skinrestorer.command.skin.ok": "Đã thay đổi skin",
-    "skinrestorer.command.skin.loading": "Đang tải skin...",
-    "skinrestorer.command.skin.config_reloaded": "Cấu hình đã được tải lại"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/zh_cn.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/zh_cn.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "应用的皮肤更改 %s",
-    "skinrestorer.command.skin.no_changes": "没有皮肤更改",
-    "skinrestorer.command.skin.failed": "更改皮肤失败：%s",
-    "skinrestorer.command.skin.ok": "皮肤已更改",
-    "skinrestorer.command.skin.loading": "正在加载皮肤...",
-    "skinrestorer.command.skin.config_reloaded": "配置已重新加载"
-}
--- a/common/src/main/resources/assets/skinrestorer/lang/zh_tw.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/zh_tw.json
@@ -1,8 +0,0 @@
-{
-    "skinrestorer.command.skin.affected_players": "已變更 %s 的外觀",
-    "skinrestorer.command.skin.no_changes": "沒有外觀變更",
-    "skinrestorer.command.skin.failed": "變更外觀失敗：%s",
-    "skinrestorer.command.skin.ok": "已變更外觀",
-    "skinrestorer.command.skin.loading": "正在載入外觀...",
-    "skinrestorer.command.skin.config_reloaded": "配置已重新載入"
-}
--- a/common/src/main/resources/pack.mcmeta
+++ b/common/src/main/resources/pack.mcmeta
@@ -1,6 +0,0 @@
-{
-    "pack": {
-        "description": "${mod_id}",
-        "pack_format": 8
-    }
-}
--- a/common/src/main/resources/skinrestorer.mixins.json
+++ b/common/src/main/resources/skinrestorer.mixins.json
@@ -1,16 +0,0 @@
-{
-    "required": true,
-    "minVersion": "0.8",
-    "package": "net.lionarius.skinrestorer.mixin",
-    "compatibilityLevel": "JAVA_8",
-    "refmap": "${mod_id}.refmap.json",
-    "mixins": [
-        "PlayerListMixin",
-        "ServerLoginPacketListenerImplMixin",
-        "ChunkMapAccessor",
-        "TrackedEntityAccessorInvoker"
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    }
-}
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,42 +0,0 @@
-plugins {
-    id 'multiloader-loader'
-    
-    id 'fabric-loom'
-
-    id 'multiloader-publish'
-}
-dependencies {
-    minecraft "com.mojang:minecraft:${minecraft_version}"
-    mappings loom.layered {
-        officialMojangMappings()
-        parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
-    }
-    modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
-}
-
-loom {
-    def aw = project(':common').file("src/main/resources/${mod_id}.accesswidener")
-    if (aw.exists()) {
-        accessWidenerPath.set(aw)
-    }
-    
-    mixin {
-        defaultRefmapName.set("${mod_id}.refmap.json")
-    }
-    
-    runs {
-        client {
-            client()
-            setConfigName('Fabric Client')
-            ideConfigGenerated(true)
-            runDir('../run/client')
-        }
-
-        server {
-            server()
-            setConfigName('Fabric Server')
-            ideConfigGenerated(true)
-            runDir('../run/server')
-        }
-    }
-}
--- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/SkinRestorerFabric.java
+++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/SkinRestorerFabric.java
@@ -1,11 +0,0 @@
-package net.lionarius.skinrestorer.fabric;
-
-import net.fabricmc.api.ModInitializer;
-import net.lionarius.skinrestorer.SkinRestorer;
-
-public final class SkinRestorerFabric implements ModInitializer {
-    @Override
-    public void onInitialize() {
-        SkinRestorer.onInitialize();
-    }
-}
--- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/CommandsMixin.java
+++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/CommandsMixin.java
@@ -1,26 +0,0 @@
-package net.lionarius.skinrestorer.fabric.mixin;
-
-import com.mojang.brigadier.CommandDispatcher;
-import net.lionarius.skinrestorer.command.SkinCommand;
-import net.minecraft.commands.CommandBuildContext;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(Commands.class)
-public abstract class CommandsMixin {
-    
-    @Final @Shadow
-    private CommandDispatcher<CommandSourceStack> dispatcher;
-    
-    @Inject(method = "<init>", at = @At(value = "INVOKE",
-                                        target = "Lnet/minecraft/server/commands/AdvancementCommands;register(Lcom/mojang/brigadier/CommandDispatcher;)V"))
-    private void init(Commands.CommandSelection environment, CommandBuildContext commandRegistryAccess, CallbackInfo ci) {
-        SkinCommand.register(dispatcher);
-    }
-}
--- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java
+++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java
@@ -1,18 +0,0 @@
-package net.lionarius.skinrestorer.fabric.mixin;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.minecraft.server.MinecraftServer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(MinecraftServer.class)
-public abstract class MinecraftServerMixin {
-    
-    @Inject(method = "runServer",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getNanos()J", ordinal = 0))
-    private void onServerStarted(CallbackInfo ci) {
-        SkinRestorer.onServerStarted((MinecraftServer) (Object) this);
-    }
-}
--- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/platform/FabricPlatformHelper.java
+++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/platform/FabricPlatformHelper.java
@@ -1,23 +0,0 @@
-package net.lionarius.skinrestorer.fabric.platform;
-
-import net.fabricmc.loader.api.FabricLoader;
-import net.lionarius.skinrestorer.platform.services.PlatformHelper;
-
-import java.nio.file.Path;
-
-public final class FabricPlatformHelper implements PlatformHelper {
-    @Override
-    public String getPlatformName() {
-        return "fabric";
-    }
-    
-    @Override
-    public boolean isModLoaded(String modId) {
-        return FabricLoader.getInstance().isModLoaded(modId);
-    }
-    
-    @Override
-    public Path getConfigDirectory() {
-        return FabricLoader.getInstance().getConfigDir();
-    }
-}
--- a/fabric/src/main/resources/META-INF/services/net.lionarius.skinrestorer.platform.services.PlatformHelper
+++ b/fabric/src/main/resources/META-INF/services/net.lionarius.skinrestorer.platform.services.PlatformHelper
@@ -1 +0,0 @@
-net.lionarius.skinrestorer.fabric.platform.FabricPlatformHelper
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -1,32 +0,0 @@
-{
-    "schemaVersion": 1,
-    "id": "${mod_id}",
-    "version": "${version}",
-    "name": "${mod_name}",
-    "description": "${description}",
-    "authors": [
-        "${mod_author}"
-    ],
-    "contact": {
-        "homepage": "${mod_homepage}",
-        "sources": "${mod_sources}",
-        "issues": "${mod_issues}"
-    },
-    "icon": "assets/${mod_id}/icon.png",
-    "license": "${license}",
-    "environment": "*",
-    "entrypoints": {
-        "main": [
-            "net.lionarius.skinrestorer.fabric.SkinRestorerFabric"
-        ]
-    },
-    "mixins": [
-        "${mod_id}.mixins.json",
-        "${mod_id}.fabric.mixins.json"
-    ],
-    "depends": {
-        "fabricloader": ">=${fabric_loader_version}",
-        "minecraft": ">=${minecraft_version}",
-        "java": ">=${java_version}"
-    }
-}
--- a/fabric/src/main/resources/skinrestorer.fabric.mixins.json
+++ b/fabric/src/main/resources/skinrestorer.fabric.mixins.json
@@ -1,14 +0,0 @@
-{
-    "required": true,
-    "minVersion": "0.8",
-    "package": "net.lionarius.skinrestorer.fabric.mixin",
-    "compatibilityLevel": "JAVA_8",
-    "refmap": "${mod_id}.refmap.json",
-    "mixins": [
-        "CommandsMixin",
-        "MinecraftServerMixin"
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    }
-}
--- a/forge/build.gradle
+++ b/forge/build.gradle
@@ -1,78 +0,0 @@
-plugins {
-    id 'multiloader-loader'
-    id 'idea'
-    id 'eclipse'
-    
-    id 'net.minecraftforge.gradle'
-    id 'org.parchmentmc.librarian.forgegradle'
-    id 'org.spongepowered.mixin'
-
-    id 'multiloader-publish'
-}
-
-mixin {
-    add sourceSets.main, "${mod_id}.refmap.json"
-    config "${mod_id}.mixins.json"
-}
-
-minecraft {
-    mappings channel: 'parchment', version: "${parchment_version}-${parchment_minecraft}"
-
-    copyIdeResources = true //Calls processResources when in dev
-
-    reobf = false // Forge 1.20.6+ uses official mappings at runtime, so we shouldn't reobf from official to SRG
-
-    // Automatically enable forge AccessTransformers if the file exists
-    // This location is hardcoded in Forge and can not be changed.
-    // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123
-    def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
-    if (at.exists()) {
-        accessTransformer = at
-    }
-
-    runs {
-        client {
-            workingDirectory file('../run/client')
-            ideaModule "${rootProject.name}.${project.name}.main"
-            taskName 'Client'
-            mods {
-                modClientRun {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory file('../run/server')
-            ideaModule "${rootProject.name}.${project.name}.main"
-            taskName 'Server'
-            mods {
-                modServerRun {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
-}
-
-dependencies {
-    minecraft "net.minecraftforge:forge:${forge_minecraft_version}-${forge_version}"
-
-    annotationProcessor('org.spongepowered:mixin:0.8.5-SNAPSHOT:processor')
-    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
-}
-
-// for some reason mixin plugin does not add 'MixinConfigs' to MANIFEST.MF so we do it manually
-jar {
-    manifest {
-        attributes([
-                'MixinConfigs': "${mod_id}.mixins.json"
-        ])
-    }
-}
-
-sourceSets.each {
-    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
-    it.output.resourcesDir = dir
-    it.java.destinationDirectory = dir
-}
--- a/forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java
+++ b/forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java
@@ -1,30 +0,0 @@
-package net.lionarius.skinrestorer.forge;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.command.SkinCommand;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.RegisterCommandsEvent;
-import net.minecraftforge.event.server.ServerStartedEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod(SkinRestorer.MOD_ID)
-@Mod.EventBusSubscriber(modid = SkinRestorer.MOD_ID)
-public final class SkinRestorerForge {
-    
-    public SkinRestorerForge() {
-        MinecraftForge.EVENT_BUS.register(SkinRestorerForge.class);
-        
-        SkinRestorer.onInitialize();
-    }
-    
-    @SubscribeEvent
-    public static void onCommandRegister(RegisterCommandsEvent event) {
-        SkinCommand.register(event.getDispatcher());
-    }
-    
-    @SubscribeEvent
-    public static void onServerStarted(ServerStartedEvent event) {
-        SkinRestorer.onServerStarted(event.getServer());
-    }
-}
--- a/forge/src/main/java/net/lionarius/skinrestorer/forge/platform/ForgePlatformHelper.java
+++ b/forge/src/main/java/net/lionarius/skinrestorer/forge/platform/ForgePlatformHelper.java
@@ -1,24 +0,0 @@
-package net.lionarius.skinrestorer.forge.platform;
-
-import net.lionarius.skinrestorer.platform.services.PlatformHelper;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.loading.FMLPaths;
-
-import java.nio.file.Path;
-
-public final class ForgePlatformHelper implements PlatformHelper {
-    @Override
-    public String getPlatformName() {
-        return "forge";
-    }
-    
-    @Override
-    public boolean isModLoaded(String modId) {
-        return ModList.get().isLoaded(modId);
-    }
-    
-    @Override
-    public Path getConfigDirectory() {
-        return FMLPaths.CONFIGDIR.get();
-    }
-}
--- a/forge/src/main/resources/META-INF/mods.toml
+++ b/forge/src/main/resources/META-INF/mods.toml
@@ -1,27 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "${forge_loader_version_range}"
-license = "${license}"
-issueTrackerURL = "${mod_issues}"
-
-[[mods]]
-modId = "${mod_id}"
-version = "${version}"
-displayName = "${mod_name}"
-authors = "${mod_author}"
-logoFile = "assets/${mod_id}/icon.png"
-displayURL = "${mod_homepage}"
-description = '''${description}'''
-
-[[dependencies.${mod_id}]]
-modId = "forge"
-mandatory = true
-versionRange = "[${forge_version},)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.${mod_id}]]
-modId = "minecraft"
-mandatory = true
-versionRange = "${minecraft_version_range}"
-ordering = "NONE"
-side = "BOTH"
--- a/forge/src/main/resources/META-INF/services/net.lionarius.skinrestorer.platform.services.PlatformHelper
+++ b/forge/src/main/resources/META-INF/services/net.lionarius.skinrestorer.platform.services.PlatformHelper
@@ -1 +0,0 @@
-net.lionarius.skinrestorer.forge.platform.ForgePlatformHelper
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,43 +1,14 @@
-# Project
-group=net.lionarius.skinrestorer
-java_version=21
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true

-# Common
-minecraft_version=1.20.5
-minecraft_version_list=1.20.5,1.20.6
-minecraft_version_range=[1.20.5,1.20.6]
-mod_id=skinrestorer
-mod_name=SkinRestorer
-mod_version=2.1.0
-mod_author=Lionarius
-mod_homepage=https://modrinth.com/mod/skinrestorer
-mod_sources=https://github.com/Suiranoil/SkinRestorer
-mod_issues=https://github.com/Suiranoil/SkinRestorer/issues
-license=MIT
-credits=
-description=A server-side mod for managing skins.
+# Fabric Properties
+# check these on https://fabricmc.net/versions.html
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.1
+loader_version=0.14.22

-# ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-parchment_minecraft=1.20.6
-parchment_version=2024.06.16
-
-# Fabric, see https://fabricmc.net/develop/ for new versions
-fabric_loader_version=0.15.0
-
-# Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=50.0.0
-forge_loader_version_range=[50,)
-# Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.20.6
-
-# NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions
-neoforge_version=20.5.0-beta
-neoforge_loader_version_range=[3,)
-
-# Publishing
-curseforge_id=443823
-modrinth_id=ghrZDhGW
-
-# Gradle
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
+# Mod Properties
+mod_version=1.2.6
+maven_group=net.lionarius
+archives_base_name=skin-restorer
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
--- a/16
+++ b/16
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
    case $MAX_FD in #(
      max*)
        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
        MAX_FD=$( ulimit -H -n ) ||
            warn "Could not query maximum file descriptor limit"
    esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
      '' | soft) :;; #(
      *)
        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
        ulimit -n "$MAX_FD" ||
            warn "Could not set maximum file descriptor limit to $MAX_FD"
    esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.

 set -- \
        "-Dorg.gradle.appname=$APP_BASE_NAME" \
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 if exist "%JAVA_EXE%" goto execute

-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.

 goto fail

--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -1,42 +0,0 @@
-plugins {
-    id 'multiloader-loader'
-    id 'idea'
-    id 'eclipse'
-
-    id 'net.neoforged.gradle.userdev'
-
-    id 'multiloader-publish'
-}
-
-// Automatically enable neoforge AccessTransformers if the file exists
-def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
-if (at.exists()) {
-    minecraft.accessTransformers.file(at)
-}
-
-subsystems {
-    parchment {
-        minecraftVersion = parchment_minecraft
-        mappingsVersion = parchment_version
-    }
-}
-
-runs {
-    configureEach {
-        modSource project.sourceSets.main
-        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
-    }
-
-    client {
-        workingDirectory = file('../run/client')
-    }
-
-    server {
-        programArgument '--nogui'
-        workingDirectory = file('../run/server')
-    }
-}
-
-dependencies {
-    implementation "net.neoforged:neoforge:${neoforge_version}"
-}
--- a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java
+++ b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java
@@ -1,31 +0,0 @@
-package net.lionarius.skinrestorer.neoforge;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.command.SkinCommand;
-import net.neoforged.bus.api.SubscribeEvent;
-import net.neoforged.fml.common.EventBusSubscriber;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.common.NeoForge;
-import net.neoforged.neoforge.event.RegisterCommandsEvent;
-import net.neoforged.neoforge.event.server.ServerStartedEvent;
-
-@Mod(SkinRestorer.MOD_ID)
-@EventBusSubscriber(modid = SkinRestorer.MOD_ID)
-public final class SkinRestorerNeoForge {
-    
-    public SkinRestorerNeoForge() {
-        NeoForge.EVENT_BUS.register(SkinRestorerNeoForge.class);
-        
-        SkinRestorer.onInitialize();
-    }
-    
-    @SubscribeEvent
-    public static void onCommandRegister(RegisterCommandsEvent event) {
-        SkinCommand.register(event.getDispatcher());
-    }
-    
-    @SubscribeEvent
-    public static void onServerStarted(ServerStartedEvent event) {
-        SkinRestorer.onServerStarted(event.getServer());
-    }
-}
--- a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/platform/NeoForgePlatformHelper.java
+++ b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/platform/NeoForgePlatformHelper.java
@@ -1,24 +0,0 @@
-package net.lionarius.skinrestorer.neoforge.platform;
-
-import net.lionarius.skinrestorer.platform.services.PlatformHelper;
-import net.neoforged.fml.ModList;
-import net.neoforged.fml.loading.FMLPaths;
-
-import java.nio.file.Path;
-
-public final class NeoForgePlatformHelper implements PlatformHelper {
-    @Override
-    public String getPlatformName() {
-        return "neoforge";
-    }
-    
-    @Override
-    public boolean isModLoaded(String modId) {
-        return ModList.get().isLoaded(modId);
-    }
-    
-    @Override
-    public Path getConfigDirectory() {
-        return FMLPaths.CONFIGDIR.get();
-    }
-}
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -1,30 +0,0 @@
-modLoader = "javafml"
-loaderVersion = "${neoforge_loader_version_range}"
-license = "${license}"
-issueTrackerURL = "${mod_issues}"
-
-[[mods]]
-modId = "${mod_id}"
-version = "${version}"
-displayName = "${mod_name}"
-authors = "${mod_author}"
-logoFile = "assets/${mod_id}/icon.png"
-displayURL = "${mod_homepage}"
-description = "${description}"
-
-[[mixins]]
-config = "${mod_id}.mixins.json"
-
-[[dependencies.${mod_id}]]
-modId = "neoforge"
-type = "required"
-versionRange = "[${neoforge_version},)"
-ordering = "NONE"
-side = "BOTH"
-
-[[dependencies.${mod_id}]]
-modId = "minecraft"
-type = "required"
-versionRange = "${minecraft_version_range}"
-ordering = "NONE"
-side = "BOTH"
--- a/neoforge/src/main/resources/META-INF/services/net.lionarius.skinrestorer.platform.services.PlatformHelper
+++ b/neoforge/src/main/resources/META-INF/services/net.lionarius.skinrestorer.platform.services.PlatformHelper
@@ -1 +0,0 @@
-net.lionarius.skinrestorer.neoforge.platform.NeoForgePlatformHelper
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,74 +1,9 @@
 pluginManagement {
    repositories {
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
        gradlePluginPortal()
-        mavenCentral()
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name = 'Fabric'
-                    url = 'https://maven.fabricmc.net'
-                }
-            }
-            filter {
-                includeGroupAndSubgroups('net.fabricmc')
-                includeGroupAndSubgroups('fabric-loom')
-            }
-        }
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name = 'Forge'
-                    url = 'https://maven.minecraftforge.net'
-                }
-            }
-            filter {
-                includeGroupAndSubgroups('net.minecraftforge')
-            }
-        }
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name = 'NeoForge'
-                    url = 'https://maven.neoforged.net/releases'
-                }
-            }
-            filter {
-                includeGroupAndSubgroups('net.neoforged')
-                includeGroupAndSubgroups('codechicken')
-            }
-        }
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name = 'Sponge'
-                    url = 'https://repo.spongepowered.org/repository/maven-public'
-                }
-            }
-            filter {
-                includeGroupAndSubgroups('org.spongepowered')
-            }
-        }
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name = 'ParchmentMC'
-                    url = 'https://maven.parchmentmc.org'
-                }
-            }
-            filter {
-                includeGroupAndSubgroups('org.parchmentmc')
-            }
-        }
    }
 }
-
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
-}
-
-// This should match the folder name of the project, or else IDEA may complain (see https://youtrack.jetbrains.com/issue/IDEA-317606)
-rootProject.name = 'skin-restorer'
-include('common')
-include('fabric')
-include('forge')
-include('neoforge')
--- a/src/main/java/net/lionarius/skinrestorer/MineskinSkinProvider.java
+++ b/src/main/java/net/lionarius/skinrestorer/MineskinSkinProvider.java
@@ -0,0 +1,31 @@
+package net.lionarius.skinrestorer;
+
+import com.google.gson.JsonObject;
+import com.mojang.authlib.properties.Property;
+import net.lionarius.skinrestorer.enums.SkinVariant;
+import net.lionarius.skinrestorer.util.JsonUtils;
+import net.lionarius.skinrestorer.util.WebUtils;
+
+import java.io.IOException;
+import java.net.URL;
+
+public class MineskinSkinProvider {
+
+    private static final String API = "https://api.mineskin.org/generate/url";
+    private static final String USER_AGENT = "SkinRestorer";
+    private static final String TYPE = "application/json";
+
+    public static Property getSkin(String url, SkinVariant variant) {
+        try {
+            String input = ("{\"variant\":\"%s\",\"name\":\"%s\",\"visibility\":%d,\"url\":\"%s\"}")
+                    .formatted(variant.toString(), "none", 1, url);
+
+            JsonObject texture = JsonUtils.parseJson(WebUtils.POSTRequest(new URL(API), USER_AGENT, TYPE, TYPE, input))
+                    .getAsJsonObject("data").getAsJsonObject("texture");
+
+            return new Property("textures", texture.get("value").getAsString(), texture.get("signature").getAsString());
+        } catch (IOException e) {
+            return null;
+        }
+    }
+}
--- a/src/main/java/net/lionarius/skinrestorer/MojangSkinProvider.java
+++ b/src/main/java/net/lionarius/skinrestorer/MojangSkinProvider.java
@@ -0,0 +1,33 @@
+package net.lionarius.skinrestorer;
+
+import com.google.gson.JsonObject;
+import com.mojang.authlib.properties.Property;
+import net.lionarius.skinrestorer.util.JsonUtils;
+import net.lionarius.skinrestorer.util.WebUtils;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.UUID;
+
+public class MojangSkinProvider {
+
+    private static final String API = "https://api.mojang.com/users/profiles/minecraft/";
+    private static final String SESSION_SERVER = "https://sessionserver.mojang.com/session/minecraft/profile/";
+
+    public static Property getSkin(String name) {
+        try {
+            UUID uuid = getUUID(name);
+            JsonObject texture = JsonUtils.parseJson(WebUtils.GETRequest(new URL(SESSION_SERVER + uuid + "?unsigned=false")))
+                    .getAsJsonArray("properties").get(0).getAsJsonObject();
+
+            return new Property("textures", texture.get("value").getAsString(), texture.get("signature").getAsString());
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private static UUID getUUID(String name) throws IOException {
+        return UUID.fromString(JsonUtils.parseJson(WebUtils.GETRequest(new URL(API + name))).get("id").getAsString()
+                .replaceFirst("(\\p{XDigit}{8})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}{4})(\\p{XDigit}+)", "$1-$2-$3-$4-$5"));
+    }
+}
--- a/src/main/java/net/lionarius/skinrestorer/SkinIO.java
+++ b/src/main/java/net/lionarius/skinrestorer/SkinIO.java
@@ -0,0 +1,27 @@
+package net.lionarius.skinrestorer;
+
+import com.mojang.authlib.properties.Property;
+import net.lionarius.skinrestorer.util.FileUtils;
+import net.lionarius.skinrestorer.util.JsonUtils;
+
+import java.nio.file.Path;
+import java.util.UUID;
+
+public class SkinIO {
+
+    private static final String FILE_EXTENSION = ".json";
+
+    private final Path savePath;
+
+    public SkinIO(Path savePath) {
+        this.savePath = savePath;
+    }
+
+    public Property loadSkin(UUID uuid) {
+        return JsonUtils.fromJson(FileUtils.readFile(savePath.resolve(uuid + FILE_EXTENSION).toFile()), Property.class);
+    }
+
+    public void saveSkin(UUID uuid, Property skin) {
+        FileUtils.writeFile(savePath.toFile(), uuid + FILE_EXTENSION, JsonUtils.toJson(skin));
+    }
+}
--- a/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
+++ b/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
@@ -0,0 +1,129 @@
+package net.lionarius.skinrestorer;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import it.unimi.dsi.fastutil.Pair;
+import net.fabricmc.api.DedicatedServerModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.network.packet.s2c.play.*;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerChunkManager;
+import net.minecraft.server.world.ServerWorld;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+public class SkinRestorer implements DedicatedServerModInitializer {
+
+    private static SkinStorage skinStorage;
+
+    public static final Logger LOGGER = LoggerFactory.getLogger("SkinRestorer");
+
+    public static SkinStorage getSkinStorage() {
+        return skinStorage;
+    }
+
+    @Override
+    public void onInitializeServer() {
+        skinStorage = new SkinStorage(new SkinIO(FabricLoader.getInstance().getConfigDir().resolve("skinrestorer")));
+    }
+
+    public static void refreshPlayer(ServerPlayerEntity player) {
+        ServerWorld serverWorld = player.getServerWorld();
+        PlayerManager playerManager = serverWorld.getServer().getPlayerManager();
+        ServerChunkManager chunkManager = serverWorld.getChunkManager();
+
+        playerManager.sendToAll(new BundleS2CPacket(
+                List.of(
+                        new PlayerRemoveS2CPacket(List.of(player.getUuid())),
+                        PlayerListS2CPacket.entryFromPlayer(Collections.singleton(player))
+                )
+        ));
+        chunkManager.unloadEntity(player);
+        chunkManager.loadEntity(player);
+        player.networkHandler.sendPacket(
+                new PlayerRespawnS2CPacket(player.createCommonPlayerSpawnInfo(serverWorld), PlayerRespawnS2CPacket.KEEP_ALL)
+        );
+        player.networkHandler.requestTeleport(player.getX(), player.getY(), player.getZ(), player.getYaw(), player.getPitch());
+        player.networkHandler.sendPacket(new EntityVelocityUpdateS2CPacket(player));
+        player.sendAbilitiesUpdate();
+        player.addExperience(0);
+        playerManager.sendCommandTree(player);
+        playerManager.sendWorldInfo(player, serverWorld);
+        playerManager.sendPlayerStatus(player);
+        for (StatusEffectInstance statusEffectInstance : player.getStatusEffects()) {
+            player.networkHandler.sendPacket(new EntityStatusEffectS2CPacket(player.getId(), statusEffectInstance));
+        }
+    }
+
+    public static CompletableFuture<Pair<Collection<ServerPlayerEntity>, Collection<GameProfile>>> setSkinAsync(MinecraftServer server, Collection<GameProfile> targets, Supplier<Property> skinSupplier) {
+        return CompletableFuture.<Pair<Property, Collection<GameProfile>>>supplyAsync(() -> {
+            HashSet<GameProfile> acceptedProfiles = new HashSet<>();
+            Property skin = skinSupplier.get();
+            if (Objects.isNull(skin)) {
+                SkinRestorer.LOGGER.error("Cannot get the skin for {}", targets.stream().findFirst().orElseThrow());
+                return Pair.of(null, Collections.emptySet());
+            }
+
+            for (GameProfile profile : targets) {
+                SkinRestorer.getSkinStorage().setSkin(profile.getId(), skin);
+                acceptedProfiles.add(profile);
+            }
+
+            return Pair.of(skin, acceptedProfiles);
+        }).<Pair<Collection<ServerPlayerEntity>, Collection<GameProfile>>>thenApplyAsync(pair -> {
+            Property skin = pair.left();
+            if (Objects.isNull(skin))
+                return Pair.of(Collections.emptySet(), Collections.emptySet());
+
+            Collection<GameProfile> acceptedProfiles = pair.right();
+            HashSet<ServerPlayerEntity> acceptedPlayers = new HashSet<>();
+            JsonObject newSkinJson = gson.fromJson(new String(Base64.getDecoder().decode(skin.value()), StandardCharsets.UTF_8), JsonObject.class);
+            newSkinJson.remove("timestamp");
+            for (GameProfile profile : acceptedProfiles) {
+                ServerPlayerEntity player = server.getPlayerManager().getPlayer(profile.getId());
+
+                if (player == null || arePropertiesEquals(newSkinJson, player.getGameProfile()))
+                    continue;
+
+                applyRestoredSkin(player.getGameProfile(), skin);
+                refreshPlayer(player);
+                acceptedPlayers.add(player);
+            }
+            return Pair.of(acceptedPlayers, acceptedProfiles);
+        }, server).orTimeout(10, TimeUnit.SECONDS).exceptionally(e -> Pair.of(Collections.emptySet(), Collections.emptySet()));
+    }
+
+    public static void applyRestoredSkin(GameProfile profile, Property skin) {
+        profile.getProperties().removeAll("textures");
+        profile.getProperties().put("textures", skin);
+    }
+
+    private static final Gson gson = new Gson();
+
+    private static boolean arePropertiesEquals(@NotNull JsonObject x, @NotNull GameProfile y) {
+        Property py = y.getProperties().get("textures").stream().findFirst().orElse(null);
+        if (py == null)
+            return false;
+
+        try {
+            JsonObject jy = gson.fromJson(new String(Base64.getDecoder().decode(py.value()), StandardCharsets.UTF_8), JsonObject.class);
+            jy.remove("timestamp");
+            return x.equals(jy);
+        } catch (Exception ex) {
+            SkinRestorer.LOGGER.info("Can not compare skin", ex);
+            return false;
+        }
+    }
+}
--- a/src/main/java/net/lionarius/skinrestorer/SkinStorage.java
+++ b/src/main/java/net/lionarius/skinrestorer/SkinStorage.java
@@ -0,0 +1,42 @@
+package net.lionarius.skinrestorer;
+
+import com.mojang.authlib.properties.Property;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class SkinStorage {
+
+    public static final Property DEFAULT_SKIN = new Property("textures", "ewogICJ0ZXh0dXJlcyIgOiB7CiAgICAiU0tJTiIgOiB7CiAgICAgICJpZCIgOiAiZWZhMTFjN2U1YThlNGIwM2JjMDQ0MWRmNzk1YjE0YjIiLAogICAgICAidHlwZSIgOiAiU0tJTiIsCiAgICAgICJ1cmwiIDogImh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvOTYzNDM4OTUzYTc4MmRhNzY5NDgwYjBhNDkxMjVhOTJlMjU5MjA3NzAwY2I4ZTNlMWFhYzM4ZTQ3MWUyMDMwOCIsCiAgICAgICJwcm9maWxlSWQiIDogImZkNjBmMzZmNTg2MTRmMTJiM2NkNDdjMmQ4NTUyOTlhIiwKICAgICAgInRleHR1cmVJZCIgOiAiOTYzNDM4OTUzYTc4MmRhNzY5NDgwYjBhNDkxMjVhOTJlMjU5MjA3NzAwY2I4ZTNlMWFhYzM4ZTQ3MWUyMDMwOCIKICAgIH0KICB9LAogICJza2luIiA6IHsKICAgICJpZCIgOiAiZWZhMTFjN2U1YThlNGIwM2JjMDQ0MWRmNzk1YjE0YjIiLAogICAgInR5cGUiIDogIlNLSU4iLAogICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS85NjM0Mzg5NTNhNzgyZGE3Njk0ODBiMGE0OTEyNWE5MmUyNTkyMDc3MDBjYjhlM2UxYWFjMzhlNDcxZTIwMzA4IiwKICAgICJwcm9maWxlSWQiIDogImZkNjBmMzZmNTg2MTRmMTJiM2NkNDdjMmQ4NTUyOTlhIiwKICAgICJ0ZXh0dXJlSWQiIDogIjk2MzQzODk1M2E3ODJkYTc2OTQ4MGIwYTQ5MTI1YTkyZTI1OTIwNzcwMGNiOGUzZTFhYWMzOGU0NzFlMjAzMDgiCiAgfSwKICAiY2FwZSIgOiBudWxsCn0=",
+            "T6Czh1iATQTwG/ppZyY9N7cNASVHfGkiicrFykYAve4C7vG36ql0EPf6gMfMIS2eL0FdGLznnWiEC2dUxwNCJwiEyzTo/chlxZMk4TSzkBdBU3KTUZdNZrS/YhTzhi7C4eUVaEtXMRlCVtLQUa8Nb18SFYz243C9tlDsONNk42+xHPN1vRCRGIxfJbcU/mk4/XZzS4zHwPCkB6N4dKX2F6LA+a2P+CUMBluXKF56UiT1j7DjWs8B+6ES0kkmZUGkRaxTtcyN2Rqpx/2wCroohxkyVRAdlkcnwbEHOEKGoYMKdjUWpSm8QrsLkUiyLL3IK/hgd5ET2nI/aE1AloAwr1fotmvf9KF1JIfZljoefYZIaYZ1PpvduwIkAaeeIC4FFcdcBIheHitYyXOBAr/t5E+pTzCJOttDfYggFSyGxOj5yxgXTT4gSwTKp5zkQqiCKdAQQPmgFqxhWkZ2UaE9zq+E5jSOD0OJj3FmBscdZWKoOm+mWZkXbw9z2ZvuqXAKHsi6uVJyGeUzt2hJL8eqOyAmfYsJgfxhGZen5oOlxZra8OxIYlp8TcTwzEIDievgp0dfsGPObGVgtA8D39QiwLXs6e/o0qnzl3+wQJDa/ZqDMISULkBNhPx/TvhYW5MJw3hZIj2gsbf73n+jId1GOUfTVMaFlVf7pvPNqW0PieY=");
+
+    private final Map<UUID, Property> skinMap = new HashMap<>();
+    private final SkinIO skinIO;
+
+    public SkinStorage(SkinIO skinIO) {
+        this.skinIO = skinIO;
+    }
+
+    public Property getSkin(UUID uuid) {
+        if (!skinMap.containsKey(uuid)) {
+            Property skin = skinIO.loadSkin(uuid);
+            setSkin(uuid, skin);
+        }
+
+        return skinMap.get(uuid);
+    }
+
+    public void removeSkin(UUID uuid) {
+        if (skinMap.containsKey(uuid)) {
+            skinIO.saveSkin(uuid, skinMap.get(uuid));
+        }
+    }
+
+    public void setSkin(UUID uuid, Property skin) {
+        if (skin == null)
+            skin = DEFAULT_SKIN;
+
+        skinMap.put(uuid, skin);
+    }
+}
--- a/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
+++ b/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
@@ -0,0 +1,98 @@
+package net.lionarius.skinrestorer.command;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import net.lionarius.skinrestorer.MineskinSkinProvider;
+import net.lionarius.skinrestorer.MojangSkinProvider;
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.enums.SkinVariant;
+import net.lionarius.skinrestorer.util.TranslationUtils;
+import net.minecraft.command.argument.GameProfileArgumentType;
+import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.function.Supplier;
+
+import static net.lionarius.skinrestorer.SkinStorage.DEFAULT_SKIN;
+import static net.minecraft.server.command.CommandManager.argument;
+import static net.minecraft.server.command.CommandManager.literal;
+
+public class SkinCommand {
+
+    public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
+        dispatcher.register(literal("skin")
+                .then(literal("set")
+                        .then(literal("mojang")
+                                .then(argument("skin_name", StringArgumentType.word())
+                                        .executes(context ->
+                                                skinAction(context.getSource(),
+                                                        () -> MojangSkinProvider.getSkin(StringArgumentType.getString(context, "skin_name"))))
+                                        .then(argument("targets", GameProfileArgumentType.gameProfile()).requires(source -> source.hasPermissionLevel(2))
+                                                .executes(context ->
+                                                        skinAction(context.getSource(), GameProfileArgumentType.getProfileArgument(context, "targets"), true,
+                                                                () -> MojangSkinProvider.getSkin(StringArgumentType.getString(context, "skin_name")))))))
+                        .then(literal("web")
+                                .then(literal("classic")
+                                        .then(argument("url", StringArgumentType.string())
+                                                .executes(context ->
+                                                        skinAction(context.getSource(),
+                                                                () -> MineskinSkinProvider.getSkin(StringArgumentType.getString(context, "url"), SkinVariant.CLASSIC)))
+                                                .then(argument("targets", GameProfileArgumentType.gameProfile()).requires(source -> source.hasPermissionLevel(2))
+                                                        .executes(context ->
+                                                                skinAction(context.getSource(), GameProfileArgumentType.getProfileArgument(context, "targets"), true,
+                                                                        () -> MineskinSkinProvider.getSkin(StringArgumentType.getString(context, "url"), SkinVariant.CLASSIC))))))
+                                .then(literal("slim")
+                                        .then(argument("url", StringArgumentType.string())
+                                                .executes(context ->
+                                                        skinAction(context.getSource(),
+                                                                () -> MineskinSkinProvider.getSkin(StringArgumentType.getString(context, "url"), SkinVariant.SLIM)))
+                                                .then(argument("targets", GameProfileArgumentType.gameProfile()).requires(source -> source.hasPermissionLevel(2))
+                                                        .executes(context ->
+                                                                skinAction(context.getSource(), GameProfileArgumentType.getProfileArgument(context, "targets"), true,
+                                                                        () -> MineskinSkinProvider.getSkin(StringArgumentType.getString(context, "url"), SkinVariant.SLIM))))))))
+                .then(literal("clear")
+                        .executes(context ->
+                                skinAction(context.getSource(),
+                                        () -> DEFAULT_SKIN))
+                        .then(argument("targets", GameProfileArgumentType.gameProfile()).requires(source -> source.hasPermissionLevel(2)).executes(context ->
+                                skinAction(context.getSource(), GameProfileArgumentType.getProfileArgument(context, "targets"), true,
+                                        () -> DEFAULT_SKIN))))
+        );
+    }
+
+    private static int skinAction(ServerCommandSource src, Collection<GameProfile> targets, boolean setByOperator, Supplier<Property> skinSupplier) {
+        SkinRestorer.setSkinAsync(src.getServer(), targets, skinSupplier).thenAccept(pair -> {
+            Collection<GameProfile> profiles = pair.right();
+            Collection<ServerPlayerEntity> players = pair.left();
+            if (profiles.size() == 0) {
+                src.sendError(Text.of(TranslationUtils.translation.skinActionFailed));
+                return;
+            }
+            if (setByOperator) {
+                src.sendFeedback(() -> Text.of(
+                        String.format(TranslationUtils.translation.skinActionAffectedProfile,
+                                String.join(", ", profiles.stream().map(GameProfile::getName).toList()))), true);
+                if (players.size() != 0) {
+                    src.sendFeedback(() -> Text.of(
+                            String.format(TranslationUtils.translation.skinActionAffectedPlayer,
+                                    String.join(", ", players.stream().map(p -> p.getGameProfile().getName()).toList()))), true);
+                }
+            } else {
+                src.sendFeedback(() -> Text.of(TranslationUtils.translation.skinActionOk), true);
+            }
+        });
+        return targets.size();
+    }
+
+    private static int skinAction(ServerCommandSource src, Supplier<Property> skinSupplier) {
+        if (src.getPlayer() == null)
+            return 0;
+
+        return skinAction(src, Collections.singleton(src.getPlayer().getGameProfile()), false, skinSupplier);
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lionarius	3a3a153893	bump version	2024-06-25 14:45:39 +03:00
lionarius	926ae577e1	remove unknown state packet	2024-06-25 14:43:41 +03:00
lionarius	8a1d28b65d	remove new parameter	2024-06-25 14:41:17 +03:00
lionarius	597142421d	fix no method sendStatusEffects	2024-06-25 14:41:17 +03:00
lionarius	68fb2ae683	better skin refresh	2024-06-25 14:41:16 +03:00
lionarius	e91b60d110	allow command blocks to execute commands	2024-06-25 12:06:00 +03:00
lionarius	8050f7f879	fix no permission level for clear command targets	2024-06-25 12:05:57 +03:00
				`@@ -1 +0,0 @@`
				`net.lionarius.skinrestorer.fabric.platform.FabricPlatformHelper`
				`@@ -1 +0,0 @@`
				`net.lionarius.skinrestorer.forge.platform.ForgePlatformHelper`
				`@@ -1 +0,0 @@`
				`net.lionarius.skinrestorer.neoforge.platform.NeoForgePlatformHelper`