backport to 1.20.3-1.20.4

backport to 1.20.5-1.20.6
2026-01-16 04:42:12 +00:00 · 2024-07-03 02:31:38 +03:00 · 2024-07-03 01:56:27 +03:00
136 changed files with 719 additions and 3216 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -1,90 +0,0 @@
-name: Bug Report
-description: Report a bug encountered with SkinRestorer
-title: "[Bug]: "
-labels: ["bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        🐛 **Before submitting:**
-        - Ensure you're using the latest mod version
-        - Ensure this bug is reproducible consistently
-        - Check existing issues for duplicates
-
-  - type: input
-    id: mod-version
-    attributes:
-      label: SkinRestorer Version
-      description: Exact version of the mod
-      placeholder: e.g., 2.2.1
-    validations:
-      required: true
-
-  - type: input
-    id: minecraft-version
-    attributes:
-      label: Minecraft Version
-      description: Full Minecraft version
-      placeholder: e.g., 1.21.4
-    validations:
-      required: true
-
-  - type: input
-    id: loader-version
-    attributes:
-      label: Mod Loader & Version
-      description: Fabric/Quilt/Forge/NeoForge version
-      placeholder: e.g., Fabric 0.15.7
-    validations:
-      required: true
-
-  - type: input
-    id: java-version
-    attributes:
-      label: Java Version
-      placeholder: e.g. 17, 21
-    validations:
-      required: true
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Bug Description
-      description: What happened vs what you expected to happen
-    validations:
-      required: true
-
-  - type: textarea
-    id: steps
-    attributes:
-      label: Reproduction Steps
-      description: Provide step-by-step instructions or a video showing how to reproduce the issue.
-      placeholder: |
-        1. 
-        2. 
-        3. 
-        Or a video demonstrating the issue.
-    validations:
-      required: true
-
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant Logs
-      description: |
-        Please provide any relevant logs, especially error logs from your server console or `latest.log` file.
-        **Important**: Paste the FULL log content. Use a service like [mclo.gs](https://mclo.gs/).
-      render: shell
-    validations:
-      required: true
-
-  - type: checkboxes
-    id: confirmations
-    attributes:
-      label: Confirmations
-      options:
-        - label: I've checked for existing issues
-          required: true
-        - label: This bug is reproducible consistently
-          required: true
-        - label: I've tested without other mods
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1 +0,0 @@
-blank_issues_enabled: true
--- a/.github/ISSUE_TEMPLATE/feature_request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -1,52 +0,0 @@
-name: Feature Request
-description: Suggest a new feature for SkinRestorer
-title: "[Feature Request]: "
-labels: ["enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        💡 **Before submitting:**
-        - Check existing feature requests for duplicates
-        - Be clear and concise
-        - Explain the *why* and the *how*
-
-  - type: textarea
-    id: description
-    attributes:
-      label: Feature Description
-      description: Detailed description of the feature
-    validations:
-      required: true
-
-  - type: textarea
-    id: motivation
-    attributes:
-      label: Motivation
-      description: Why is this feature needed? What problem does it solve?
-    validations:
-      required: true
-
-  - type: textarea
-    id: use-cases
-    attributes:
-      label: Use Cases
-      description: How would this feature be used and who would benefit?
-    validations:
-      required: true
-
-  - type: textarea
-    id: implementation-ideas
-    attributes:
-      label: Implementation Ideas (Optional)
-      description: Any thoughts on how it could be implemented?
-    validations:
-      required: false
-
-  - type: checkboxes
-    id: confirmations
-    attributes:
-      label: Confirmations
-      options:
-        - label: I've checked for existing feature requests
-          required: true
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,39 +1,31 @@
 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
+  build:
+    runs-on: ubuntu-latest

-            -   uses: actions/setup-java@v4
-                with:
-                    distribution: temurin
-                    java-version: 21
+    steps:
+      - uses: actions/checkout@v2

-            -   name: Setup Gradle
-                uses: gradle/actions/setup-gradle@v3
-                with:
-                    cache-read-only: false
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21

-            -   name: Change wrapper permissions
-                run: chmod +x ./gradlew
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          cache-read-only: false

-            -   name: Run build with Gradle Wrapper
-                run: ./gradlew build
+      - name: Change wrapper permissions
+        run: chmod +x ./gradlew

-            -   name: Upload built JARs
-                uses: actions/upload-artifact@v4
-                with:
-                    name: skin-restorer-artifacts
-                    path: ./*/build/libs/*.jar
+      - name: Run build with Gradle Wrapper
+        run: ./gradlew build
+
+      - name: Upload built JAR
+        uses: actions/upload-artifact@v3
+        with:
+          name: skin-restorer-artifacts
+          path: build/libs/merged
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,36 +0,0 @@
-name: release
-on:
-    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
@@ -30,4 +30,3 @@ bin/

 .architectury-transformer/
 run/
-scripts/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,159 +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.5.0] - 2026-01-14
-### Added
- Added collection skin provider (allows assigning random skins from a predefined set)
- Added `forceFirstJoinSkinFetch` config option to force skin fetch on first join even if player already has a skin
-
-## [2.4.3] - 2025-07-25
-### Fixed
- Fixed crash on client when loading player head skin (fixes [#63](https://github.com/Suiranoil/SkinRestorer/issues/63) and [#64](https://github.com/Suiranoil/SkinRestorer/issues/64))
- Fixed server freeze when loading player head skin
-
-## [2.4.2] - 2025-07-13
-### Fixed
- Fix crash when head profile name is null (fixes [#60](https://github.com/Suiranoil/SkinRestorer/issues/60) and [#61](https://github.com/Suiranoil/SkinRestorer/issues/61))
-
-## [2.4.1] - 2025-07-09
-### Changed
- Log full exception and argument when unable to fetch/set skin
-### Fixed
- Fixed mojang provider using offline uuids when unable to fetch actual uuid resulting in `no profile with uuid` error
-
-## [2.4.0] - 2025-07-05
-### Fixed
- Added support for player heads
-
-## [2.3.5] - 2025-06-21
-### Fixed
- Fix mod not loading on client
-
-## [2.3.4] - 2025-06-19
-### Added
- Added support for minecraft 1.21.6
-
-## [2.3.3] - 2025-06-01
-### Fixed
- Fixed forge mixin crash (closes [#54](https://github.com/Suiranoil/SkinRestorer/issues/53))
-### Removed
- Removed minecraft 1.19 support
-
-## [2.3.2] - 2025-05-24
-### Fixed
- Fixed mixin incompatibility with ModernFix (closes [#42](https://github.com/Suiranoil/SkinRestorer/issues/52))
-
-## [2.3.1] - 2025-05-03
-### Added
- Added support for minecraft 1.19-1.19.4
-### Changed
- Use services and session server urls from environment
-
-## [2.3.0] - 2025-03-27
-### Added
- Added `skinApplyDelayOnJoin` config option (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#skinapplydelayonjoin))
-### Changed
- Updated to 1.21.5
-### Removed
- [NeoForge] Dropped support for NeoForge on Minecraft 1.20.5-1.20.6
-
-## [2.2.1] - 2024-12-23
-### Fixed
- Fixed game not closing because of mineskin working threads (closes [#41](https://github.com/Suiranoil/SkinRestorer/issues/41))
-
-## [2.2.0] - 2024-12-02
-### Added
- Added support for [SkinShuffle](https://modrinth.com/mod/skinshuffle) clients (requires FabricAPI on Fabric)
-  (closes [#34](https://github.com/Suiranoil/SkinRestorer/issues/34))
- Added `providers.mineskin.apiKey` config option (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#providersmineskin))
-### Changed
- Migrated to MineSkin's new API V2
-### Fixed
- Fixed `providers` config validation
-### Removed
- Dropped support for NeoForge on Minecraft 1.20.2-1.20.4
-
-## [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,3 +0,0 @@
-### Added
- Added collection skin provider (allows assigning random skins from a predefined set) (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#providerscollection))
- Added `forceFirstJoinSkinFetch` config option to force skin fetch on first join even if player already has a skin (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#forcefirstjoinskinfetch))
--- a/README.md
+++ b/README.md
@@ -1,44 +1,58 @@
 # 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"></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"></a>
+![a](https://cf.way2muchnoise.eu/versions/skinrestorer.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&label=&suffix=%20&style=flat&color=242629&labelColor=5ca424&logoColor=1c1c1c)](https://modrinth.com/mod/skinrestorer)

-A server-side mod for managing and restoring player skins.
+SkinRestorer is a **server-side** only mod for Fabric that allows players to use and change skins on servers running in
+offline/insecure mode.

-## ✨ Features
+## Features

- **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**
- **SkinShuffle support**: Allow players with [SkinShuffle](https://modrinth.com/mod/skinshuffle) installed to apply skins using GUI.
+- **Set Skins from Mojang Account**: Fetch and apply skins using a valid Minecraft account name.
+- **Set Skins from URL**: Apply skins from any image URL, supporting both classic (Steve) and slim (Alex) skin models.

-## 📜 Command Usage Guide
+## 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).
+### Set Mojang Skin

-## ❌ Known Incompatibilities
+```
+/skin set mojang <username> [<targets>]
+```

- **[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.
+- **Parameters:**
+    - `<username>`: Minecraft account name to fetch the skin from.
+    - `[<targets>]`: (Optional, server operators only) Player(s) to apply the skin to.

-## 🪙 Donation
+### Set Web Skin

-If you enjoy using **SkinRestorer** and would like to support its development, you can contribute through the following
-platforms:
+```
+/skin set web (classic|slim) "<url>" [<targets>]
+```

-<a href="https://ko-fi.com/lionarius"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/donation/kofi/mini/badge.svg" alt="Ko-fi" height="32"></a>
+- **Parameters:**
+    - `(classic|slim)`: Type of the skin model (`classic` for Steve model, `slim` for Alex model).
+    - `"<url>"`: URL pointing to the skin image file (ensure it follows Minecraft's skin size and format requirements).
+    - `[<targets>]`: (Optional, server operators only) Player(s) to apply the skin to.

-<a href="https://boosty.to/lionarius"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/donation/boosty/mini/badge.svg" alt="Boosty" height="32"></a>
+### Clear Skin

-Bitcoin (BTC): `1Ndbwny8pxdnWXFgadp95fp97y5JqMJKTX`  
-USDT (TRC20): `TGXn8wrqku5KLzwPWQAeH7wgnV4UzwHEae`  
-USDT (TON): `UQAQF18Xlmx-V1oZ90C2YOju5qI7q1LgrCP5QaIUhqIELmDS`
+```
+/skin clear [<targets>]
+```

-Thank you for your generosity!
+- **Parameters:**
+    - `[<targets>]`: (Optional, server operators only) Player(s) to clear the skin for.
+
+### Notes:
+
+- If `targets` is not specified, the command will apply to the player executing the command.
+
+### Examples:
+
+```
+/skin set mojang Notch
+/skin set web classic "https://example.com/skin.png"
+/skin clear @a
+```
--- a/build.gradle
+++ b/build.gradle
@@ -1,28 +1,148 @@
 plugins {
-    // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.13-SNAPSHOT' apply false
-    // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
-    id 'net.neoforged.moddev' version '2.0.+' apply false
-    // see https://files.minecraftforge.net/net/minecraftforge/gradle/ForgeGradle/ for new versions
-    id 'net.minecraftforge.gradle' version '6.0.+' apply false
-    id 'org.parchmentmc.librarian.forgegradle' version '1.+' apply false
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "com.github.johnrengelman.shadow" version "8.1.1" apply false
+    id "io.github.pacifistmc.forgix" version "1.2.9"
+    id "me.shedaniel.unified-publishing" version "0.1.+"
+}

-    id 'org.spongepowered.mixin' version '0.7-SNAPSHOT' apply false
+version = "${project.mod_version}+${project.minecraft_version}"
+ext.version_name = "${project.capitalized_name} ${project.mod_version}"
+ext.headTag = "git describe --tags --abbrev=0 HEAD".execute([], rootProject.projectDir).text.trim()
+ext.previousTag = "git describe --tags --abbrev=0 HEAD^".execute([], rootProject.projectDir).text.trim()

-    id 'me.modmuss50.mod-publish-plugin' version '0.8.+' apply false
+architectury {
+    minecraft = project.minecraft_version
+}
+
+forgix {
+    group = "$project.maven_group.$project.mod_id"
+    // forgix does not append .jar extension for some reason
+    mergedJarName = "${project.archives_name}-${project.version}.jar"
+    outputDir = "build/libs/merged"
 }

 allprojects {
+    apply plugin: "java"
+    
+    version = rootProject.version
+    group = project.maven_group
+}
+
+subprojects {
+    apply plugin: "dev.architectury.loom"
+    apply plugin: "architectury-plugin"
+    
+    loom {
+        silentMojangMappingsLicense()
+    }
+
+    base {
+        archivesName = "$rootProject.archives_name-$project.name"
+    }
+
+    build.finalizedBy(mergeJars)
+    assemble.finalizedBy(mergeJars)
+
    repositories {
-        exclusiveContent {
-            forRepository {
-                maven {
-                    name = 'lionarius-repository'
-                    url = 'https://reposilite.lionarius.ru/releases'
-                }
+        maven {
+            name = "ParchmentMC"
+            url = "https://maven.parchmentmc.org"
+        }
+    }
+
+    dependencies {
+        minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
+        mappings loom.layered {
+            officialMojangMappings()
+            parchment("org.parchmentmc.data:parchment-$rootProject.parchment_minecraft_version:$rootProject.parchment_mappings@zip")
+        }
+    }
+
+    java {
+        withSourcesJar()
+
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
+    }
+
+    jar {
+        from "$rootProject.projectDir/LICENSE"
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        it.options.encoding = "UTF-8"
+
+        it.options.release.set(21)
+    }
+}
+
+// Adapted from https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.7/ferry.gradle
+tasks.register("generateChangelog") {
+    ext.changelog = ""
+
+    def lastTag = previousTag
+    def currentTag = headTag
+
+    def changes = new StringBuilder()
+    def commits = "git log --max-count=${project.changelog_max_commit_search} --pretty=format:\"%b\" $lastTag..$currentTag".execute()
+    commits.in.eachLine { line -> // Loops over the lines the git log command returns
+        def processedLine = line.toString()
+        if (processedLine.startsWith("\"")) {
+            processedLine = processedLine.substring(1)
+        }
+        if (processedLine.endsWith("\"")) {
+            processedLine = processedLine.substring(0, processedLine.length() - 1)
+        }
+        if (processedLine.startsWith("- ")) {
+            if (changes.length() == 0) {
+                changes << processedLine
+            } else {
+                changes << "\n$processedLine"
            }
-            filter {
-                includeGroupAndSubgroups('org.mineskin')
+        }
+    }
+    commits.err.eachLine { line -> println line }
+    commits.waitFor()
+
+    ext.changelog = changes.toString()
+    if (ext.changelog.isEmpty()) {
+        ext.changelog = "No Changelog Available"
+    }
+}
+
+tasks.register("assertNewVersion") {
+    if (headTag == previousTag) {
+        throw new GradleException("Current version $headTag is the same as previous. Please create a new version tag if you want to proceed.")
+    }
+}
+
+tasks.publishUnified.dependsOn("assertNewVersion", "build")
+
+unifiedPublishing {
+    project {
+        displayName = version_name.toString()
+        version = project.version
+        changelog = generateChangelog.changelog
+        releaseType = "release"
+        gameVersions = List.of(project.game_versions.split(","))
+        gameLoaders = List.of(project.mod_loaders.split(","))
+
+        mainPublication.set(file("build/libs/merged/${project.archives_name}-${project.version}.jar"))
+
+        var cfToken = System.getenv("CF_TOKEN")
+        if (cfToken != null) {
+            curseforge {
+                token = cfToken
+                id = project.curseforge_id
+            }
+        }
+
+        var mrToken = System.getenv("MODRINTH_TOKEN")
+        if (mrToken != null) {
+            modrinth {
+                token = mrToken
+                id = project.modrinth_id
            }
        }
    }
--- 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,110 +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,
-            '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,
-            'credits'                      : credits,
-            'java_version'                 : java_version,
-            
-            // Loader specific properties
-            'fabric_loader_version'        : project.hasProperty('fabric_loader_version') ? fabric_loader_version : '',
-            'forge_version'                : project.hasProperty('forge_version') ? forge_version : '',
-            'forge_loader_version_range'   : project.hasProperty('forge_loader_version_range') ? forge_loader_version_range : '',
-            'neoforge_version'             : project.hasProperty('neoforge_version') ? neoforge_version : '',
-            'neoforge_loader_version_range': project.hasProperty('neoforge_loader_version_range') ? neoforge_loader_version_range : ''
-    ]
-
-    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,46 +0,0 @@
-plugins {
-    id "me.modmuss50.mod-publish-plugin"
-}
-
-publishMods {
-    file = project.layout.buildDirectory.file("libs/${project.archivesBaseName}-${project.version}.jar").map { it.asFile }.getOrNull()
-
-    modLoaders.add(project.name)
-
-    if (project.hasProperty('additional_modloaders') && !additional_modloaders.isEmpty())
-    {
-        def loaders = additional_modloaders.split(',')
-        for (loader in loaders)
-            modLoaders.add(loader)
-    }
-    
-    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
-
-        if (project.hasProperty('optional_dependencies') && !optional_dependencies.isEmpty())
-            optional(optional_dependencies.split(','))
-    }
-
-    modrinth {
-        projectId = modrinth_id
-
-        dryRun = providers.environmentVariable("MODRINTH_TOKEN").getOrNull() == null
-        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-
-        minecraftVersions.addAll(minecraft_version_list.split(','))
-
-        if (project.hasProperty('optional_dependencies') && !optional_dependencies.isEmpty())
-            optional(optional_dependencies.split(','))
-    }
-}
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -1,43 +1,10 @@
-plugins {
-    id 'multiloader-common'
-
-    id 'fabric-loom'
+architectury {
+    common rootProject.enabled_platforms.split(",")
 }

 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'
-
-    implementation("org.mineskin:java-client:${mineskin_client_version}")
-}
-
-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
+    // We depend on Fabric Loader here to use the Fabric @Environment annotations,
+    // which get remapped to the correct annotations on each platform.
+    // Do NOT use other classes from Fabric Loader.
+    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
 }
--- 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,25 +1,18 @@
 package net.lionarius.skinrestorer;

-import com.google.common.base.Throwables;
-import com.mojang.brigadier.CommandDispatcher;
-import net.lionarius.skinrestorer.command.SkinCommand;
+import com.mojang.authlib.GameProfile;
 import net.lionarius.skinrestorer.config.Config;
-import net.lionarius.skinrestorer.config.provider.BuiltInProviderConfig;
-import net.lionarius.skinrestorer.exception.TransparentException;
-import net.lionarius.skinrestorer.mixin.PlayerAccessor;
-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.*;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.resources.Identifier;
+import net.lionarius.skinrestorer.util.FileUtils;
+import net.lionarius.skinrestorer.util.PlayerUtils;
+import net.lionarius.skinrestorer.util.Result;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.storage.LevelResource;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -28,6 +21,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;

 public final class SkinRestorer {
    public static final String MOD_ID = "skinrestorer";
@@ -37,8 +31,6 @@ public final class SkinRestorer {
    private static SkinStorage skinStorage;
    private static Path configDir;
    private static Config config;
-    private static TickedScheduler tickedScheduler;
-    private static MinecraftServer minecraftServer;
    
    private SkinRestorer() {}
    
@@ -58,101 +50,74 @@ public final class SkinRestorer {
        return SkinRestorer.providersRegistry;
    }
    
-    public static TickedScheduler getTickedScheduler() {
-        return SkinRestorer.tickedScheduler;
-    }
-    
-    public static @Nullable MinecraftServer getMinecraftServer() {
-        return SkinRestorer.minecraftServer;
-    }
-    
    public static Optional<SkinProvider> getProvider(String name) {
        return Optional.ofNullable(SkinRestorer.providersRegistry.get(name));
    }
    
-    public static Identifier resourceLocation(String name) {
-        return Identifier.fromNamespaceAndPath(SkinRestorer.MOD_ID, name);
-    }
-    
-    public static String assetPath(String name) {
-        return String.format("/assets/%s/%s", SkinRestorer.MOD_ID, name);
-    }
-    
-    public static void onInitialize() {
-        SkinRestorer.configDir = Services.PLATFORM.getConfigDirectory().resolve(SkinRestorer.MOD_ID);
+    public static void onInitialize(Path rootConfigDir) {
+        SkinRestorer.configDir = rootConfigDir.resolve(SkinRestorer.MOD_ID);
        SkinRestorer.reloadConfig();
        
        SkinRestorer.providersRegistry.register(EmptySkinProvider.PROVIDER_NAME, SkinProvider.EMPTY, false);
-        SkinRestorer.providersRegistry.register(SkinShuffleSkinProvider.PROVIDER_NAME, SkinProvider.SKIN_SHUFFLE, 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());
-        SkinRestorer.registerDefaultSkinProvider(CollectionSkinProvider.PROVIDER_NAME, SkinProvider.COLLECTION, SkinRestorer.getConfig().providersConfig().collection());
+        SkinRestorer.providersRegistry.register(MojangSkinProvider.PROVIDER_NAME, SkinProvider.MOJANG);
+        SkinRestorer.providersRegistry.register(ElyBySkinProvider.PROVIDER_NAME, SkinProvider.ELY_BY);
+        SkinRestorer.providersRegistry.register(MineskinSkinProvider.PROVIDER_NAME, SkinProvider.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);
+    public static void onServerStarted(MinecraftServer server) {
+        Path worldSkinDirectory = server.getWorldPath(LevelResource.ROOT).resolve(SkinRestorer.MOD_ID);
+        FileUtils.tryMigrateOldSkinDirectory(worldSkinDirectory);
        
-        if (!isDefaultName && !SkinProvider.BUILTIN_PROVIDER_NAMES.contains(config.name()))
-            SkinRestorer.providersRegistry.register(config.name(), provider, config.enabled());
+        SkinRestorer.skinStorage = new SkinStorage(new SkinIO(worldSkinDirectory));
    }
    
    public static void reloadConfig() {
        SkinRestorer.config = Config.load(SkinRestorer.getConfigDir());
        Translation.reloadTranslations();
-        WebUtils.recreateHttpClient();
-        
-        MojangSkinProvider.reload();
-        ElyBySkinProvider.reload();
-        MineskinSkinProvider.reload();
-        CollectionSkinProvider.reload();
    }
    
-    public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<ServerPlayer> targets, SkinValue value, boolean save) {
+    public static String resource(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 player : targets) {
-            var profile = player.getGameProfile();
-            var skin = PlayerUtils.getPlayerSkin(profile);
-            
-            if (!SkinRestorer.getSkinStorage().hasSavedSkin(profile.id()))
-                value = value.setOriginalValue(skin);
-            
-            if (PlayerUtils.areSkinPropertiesEquals(value.value(), skin))
-                continue;
+        for (var profile : targets) {
+            if (!SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId()))
+                value = value.setOriginalValue(PlayerUtils.getPlayerSkin(profile));
            
            if (save)
-                SkinRestorer.getSkinStorage().setSkin(profile.id(), value);
+                SkinRestorer.getSkinStorage().setSkin(profile.getId(), value);
            
-            var newProfile = PlayerUtils.applyRestoredSkin(profile, value.value());
-            ((PlayerAccessor) player).setGameProfile(newProfile);
+            if (PlayerUtils.areSkinPropertiesEquals(value.value(), PlayerUtils.getPlayerSkin(profile)))
+                continue;
            
-            if (player.connection == null)
+            PlayerUtils.applyRestoredSkin(profile, value.value());
+            
+            var player = server.getPlayerList().getPlayer(profile.getId());
+            if (player == null)
                continue;
            
            PlayerUtils.refreshPlayer(player);
            acceptedPlayers.add(player);
-            
-            SkinRestorer.getTickedScheduler().cancel(player.getUUID());
        }
        
        return acceptedPlayers;
    }
    
-    public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<ServerPlayer> targets, SkinValue value) {
+    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<ServerPlayer> targets,
+            Collection<GameProfile> targets,
            SkinProviderContext context,
            boolean save
    ) {
        return CompletableFuture.supplyAsync(
-                        () -> SkinRestorer.getProvider(context.name()).map(provider -> provider.fetchSkin(context.argument(), context.variant()))
+                        () -> SkinRestorer.getProvider(context.name()).map(provider -> provider.getSkin(context.argument(), context.variant()))
                )
                .thenApplyAsync(result -> {
                    if (result.isEmpty())
@@ -160,7 +125,7 @@ public final class SkinRestorer {
                    
                    var skinResult = result.get();
                    if (skinResult.isError())
-                        throw new TransparentException(Throwables.getRootCause(skinResult.getErrorValue()));
+                        return Result.<Collection<ServerPlayer>, String>error(skinResult.getErrorValue().getMessage());
                    
                    var skinValue = SkinValue.fromProviderContextWithValue(context, skinResult.getSuccessValue().orElse(null));
                    
@@ -169,37 +134,8 @@ public final class SkinRestorer {
                    return Result.<Collection<ServerPlayer>, String>success(acceptedPlayers);
                }, server)
                .exceptionally(e -> {
-                    SkinRestorer.LOGGER.error("Failed to set skin '{}:{}'", context.name(), context.argument(), e);
+                    SkinRestorer.LOGGER.error(e.toString());
                    return Result.error(e.getMessage());
                });
    }
-    
-    public static class Events {
-        private Events() {}
-        
-        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));
-            SkinRestorer.tickedScheduler = new TickedScheduler(server);
-            server.addTickable(SkinRestorer.tickedScheduler);
-            
-            SkinRestorer.minecraftServer = server;
-        }
-        
-        public static void onServerStopped(MinecraftServer server) {
-            SkinRestorer.skinStorage = null;
-            SkinRestorer.tickedScheduler = null;
-            SkinRestorer.minecraftServer = null;
-        }
-        
-        public static void onCommandRegister(CommandDispatcher<CommandSourceStack> dispatcher) {
-            SkinCommand.register(dispatcher);
-        }
-        
-        public static void onPlayerDisconnect(ServerPlayer player) {
-            SkinRestorer.getSkinStorage().removeSkin(player.getUUID());
-        }
-    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
@@ -1,5 +1,6 @@
 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;
@@ -12,18 +13,15 @@ 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.lionarius.skinrestorer.translation.Translation;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
 import net.minecraft.commands.arguments.GameProfileArgument;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.players.NameAndId;

 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -36,7 +34,7 @@ public final class SkinCommand {
    private SkinCommand() {}
    
    public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-        var base =
+        LiteralArgumentBuilder<CommandSourceStack> base =
                literal("skin")
                        .then(buildSetSubcommand("clear", SkinValue.EMPTY::toProviderContext))
                        .then(literal("reset")
@@ -46,19 +44,13 @@ public final class SkinCommand {
                                )))
                        .then(literal("refresh").executes(context -> refreshSubcommand(context.getSource())));
        
-        var set = literal("set");
+        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 -> Commands.LEVEL_OWNERS.check(commandSourceStack.permissions()))
-                        .then(literal("reload").executes(SkinCommand::configReloadSubcommand))
-        );
+        base.then(set);
        
        dispatcher.register(base);
    }
@@ -74,41 +66,37 @@ public final class SkinCommand {
        
        SkinProviderContext context = null;
        var save = true;
-        if (!SkinRestorer.getSkinStorage().hasSavedSkin(profile.id())) {
-            if (profile.properties().containsKey(PlayerUtils.TEXTURES_KEY)) {
+        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.id()).toProviderContext();
+            context = SkinRestorer.getSkinStorage().getSkin(profile.getId()).toProviderContext();
        }
        
        if (context == null)
            return 0;
        
-        return SkinCommand.setSubcommand(src, Collections.singleton(new NameAndId(profile)), context, save, false);
+        return SkinCommand.setSubcommand(src, Collections.singleton(profile), context, save, false);
    }
    
    private static int resetSubcommand(
            CommandSourceStack src,
-            Collection<NameAndId> targets,
+            Collection<GameProfile> targets,
            boolean setByOperator
    ) {
-        var updatedPlayers = new HashSet<ServerPlayer>();
-        for (var nameAndId : targets) {
+        Collection<ServerPlayer> updatedPlayers = new HashSet<>();
+        for (var profile : targets) {
            SkinValue skin = null;
-            if (SkinRestorer.getSkinStorage().hasSavedSkin(nameAndId.id()))
-                skin = SkinRestorer.getSkinStorage().getSkin(nameAndId.id()).replaceValueWithOriginal();
+            if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId()))
+                skin = SkinRestorer.getSkinStorage().getSkin(profile.getId()).replaceValueWithOriginal();
            
            if (skin == null)
                continue;
            
-            var player = src.getServer().getPlayerList().getPlayer(nameAndId.id());
-            if (player == null)
-                continue;
-            
-            var updatedPlayer = SkinRestorer.applySkin(src.getServer(), Collections.singleton(player), skin, false);
-            SkinRestorer.getSkinStorage().deleteSkin(nameAndId.id());
+            var updatedPlayer = SkinRestorer.applySkin(src.getServer(), Collections.singleton(profile), skin, false);
+            SkinRestorer.getSkinStorage().deleteSkin(profile.getId());
            
            updatedPlayers.addAll(updatedPlayer);
        }
@@ -124,24 +112,19 @@ public final class SkinCommand {
        if (src.getPlayer() == null)
            return 0;
        
-        return resetSubcommand(src, Collections.singleton(src.getPlayer().nameAndId()), false);
+        return resetSubcommand(src, Collections.singleton(src.getPlayer().getGameProfile()), false);
    }
    
    private static int setSubcommand(
            CommandSourceStack src,
-            Collection<NameAndId> targets,
+            Collection<GameProfile> targets,
            SkinProviderContext context,
            boolean save,
            boolean setByOperator
    ) {
        src.sendSystemMessage(Translation.translatableWithFallback(Translation.COMMAND_SKIN_LOADING_KEY));
        
-        var profileTargets = targets.stream()
-                .map(nameAndId -> src.getServer().getPlayerList().getPlayer(nameAndId.id()))
-                .filter(Objects::nonNull)
-                .toList();
-        
-        SkinRestorer.setSkinAsync(src.getServer(), profileTargets, context, save).thenAccept(result -> {
+        SkinRestorer.setSkinAsync(src.getServer(), targets, context, save).thenAccept(result -> {
            if (result.isError()) {
                src.sendFailure(Translation.translatableWithFallback(
                        Translation.COMMAND_SKIN_FAILED_KEY,
@@ -160,7 +143,7 @@ public final class SkinCommand {
    
    private static int setSubcommand(
            CommandSourceStack src,
-            Collection<NameAndId> targets,
+            Collection<GameProfile> targets,
            SkinProviderContext context,
            boolean setByOperator
    ) {
@@ -174,17 +157,7 @@ public final class SkinCommand {
        if (src.getPlayer() == null)
            return 0;
        
-        return setSubcommand(src, Collections.singleton(src.getPlayer().nameAndId()), 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;
+        return setSubcommand(src, Collections.singleton(src.getPlayer().getGameProfile()), context, false);
    }
    
    private static void sendResponse(CommandSourceStack src, Collection<ServerPlayer> updatedPlayers, boolean setByOperator) {
@@ -210,7 +183,7 @@ public final class SkinCommand {
    }
    
    private static LiteralArgumentBuilder<CommandSourceStack> buildSetSubcommand(String name, SkinProvider provider) {
-        var action = literal(name);
+        LiteralArgumentBuilder<CommandSourceStack> action = literal(name);
        
        if (provider.hasVariantSupport()) {
            for (SkinVariant variant : SkinVariant.values()) {
@@ -267,10 +240,10 @@ public final class SkinCommand {
    }
    
    private static RequiredArgumentBuilder<CommandSourceStack, GameProfileArgument.Result> makeTargetsArgument(
-            BiFunction<CommandContext<CommandSourceStack>, Collection<NameAndId>, Integer> consumer
+            BiFunction<CommandContext<CommandSourceStack>, Collection<GameProfile>, Integer> consumer
    ) {
        return argument("targets", GameProfileArgument.gameProfile())
-                .requires(source -> Commands.LEVEL_GAMEMASTERS.check(source.permissions()))
+                .requires(source -> source.hasPermission(2))
                .executes(context -> consumer.apply(context, GameProfileArgument.getGameProfiles(context, "targets")));
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java
@@ -1,55 +0,0 @@
-package net.lionarius.skinrestorer.compat.skinshuffle;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.platform.Services;
-import net.lionarius.skinrestorer.skin.SkinValue;
-import net.lionarius.skinrestorer.skin.provider.SkinShuffleSkinProvider;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.minecraft.resources.Identifier;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerPlayer;
-
-import java.util.Collections;
-
-public class SkinShuffleCompatibility {
-    
-    public static final String MOD_ID = "skinshuffle";
-    
-    private static final boolean SHOULD_APPLY = !Services.PLATFORM.isModLoaded(SkinShuffleCompatibility.MOD_ID);
-    
-    private SkinShuffleCompatibility() {}
-    
-    public static boolean shouldApply() {
-        return SkinShuffleCompatibility.SHOULD_APPLY;
-    }
-    
-    public static Identifier resourceLocation(String name) {
-        return Identifier.fromNamespaceAndPath(SkinShuffleCompatibility.MOD_ID, name);
-    }
-    
-    public static void onPlayerJoin(ServerPlayer player) {
-        Services.COMPATIBILITY.skinShuffle_sendHandshake(player);
-    }
-    
-    public static void handleSkinRefresh(MinecraftServer server, ServerPlayer player, SkinShuffleSkinRefreshPayload payload) {
-        var property = payload.textureProperty();
-        
-        if (!property.name().equals(PlayerUtils.TEXTURES_KEY))
-            return;
-        
-        if (!property.hasSignature())
-            return;
-        
-        server.execute(() -> {
-            SkinRestorer.applySkin(
-                    server,
-                    Collections.singleton(player),
-                    new SkinValue(SkinShuffleSkinProvider.PROVIDER_NAME, null, null, property),
-                    !server.usesAuthentication()
-            );
-            
-            if (server.usesAuthentication() && SkinRestorer.getSkinStorage().hasSavedSkin(player.getUUID()))
-                SkinRestorer.getSkinStorage().deleteSkin(player.getUUID());
-        });
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleHandshakePayload.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleHandshakePayload.java
@@ -1,19 +0,0 @@
-package net.lionarius.skinrestorer.compat.skinshuffle;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import org.jetbrains.annotations.NotNull;
-
-public record SkinShuffleHandshakePayload() implements CustomPacketPayload {
-    
-    public static final SkinShuffleHandshakePayload INSTANCE = new SkinShuffleHandshakePayload();
-    
-    public static final CustomPacketPayload.Type<SkinShuffleHandshakePayload> PACKET_ID = new CustomPacketPayload.Type<>(SkinShuffleCompatibility.resourceLocation("handshake"));
-    public static final StreamCodec<FriendlyByteBuf, SkinShuffleHandshakePayload> PACKET_CODEC = StreamCodec.unit(INSTANCE);
-    
-    @Override
-    public CustomPacketPayload.@NotNull Type<? extends CustomPacketPayload> type() {
-        return PACKET_ID;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshPayload.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshPayload.java
@@ -1,7 +0,0 @@
-package net.lionarius.skinrestorer.compat.skinshuffle;
-
-import com.mojang.authlib.properties.Property;
-
-public interface SkinShuffleSkinRefreshPayload {
-    Property textureProperty();
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java
@@ -1,34 +0,0 @@
-package net.lionarius.skinrestorer.compat.skinshuffle;
-
-import com.mojang.authlib.properties.Property;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import org.jetbrains.annotations.NotNull;
-
-public record SkinShuffleSkinRefreshV1Payload(
-        Property textureProperty) implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
-    
-    public static final CustomPacketPayload.Type<SkinShuffleSkinRefreshV1Payload> PACKET_ID = new CustomPacketPayload.Type<>(SkinShuffleCompatibility.resourceLocation("refresh"));
-    public static final StreamCodec<FriendlyByteBuf, SkinShuffleSkinRefreshV1Payload> PACKET_CODEC = StreamCodec.of(
-            SkinShuffleSkinRefreshV1Payload::encode,
-            SkinShuffleSkinRefreshV1Payload::decode
-    );
-    
-    public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV1Payload value) {
-        var textureProperty = value.textureProperty();
-        
-        buf.writeUtf(textureProperty.name());
-        buf.writeUtf(textureProperty.value());
-        buf.writeNullable(textureProperty.signature(), FriendlyByteBuf::writeUtf);
-    }
-    
-    public static SkinShuffleSkinRefreshV1Payload decode(FriendlyByteBuf buf) {
-        return new SkinShuffleSkinRefreshV1Payload(new Property(buf.readUtf(), buf.readUtf(), buf.readNullable(FriendlyByteBuf::readUtf)));
-    }
-    
-    @Override
-    public @NotNull CustomPacketPayload.Type<? extends CustomPacketPayload> type() {
-        return PACKET_ID;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java
@@ -1,42 +0,0 @@
-package net.lionarius.skinrestorer.compat.skinshuffle;
-
-import com.mojang.authlib.properties.Property;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
-import org.jetbrains.annotations.NotNull;
-
-public record SkinShuffleSkinRefreshV2Payload(
-        Property textureProperty) implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
-    
-    public static final CustomPacketPayload.Type<SkinShuffleSkinRefreshV2Payload> PACKET_ID = new CustomPacketPayload.Type<>(SkinShuffleCompatibility.resourceLocation("skin_refresh"));
-    public static final StreamCodec<FriendlyByteBuf, SkinShuffleSkinRefreshV2Payload> PACKET_CODEC = StreamCodec.of(
-            SkinShuffleSkinRefreshV2Payload::encode,
-            SkinShuffleSkinRefreshV2Payload::decode
-    );
-    
-    public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV2Payload value) {
-        var textureProperty = value.textureProperty();
-        
-        buf.writeBoolean(textureProperty.hasSignature());
-        buf.writeUtf(textureProperty.name());
-        buf.writeUtf(textureProperty.value());
-        if (textureProperty.hasSignature()) {
-            assert textureProperty.signature() != null;
-            
-            buf.writeUtf(textureProperty.signature());
-        }
-    }
-    
-    public static SkinShuffleSkinRefreshV2Payload decode(FriendlyByteBuf buf) {
-        if (buf.readBoolean()) {
-            return new SkinShuffleSkinRefreshV2Payload(new Property(buf.readUtf(), buf.readUtf(), buf.readUtf()));
-        }
-        return new SkinShuffleSkinRefreshV2Payload(new Property(buf.readUtf(), buf.readUtf(), null));
-    }
-    
-    @Override
-    public @NotNull CustomPacketPayload.Type<? extends CustomPacketPayload> type() {
-        return PACKET_ID;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/Config.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/Config.java
@@ -1,74 +1,40 @@
 package net.lionarius.skinrestorer.config;

 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.config.provider.ProvidersConfig;
 import net.lionarius.skinrestorer.util.FileUtils;
 import net.lionarius.skinrestorer.util.JsonUtils;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;

 import java.nio.file.Path;
-import java.util.Optional;

-public final class Config implements GsonPostProcessable {
+public final class Config {
    
    public static final String CONFIG_FILENAME = "config.json";
    
    
    private String language = "en_us";
    
-    private boolean refreshSkinOnJoin = true;
-    
-    private int skinApplyDelayOnJoin = 0;
-    
    private boolean fetchSkinOnFirstJoin = true;
    
-    private boolean forceFirstJoinSkinFetch = false;
-    
-    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() {
+    public String getLanguage() {
        return this.language;
    }
    
-    public boolean refreshSkinOnJoin() {
-        return this.refreshSkinOnJoin;
-    }
-    
-    public int skinApplyDelayOnJoin() {
-        return this.skinApplyDelayOnJoin;
-    }
-    
    public boolean fetchSkinOnFirstJoin() {
        return this.fetchSkinOnFirstJoin;
    }
    
-    public boolean forceFirstJoinSkinFetch() {
-        return this.forceFirstJoinSkinFetch;
+    public String getProxy() {
+        return this.proxy;
    }
    
-    public FirstJoinSkinProvider firstJoinSkinProvider() {
-        return this.firstJoinSkinProvider;
-    }
-    
-    public Optional<Proxy> proxy() {
-        return Optional.ofNullable(this.parsedProxy);
-    }
-    
-    public long requestTimeout() {
+    public long getRequestTimeout() {
        return this.requestTimeout;
    }
    
-    public ProvidersConfig providersConfig() {
-        return this.providers;
-    }
-    
    public static Config load(Path path) {
        var configFile = path.resolve(Config.CONFIG_FILENAME);
        
@@ -86,46 +52,4 @@ public final class Config implements GsonPostProcessable {
        
        return config;
    }
-    
-    @Override
-    public void gsonPostProcess() {
-        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.skinApplyDelayOnJoin < 0) {
-            SkinRestorer.LOGGER.warn("SkinApplyDelayOnJoin config is less than 0, defaulting to 0");
-            this.skinApplyDelayOnJoin = 0;
-        }
-        
-        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.getMessage());
-                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;
-        }
-    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/config/FirstJoinSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/FirstJoinSkinProvider.java
@@ -1,25 +0,0 @@
-package net.lionarius.skinrestorer.config;
-
-import com.google.gson.annotations.SerializedName;
-import net.lionarius.skinrestorer.skin.provider.CollectionSkinProvider;
-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),
-    @SerializedName(value = "COLLECTION", alternate = {"collection"})
-    COLLECTION(CollectionSkinProvider.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/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/config/provider/BuiltInProviderConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/BuiltInProviderConfig.java
@@ -1,47 +0,0 @@
-package net.lionarius.skinrestorer.config.provider;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
-
-public abstract class BuiltInProviderConfig implements GsonPostProcessable {
-    protected boolean enabled;
-    protected String name;
-    protected CacheConfig cache;
-    
-    
-    public BuiltInProviderConfig(String name, CacheConfig cache) {
-        this(name, cache, true);
-    }
-    
-    public BuiltInProviderConfig(String name, CacheConfig cache, boolean enabled) {
-        this.enabled = enabled;
-        this.name = name;
-        this.cache = cache;
-    }
-    
-    public boolean enabled() {
-        return enabled;
-    }
-    
-    public String name() {
-        return name;
-    }
-    
-    public CacheConfig cache() {
-        return cache;
-    }
-    
-    protected void validate(String defaultName, CacheConfig defaultCache) {
-        if (this.name == null || this.name.isEmpty()) {
-            SkinRestorer.LOGGER.warn("Provider name is null or empty, defaulting to '{}'", defaultName);
-            this.name = defaultName;
-        }
-        
-        if (this.cache == null) {
-            SkinRestorer.LOGGER.warn("Provider cache is null, using default");
-            this.cache = defaultCache;
-        } else {
-            this.cache.validate(defaultCache);
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/CacheConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/CacheConfig.java
@@ -1,28 +0,0 @@
-package net.lionarius.skinrestorer.config.provider;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-
-public final class CacheConfig {
-    private boolean enabled;
-    private long duration;
-    
-    public CacheConfig(boolean enabled, long duration) {
-        this.enabled = enabled;
-        this.duration = duration;
-    }
-    
-    public boolean enabled() {
-        return enabled;
-    }
-    
-    public long duration() {
-        return duration;
-    }
-    
-    void validate(CacheConfig defaultValue) {
-        if (this.duration <= 0) {
-            SkinRestorer.LOGGER.warn("Cache duration is less than or equal to zero, defaulting to {}", defaultValue.duration());
-            this.duration = defaultValue.duration();
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/ElyByProviderConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/ElyByProviderConfig.java
@@ -1,16 +0,0 @@
-package net.lionarius.skinrestorer.config.provider;
-
-import net.lionarius.skinrestorer.skin.provider.ElyBySkinProvider;
-
-public final class ElyByProviderConfig extends BuiltInProviderConfig {
-    private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 60);
-    
-    public ElyByProviderConfig() {
-        super(ElyBySkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        super.validate(ElyBySkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/MineskinProviderConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/MineskinProviderConfig.java
@@ -1,30 +0,0 @@
-package net.lionarius.skinrestorer.config.provider;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.provider.MineskinSkinProvider;
-
-public final class MineskinProviderConfig extends BuiltInProviderConfig {
-    private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 300);
-    
-    private String apiKey;
-    
-    public MineskinProviderConfig() {
-        super(MineskinSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-        
-        this.apiKey = "";
-    }
-    
-    public String apiKey() {
-        return apiKey;
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        super.validate(MineskinSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-        
-        if (this.apiKey == null) {
-            SkinRestorer.LOGGER.warn("Mineskin API key is null, defaulting to an empty string");
-            this.apiKey = "";
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/MojangProviderConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/MojangProviderConfig.java
@@ -1,16 +0,0 @@
-package net.lionarius.skinrestorer.config.provider;
-
-import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
-
-public final class MojangProviderConfig extends BuiltInProviderConfig {
-    private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 60);
-    
-    public MojangProviderConfig() {
-        super(MojangSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        super.validate(MojangSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java
@@ -1,65 +0,0 @@
-package net.lionarius.skinrestorer.config.provider;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.config.provider.collection.CollectionProviderConfig;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
-
-public final class ProvidersConfig implements GsonPostProcessable {
-    public static final ProvidersConfig DEFAULT = new ProvidersConfig(
-            new MojangProviderConfig(),
-            new ElyByProviderConfig(),
-            new MineskinProviderConfig(),
-            new CollectionProviderConfig()
-    );
-    
-    private MojangProviderConfig mojang;
-    private ElyByProviderConfig ely_by;
-    private MineskinProviderConfig mineskin;
-    private CollectionProviderConfig collection;
-    
-    public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin, CollectionProviderConfig collection) {
-        this.mojang = mojang;
-        this.ely_by = ely_by;
-        this.mineskin = mineskin;
-        this.collection = collection;
-    }
-    
-    public MojangProviderConfig mojang() {
-        return this.mojang;
-    }
-    
-    public ElyByProviderConfig ely_by() {
-        return this.ely_by;
-    }
-    
-    public MineskinProviderConfig mineskin() {
-        return this.mineskin;
-    }
-    
-    public CollectionProviderConfig collection() {
-        return this.collection;
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        if (this.mojang == null) {
-            SkinRestorer.LOGGER.warn("Mojang provider config is null, using default");
-            this.mojang = ProvidersConfig.DEFAULT.mojang();
-        }
-        
-        if (this.ely_by == null) {
-            SkinRestorer.LOGGER.warn("Ely.By provider config is null, using default");
-            this.ely_by = ProvidersConfig.DEFAULT.ely_by();
-        }
-        
-        if (this.mineskin == null) {
-            SkinRestorer.LOGGER.warn("Mineskin provider config is null, using default");
-            this.mineskin = ProvidersConfig.DEFAULT.mineskin();
-        }
-        
-        if (this.collection == null) {
-            SkinRestorer.LOGGER.warn("Collection provider config is null, using default");
-            this.collection = ProvidersConfig.DEFAULT.collection();
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionProviderConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionProviderConfig.java
@@ -1,32 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import com.google.gson.annotations.JsonAdapter;
-import net.lionarius.skinrestorer.config.provider.BuiltInProviderConfig;
-import net.lionarius.skinrestorer.config.provider.CacheConfig;
-import net.lionarius.skinrestorer.skin.provider.CollectionSkinProvider;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public final class CollectionProviderConfig extends BuiltInProviderConfig implements GsonPostProcessable {
-    private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 604800);
-    
-    @JsonAdapter(CollectionSkinSourceListDeserializer.class)
-    private List<CollectionSkinSource> sources = new ArrayList<>();
-    
-    public CollectionProviderConfig() {
-        super(CollectionSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE, false);
-    }
-    
-    public List<CollectionSkinSource> sources() {
-        return this.sources;
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        if (this.sources == null) {
-            this.sources = new ArrayList<>();
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinFile.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinFile.java
@@ -1,60 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
-import org.jetbrains.annotations.Nullable;
-
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-public final class CollectionSkinFile implements CollectionSkinSource, GsonPostProcessable {
-    private String path = "";
-    private SkinVariant variant = SkinVariant.CLASSIC;
-    
-    @Override
-    public @Nullable URI uri() {
-        if (this.path.isEmpty())
-            return null;
-        
-        try {
-            var filePath = SkinRestorer.getConfigDir().resolve(this.path);
-            
-            if (!Files.exists(filePath)) {
-                SkinRestorer.LOGGER.warn("Skin file does not exist: {}", this.path);
-                return null;
-            }
-            
-            if (!Files.isRegularFile(filePath)) {
-                SkinRestorer.LOGGER.warn("Skin path is not a file: {}", this.path);
-                return null;
-            }
-            
-            if (!this.path.toLowerCase().endsWith(".png")) {
-                SkinRestorer.LOGGER.warn("Skin file is not a PNG file: {}", this.path);
-                return null;
-            }
-            
-            return filePath.toUri();
-        } catch (Exception e) {
-            SkinRestorer.LOGGER.warn("Invalid file path: {}", this.path, e);
-            return null;
-        }
-    }
-    
-    @Override
-    public SkinVariant variant() {
-        return this.variant;
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        if (this.path == null) {
-            this.path = "";
-        }
-        if (this.variant == null) {
-            this.variant = SkinVariant.CLASSIC;
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSource.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSource.java
@@ -1,12 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import org.jetbrains.annotations.Nullable;
-
-import java.net.URI;
-
-public interface CollectionSkinSource {
-    @Nullable URI uri();
-    
-    SkinVariant variant();
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSourceListDeserializer.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSourceListDeserializer.java
@@ -1,35 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import com.google.gson.*;
-
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-
-public class CollectionSkinSourceListDeserializer implements JsonSerializer<List<CollectionSkinSource>>, JsonDeserializer<List<CollectionSkinSource>> {
-    @Override
-    public JsonElement serialize(List<CollectionSkinSource> src, Type typeOfT, JsonSerializationContext context) {
-        return context.serialize(src, List.class);
-    }
-    
-    @Override
-    public List<CollectionSkinSource> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-            throws JsonParseException {
-        List<CollectionSkinSource> sources = new ArrayList<>();
-        
-        if (json.isJsonArray()) {
-            for (JsonElement element : json.getAsJsonArray()) {
-                if (element.isJsonObject()) {
-                    JsonObject obj = element.getAsJsonObject();
-                    if (obj.has("url")) {
-                        sources.add(context.deserialize(obj, CollectionSkinUrl.class));
-                    } else if (obj.has("path")) {
-                        sources.add(context.deserialize(obj, CollectionSkinFile.class));
-                    }
-                }
-            }
-        }
-        
-        return sources;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinUrl.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinUrl.java
@@ -1,41 +0,0 @@
-package net.lionarius.skinrestorer.config.provider.collection;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
-import org.jetbrains.annotations.Nullable;
-
-import java.net.URI;
-
-public final class CollectionSkinUrl implements CollectionSkinSource, GsonPostProcessable {
-    private String url = "";
-    private SkinVariant variant = SkinVariant.CLASSIC;
-    
-    @Override
-    public @Nullable URI uri() {
-        try {
-            if (this.url.isEmpty())
-                return null;
-            
-            return new URI(this.url);
-        } catch (Exception e) {
-            SkinRestorer.LOGGER.warn("Invalid URI: {}", this.url, e);
-            return null;
-        }
-    }
-    
-    @Override
-    public SkinVariant variant() {
-        return this.variant;
-    }
-    
-    @Override
-    public void gsonPostProcess() {
-        if (this.url == null) {
-            this.url = "";
-        }
-        if (this.variant == null) {
-            this.variant = SkinVariant.CLASSIC;
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/exception/TransparentException.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/exception/TransparentException.java
@@ -1,19 +0,0 @@
-package net.lionarius.skinrestorer.exception;
-
-import org.jetbrains.annotations.NotNull;
-
-public class TransparentException extends RuntimeException {
-    public TransparentException(@NotNull Throwable cause) {
-        super(cause);
-    }
-    
-    @Override
-    public String getMessage() {
-        return this.getCause().getMessage();
-    }
-    
-    @Override
-    public String toString() {
-        return this.getLocalizedMessage();
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/mineskin/Java11RequestHandler.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mineskin/Java11RequestHandler.java
@@ -1,190 +0,0 @@
-package net.lionarius.skinrestorer.mineskin;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import org.mineskin.MineSkinClientImpl;
-import org.mineskin.data.CodeAndMessage;
-import org.mineskin.exception.MineSkinRequestException;
-import org.mineskin.exception.MineskinException;
-import org.mineskin.request.RequestHandler;
-import org.mineskin.response.MineSkinResponse;
-import org.mineskin.response.ResponseConstructor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetSocketAddress;
-import java.net.ProxySelector;
-import java.net.URI;
-import java.net.http.HttpClient;
-import java.net.http.HttpRequest;
-import java.net.http.HttpRequest.BodyPublishers;
-import java.net.http.HttpResponse;
-import java.net.http.HttpResponse.BodyHandlers;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.stream.Collectors;
-
-// copy-pasted from https://github.com/InventivetalentDev/MineskinClient/blob/master/java11/src/main/java/org/mineskin/Java11RequestHandler.java
-// with some modifications to support proxy
-public class Java11RequestHandler extends RequestHandler {
-    
-    private final Gson gson;
-    private final HttpClient httpClient;
-    
-    public Java11RequestHandler(String baseUrl, String userAgent, String apiKey, int timeout, Gson gson, InetSocketAddress proxy) {
-        super(baseUrl, userAgent, apiKey, timeout, gson);
-        this.gson = gson;
-        
-        HttpClient.Builder clientBuilder = HttpClient.newBuilder()
-                .connectTimeout(java.time.Duration.ofMillis(timeout));
-        
-        if (userAgent != null) {
-            clientBuilder.followRedirects(HttpClient.Redirect.NORMAL);
-        }
-        
-        if (proxy != null) {
-            clientBuilder.proxy(ProxySelector.of(proxy));
-        }
-        
-        this.httpClient = clientBuilder.build();
-    }
-    
-    private <T, R extends MineSkinResponse<T>> R wrapResponse(HttpResponse<String> response, Class<T> clazz, ResponseConstructor<T, R> constructor)
-            throws IOException {
-        String rawBody = response.body();
-        try {
-            JsonObject jsonBody = gson.fromJson(rawBody, JsonObject.class);
-            R wrapped = constructor.construct(
-                    response.statusCode(),
-                    lowercaseHeaders(response.headers().map()),
-                    jsonBody,
-                    gson, clazz
-            );
-            if (!wrapped.isSuccess()) {
-                throw new MineSkinRequestException(
-                        wrapped.getFirstError().map(CodeAndMessage::code).orElse("request_failed"),
-                        wrapped.getFirstError().map(CodeAndMessage::message).orElse("Request Failed"),
-                        wrapped
-                );
-            }
-            return wrapped;
-        } catch (JsonParseException e) {
-            MineSkinClientImpl.LOGGER.log(Level.WARNING, "Failed to parse response body: " + rawBody, e);
-            throw new MineskinException("Failed to parse response", e);
-        }
-    }
-    
-    private Map<String, String> lowercaseHeaders(Map<String, java.util.List<String>> headers) {
-        return headers.entrySet().stream()
-                .collect(Collectors.toMap(
-                        entry -> entry.getKey().toLowerCase(),
-                        entry -> String.join(", ", entry.getValue())
-                ));
-    }
-    
-    public <T, R extends MineSkinResponse<T>> R getJson(String url, Class<T> clazz, ResponseConstructor<T, R> constructor)
-            throws IOException {
-        url = this.baseUrl + url;
-        MineSkinClientImpl.LOGGER.fine("GET " + url);
-        
-        HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
-                .uri(URI.create(url))
-                .GET()
-                .header("User-Agent", this.userAgent);
-        HttpRequest request;
-        if (apiKey != null) {
-            request = requestBuilder
-                    .header("Authorization", "Bearer " + apiKey)
-                    .header("Accept", "application/json").build();
-        } else {
-            request = requestBuilder.build();
-        }
-        HttpResponse<String> response;
-        try {
-            response = this.httpClient.send(request, BodyHandlers.ofString());
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        return wrapResponse(response, clazz, constructor);
-    }
-    
-    public <T, R extends MineSkinResponse<T>> R postJson(String url, JsonObject data, Class<T> clazz, ResponseConstructor<T, R> constructor)
-            throws IOException {
-        url = this.baseUrl + url;
-        MineSkinClientImpl.LOGGER.fine("POST " + url);
-        
-        HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
-                .uri(URI.create(url))
-                .POST(BodyPublishers.ofString(gson.toJson(data)))
-                .header("Content-Type", "application/json")
-                .header("User-Agent", this.userAgent);
-        HttpRequest request;
-        if (apiKey != null) {
-            request = requestBuilder
-                    .header("Authorization", "Bearer " + apiKey)
-                    .header("Accept", "application/json").build();
-        } else {
-            request = requestBuilder.build();
-        }
-        
-        HttpResponse<String> response;
-        try {
-            response = this.httpClient.send(request, BodyHandlers.ofString());
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        return wrapResponse(response, clazz, constructor);
-    }
-    
-    public <T, R extends MineSkinResponse<T>> R postFormDataFile(String url, String key, String filename, InputStream in, Map<String, String> data, Class<T> clazz, ResponseConstructor<T, R> constructor)
-            throws IOException {
-        url = this.baseUrl + url;
-        MineSkinClientImpl.LOGGER.fine("POST " + url);
-        
-        String boundary = "mineskin-" + System.currentTimeMillis();
-        StringBuilder bodyBuilder = new StringBuilder();
-        
-        // add form fields
-        for (Map.Entry<String, String> entry : data.entrySet()) {
-            bodyBuilder.append("--").append(boundary).append("\r\n")
-                    .append("Content-Disposition: form-data; name=\"").append(entry.getKey()).append("\"\r\n\r\n")
-                    .append(entry.getValue()).append("\r\n");
-        }
-        
-        // add file
-        byte[] fileContent = in.readAllBytes();
-        bodyBuilder.append("--").append(boundary).append("\r\n")
-                .append("Content-Disposition: form-data; name=\"").append(key)
-                .append("\"; filename=\"").append(filename).append("\"\r\n")
-                .append("Content-Type: image/png\r\n\r\n");
-        byte[] bodyStart = bodyBuilder.toString().getBytes();
-        byte[] boundaryEnd = ("\r\n--" + boundary + "--\r\n").getBytes();
-        byte[] bodyString = new byte[bodyStart.length + fileContent.length + boundaryEnd.length];
-        System.arraycopy(bodyStart, 0, bodyString, 0, bodyStart.length);
-        System.arraycopy(fileContent, 0, bodyString, bodyStart.length, fileContent.length);
-        System.arraycopy(boundaryEnd, 0, bodyString, bodyStart.length + fileContent.length, boundaryEnd.length);
-        
-        HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
-                .uri(URI.create(url))
-                .POST(HttpRequest.BodyPublishers.ofByteArray(bodyString))
-                .header("Content-Type", "multipart/form-data; boundary=" + boundary)
-                .header("User-Agent", this.userAgent);
-        HttpRequest request;
-        if (apiKey != null) {
-            request = requestBuilder
-                    .header("Authorization", "Bearer " + apiKey)
-                    .header("Accept", "application/json").build();
-        } else {
-            request = requestBuilder.build();
-        }
-        
-        HttpResponse<String> response;
-        try {
-            response = this.httpClient.send(request, BodyHandlers.ofString());
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
-        return wrapResponse(response, clazz, constructor);
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/ChunkMapAccessor.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/ChunkMapAccessor.java
@@ -9,5 +9,5 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 public interface ChunkMapAccessor {
    
    @Accessor
-    Int2ObjectMap<TrackedEntityAccessorInvoker> getEntityMap();
+    Int2ObjectMap<Object> getEntityMap();
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerAccessor.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerAccessor.java
@@ -1,15 +0,0 @@
-package net.lionarius.skinrestorer.mixin;
-
-import com.mojang.authlib.GameProfile;
-import net.minecraft.world.entity.player.Player;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-
-@Mixin(Player.class)
-public interface PlayerAccessor {
-    @Accessor("gameProfile")
-    @Mutable
-    void setGameProfile(GameProfile properties);
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
@@ -9,7 +9,6 @@ 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.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -28,35 +27,19 @@ public abstract class PlayerListMixin {
    
    @Inject(method = "remove", at = @At("TAIL"))
    private void remove(ServerPlayer player, CallbackInfo ci) {
-        SkinRestorer.Events.onPlayerDisconnect(player);
+        SkinRestorer.getSkinStorage().removeSkin(player.getUUID());
    }
    
    @Inject(method = "removeAll", at = @At("HEAD"))
    private void removeAll(CallbackInfo ci) {
-        for (var player : getPlayers()) {
-            SkinRestorer.Events.onPlayerDisconnect(player);
+        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) {
-        var delay = SkinRestorer.getConfig().skinApplyDelayOnJoin();
-        
-        if (delay <= 0) {
-            skinrestorer$tryApplySkin(server, player);
-        } else {
-            var uuid = player.getUUID();
-            SkinRestorer.getTickedScheduler().schedule(() -> {
-                var actualPlayer = server.getPlayerList().getPlayer(uuid);
-                if (actualPlayer != null)
-                    skinrestorer$tryApplySkin(server, actualPlayer);
-            }, delay, uuid);
-        }
-    }
-    
-    @Unique
-    private static void skinrestorer$tryApplySkin(MinecraftServer server, ServerPlayer player) {
        if (SkinRestorer.getSkinStorage().hasSavedSkin(player.getUUID()))
-            SkinRestorer.applySkin(server, Collections.singleton(player), SkinRestorer.getSkinStorage().getSkin(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
@@ -2,13 +2,15 @@ package net.lionarius.skinrestorer.mixin;

 import com.mojang.authlib.GameProfile;
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.config.FirstJoinSkinProvider;
 import net.lionarius.skinrestorer.skin.SkinValue;
+import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
 import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
 import net.lionarius.skinrestorer.util.PlayerUtils;
 import net.lionarius.skinrestorer.util.Result;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerLoginPacketListenerImpl;
 import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -23,73 +25,51 @@ public abstract class ServerLoginPacketListenerImplMixin {
    
    @Shadow @Nullable
    private GameProfile authenticatedProfile;
+    @Shadow @Final
+    MinecraftServer server;
    
    @Unique
-    private CompletableFuture<Void> skinrestorer$pendingSkin;
+    private CompletableFuture<Void> skinrestorer_pendingSkin;
    
    @Inject(method = "verifyLoginAndFinishConnectionSetup", at = @At(value = "INVOKE",
-                                                                     target = "Lnet/minecraft/server/players/PlayerList;canPlayerLogin(Ljava/net/SocketAddress;Lnet/minecraft/server/players/NameAndId;)Lnet/minecraft/network/chat/Component;"),
+                                                                     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;
+        if (skinrestorer_pendingSkin == null) {
+            skinrestorer_pendingSkin = CompletableFuture.supplyAsync(() -> {
+                assert authenticatedProfile != null;
+                var originalSkin = PlayerUtils.getPlayerSkin(authenticatedProfile);
                
-                assert profile != null;
-                var originalSkin = PlayerUtils.getPlayerSkin(profile);
-                
-                if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.id())) {
+                if (SkinRestorer.getSkinStorage().hasSavedSkin(authenticatedProfile.getId())) {
                    if (originalSkin != null) { // update to the latest official skin
-                        var value = SkinRestorer.getSkinStorage().getSkin(profile.id());
-                        SkinRestorer.getSkinStorage().setSkin(profile.id(), value.setOriginalValue(originalSkin));
-                    }
-                    
-                    if (SkinRestorer.getConfig().refreshSkinOnJoin()) {
-                        var currentSkin = SkinRestorer.getSkinStorage().getSkin(profile.id());
-                        var context = currentSkin.toProviderContext();
-                        
-                        skinrestorer$fetchSkin(profile, context);
+                        var value = SkinRestorer.getSkinStorage().getSkin(authenticatedProfile.getId());
+                        SkinRestorer.getSkinStorage().setSkin(authenticatedProfile.getId(), value.setOriginalValue(originalSkin));
                    }
                    
                    return null;
                }
                
-                var config = SkinRestorer.getConfig();
-                var provider = config.firstJoinSkinProvider();
-                
-                var shouldFetch = (originalSkin == null && config.fetchSkinOnFirstJoin()) ||
-                                      (originalSkin != null && config.forceFirstJoinSkinFetch() && provider != FirstJoinSkinProvider.MOJANG);
-                
-                if (shouldFetch) {
-                    var context = new SkinProviderContext(
-                            provider.getName(),
-                            profile.name(),
-                            null
-                    );
-                    skinrestorer$fetchSkin(profile, context);
+                if (originalSkin == null && SkinRestorer.getConfig().fetchSkinOnFirstJoin()) {
+                    SkinRestorer.LOGGER.debug("Fetching {}'s skin", authenticatedProfile.getName());
+                    
+                    var context = new SkinProviderContext(MojangSkinProvider.PROVIDER_NAME, authenticatedProfile.getName(), null);
+                    var result = SkinRestorer.getProvider(context.name()).map(
+                            provider -> provider.getSkin(context.argument(), context.variant())
+                    ).orElse(Result.ofNullable(null));
+                    
+                    if (!result.isError()) {
+                        var value = SkinValue.fromProviderContextWithValue(context, result.getSuccessValue().orElse(null));
+                        SkinRestorer.getSkinStorage().setSkin(authenticatedProfile.getId(), value);
+                    } else {
+                        SkinRestorer.LOGGER.error("failed to fetch skin on first join", result.getErrorValue());
+                    }
                }
                
                return null;
            });
        }
        
-        if (!skinrestorer$pendingSkin.isDone())
+        if (!skinrestorer_pendingSkin.isDone())
            ci.cancel();
    }
-    
-    @Unique
-    private static void skinrestorer$fetchSkin(GameProfile profile, SkinProviderContext context) {
-        SkinRestorer.LOGGER.debug("Fetching {}'s skin", profile.name());
-        
-        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.id(), value);
-        } else {
-            SkinRestorer.LOGGER.warn("Failed to fetch skin '{}:{}'", context.name(), context.argument(), result.getErrorValue());
-        }
-    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/TrackedEntityAccessorInvoker.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/TrackedEntityAccessorInvoker.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.gen.Invoker;
 import java.util.Set;

@Mixin(targets = "net.minecraft.server.level.ChunkMap$TrackedEntity")
-public interface TrackedEntityAccessorInvoker {
+public interface TrackedEntityMixin {
    
    @Accessor
    Set<ServerPlayerConnection> getSeenBy();
--- a/common/src/main/java/net/lionarius/skinrestorer/platform/Services.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/platform/Services.java
@@ -1,23 +0,0 @@
-package net.lionarius.skinrestorer.platform;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.platform.services.CompatibilityHelper;
-import net.lionarius.skinrestorer.platform.services.PlatformHelper;
-
-import java.util.ServiceLoader;
-
-public final class Services {
-    
-    public final static PlatformHelper PLATFORM = load(PlatformHelper.class);
-    public final static CompatibilityHelper COMPATIBILITY = load(CompatibilityHelper.class);
-    
-    private Services() {}
-    
-    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/CompatibilityHelper.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/platform/services/CompatibilityHelper.java
@@ -1,8 +0,0 @@
-package net.lionarius.skinrestorer.platform.services;
-
-import net.minecraft.server.level.ServerPlayer;
-
-public interface CompatibilityHelper {
-    
-    void skinShuffle_sendHandshake(ServerPlayer player);
-}
--- 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
@@ -27,7 +27,9 @@ public class SkinIO {
    
    public SkinValue loadSkin(UUID uuid) {
        try {
-            return SkinIO.loadSkin(savePath.resolve(SkinIO.uuidToFilename(uuid)));
+            var value = SkinIO.loadSkin(savePath.resolve(SkinIO.uuidToFilename(uuid)));
+            Objects.requireNonNull(value.provider());
+            return value;
        } 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
@@ -17,22 +17,15 @@ public class SkinStorage {
        return this.skinMap.containsKey(uuid) || this.skinIO.skinExists(uuid);
    }
    
-    public SkinValue getSkin(UUID uuid, boolean cache) {
+    public SkinValue getSkin(UUID uuid) {
        if (!skinMap.containsKey(uuid)) {
            var skin = skinIO.loadSkin(uuid);
-            if (!cache)
-                return skin;
-            
            setSkin(uuid, skin);
        }
        
        return skinMap.get(uuid);
    }
    
-    public SkinValue getSkin(UUID uuid) {
-        return this.getSkin(uuid, true);
-    }
-    
    public void removeSkin(UUID uuid, boolean save) {
        var skin = skinMap.remove(uuid);
        if (skin != null && save)
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinValue.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinValue.java
@@ -3,14 +3,11 @@ 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 net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

-import java.util.Objects;
-
 public record SkinValue(@NotNull String provider, @Nullable String argument, @Nullable SkinVariant variant,
-                        @Nullable Property value, @Nullable Property originalValue) implements GsonPostProcessable {
+                        @Nullable Property value, @Nullable Property originalValue) {
    
    public static final SkinValue EMPTY = new SkinValue(EmptySkinProvider.PROVIDER_NAME, null, null, null);
    
@@ -33,9 +30,4 @@ public record SkinValue(@NotNull String provider, @Nullable String argument, @Nu
    public SkinValue setOriginalValue(Property originalValue) {
        return new SkinValue(this.provider, this.argument, this.variant, this.value, originalValue);
    }
-    
-    @Override
-    public void gsonPostProcess() {
-        Objects.requireNonNull(this.provider);
-    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinVariant.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinVariant.java
@@ -1,11 +1,8 @@
 package net.lionarius.skinrestorer.skin;

-import com.google.gson.annotations.SerializedName;
-
 public enum SkinVariant {
-    @SerializedName(value = "classic", alternate = {"CLASSIC"})
+    
    CLASSIC("classic"),
-    @SerializedName(value = "slim", alternate = {"SLIM"})
    SLIM("slim");
    
    private final String name;
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/CollectionSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/CollectionSkinProvider.java
@@ -1,91 +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.properties.Property;
-import it.unimi.dsi.fastutil.Pair;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.config.provider.collection.CollectionSkinSource;
-import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.Result;
-import org.jetbrains.annotations.NotNull;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-
-public final class CollectionSkinProvider implements SkinProvider {
-    
-    public static final String PROVIDER_NAME = "collection";
-    
-    private static LoadingCache<Integer, Optional<Property>> SKIN_CACHE;
-    
-    private static List<Pair<URI, SkinVariant>> COLLECTION_SKINS;
-    
-    public static void reload() {
-        COLLECTION_SKINS = loadCollectionSkins();
-        
-        createCache();
-    }
-    
-    private static List<Pair<URI, SkinVariant>> loadCollectionSkins() {
-        List<Pair<URI, SkinVariant>> skins = new ArrayList<>();
-        
-        var config = SkinRestorer.getConfig().providersConfig().collection();
-        
-        for (CollectionSkinSource source : config.sources()) {
-            var uri = source.uri();
-            if (uri != null) {
-                skins.add(Pair.of(uri, source.variant()));
-            }
-        }
-        
-        return skins;
-    }
-    
-    private static void createCache() {
-        var config = SkinRestorer.getConfig().providersConfig().collection();
-        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 Integer key) throws Exception {
-                        var skinEntry = COLLECTION_SKINS.get(key);
-                        return MineskinSkinProvider.loadSkin(skinEntry.first(), skinEntry.second());
-                    }
-                });
-    }
-    
-    @Override
-    public String getArgumentName() {
-        return "seed";
-    }
-    
-    @Override
-    public boolean hasVariantSupport() {
-        return false;
-    }
-    
-    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String argument, SkinVariant variant) {
-        if (COLLECTION_SKINS.isEmpty()) {
-            return Result.error(new IllegalStateException("No collection skins configured"));
-        }
-        
-        var skinIndex = Math.abs(argument.hashCode()) % COLLECTION_SKINS.size();
-        
-        try {
-            return Result.success(SKIN_CACHE.get(skinIndex));
-        } catch (UncheckedExecutionException e) {
-            return Result.error((Exception) e.getCause());
-        } catch (Exception e) {
-            return Result.error(e);
-        }
-    }
-}
--- 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,63 +1,32 @@
 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.google.gson.JsonObject;
 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");
+            API_URI = new URI("http://skinsystem.ely.by/");
        } catch (URISyntaxException e) {
            throw new IllegalArgumentException(e);
        }
    }
    
-    public static void reload() {
-        createCache();
-    }
-    
-    private 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";
@@ -69,32 +38,23 @@ public final class ElyBySkinProvider implements SkinProvider {
    }
    
    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
+    public Result<Optional<Property>, Exception> getSkin(String username, SkinVariant variant) {
        try {
-            if (!StringUtil.isValidPlayerName(username))
-                throw new IllegalArgumentException("invalid username");
+            var profile = ElyBySkinProvider.getElyByProfile(username);
            
-            var usernameLowerCase = username.toLowerCase(Locale.ROOT);
+            var properties = profile.getAsJsonArray("properties");
+            var textures = PlayerUtils.findTexturesProperty(properties);
            
-            return Result.success(SKIN_CACHE.get(usernameLowerCase));
-        } catch (UncheckedExecutionException e) {
-            return Result.error((Exception) e.getCause());
+            return Result.ofNullable(textures);
        } 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 {
+    private static JsonObject getElyByProfile(String username) throws IOException {
        var request = HttpRequest.newBuilder()
                .uri(ElyBySkinProvider.API_URI
-                        .resolve("/textures/signed/")
+                        .resolve("textures/signed/")
                        .resolve(username + "?unsigned=false")
                )
                .GET()
@@ -106,6 +66,6 @@ public final class ElyBySkinProvider implements SkinProvider {
        if (response.statusCode() != 200)
            throw new IllegalArgumentException("no profile with name " + username);
        
-        return JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class).profile();
+        return JsonUtils.parseJson(response.body());
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/EmptySkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/EmptySkinProvider.java
@@ -21,11 +21,11 @@ public final class EmptySkinProvider implements SkinProvider {
    }
    
    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String argument, SkinVariant variant) {
-        return this.fetchSkin();
+    public Result<Optional<Property>, Exception> getSkin(String argument, SkinVariant variant) {
+        return this.getSkin();
    }
    
-    public Result<Optional<Property>, Exception> fetchSkin() {
+    public Result<Optional<Property>, Exception> getSkin() {
        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,76 +1,31 @@
 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.mineskin.Java11RequestHandler;
 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 org.mineskin.MineSkinClient;
-import org.mineskin.data.Variant;
-import org.mineskin.data.Visibility;
-import org.mineskin.request.GenerateRequest;
-import org.mineskin.response.QueueResponse;

-import java.net.InetSocketAddress;
+import java.io.IOException;
 import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.time.Duration;
+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 MineSkinClient MINESKIN_CLIENT;
+    private static final URI API_URI;
    
-    private static LoadingCache<Pair<URI, SkinVariant>, Optional<Property>> SKIN_CACHE;
-    
-    public static void reload() {
-        var config = SkinRestorer.getConfig();
-        var configApiKey = config.providersConfig().mineskin().apiKey();
-        
-        MINESKIN_CLIENT = MineSkinClient
-                .builder()
-                .userAgent(WebUtils.USER_AGENT)
-                .gson(JsonUtils.GSON)
-                .timeout((int) Duration.ofSeconds(config.requestTimeout()).toMillis())
-                .requestHandler((baseUrl, userAgent, apiKey, timeout, gson) -> new Java11RequestHandler(
-                        baseUrl,
-                        userAgent,
-                        apiKey,
-                        timeout,
-                        gson,
-                        SkinRestorer.getConfig().proxy().map(proxy -> new InetSocketAddress(proxy.host(), proxy.port())).orElse(null)
-                ))
-                .apiKey(configApiKey.isEmpty() ? null : configApiKey)
-                .build();
-        
-        createCache();
-    }
-    
-    private 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());
-                    }
-                });
+    static {
+        try {
+            API_URI = new URI("https://api.mineskin.org/");
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException(e);
+        }
    }
    
    @Override
@@ -84,44 +39,33 @@ public final class MineskinSkinProvider implements SkinProvider {
    }
    
    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String url, SkinVariant variant) {
+    public Result<Optional<Property>, Exception> getSkin(String url, SkinVariant variant) {
        try {
-            var uri = new URI(url);
+            var result = MineskinSkinProvider.uploadToMineskin(url, variant);
+            var texture = result.getAsJsonObject("data").getAsJsonObject("texture");
            
-            return Result.success(SKIN_CACHE.get(Pair.of(uri, variant)));
-        } catch (UncheckedExecutionException e) {
-            return Result.error((Exception) e.getCause());
+            return Result.ofNullable(new Property(PlayerUtils.TEXTURES_KEY, texture.get("value").getAsString(), texture.get("signature").getAsString()));
        } catch (Exception e) {
            return Result.error(e);
        }
    }
    
-    static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
-        var mineskinVariant = switch (variant) {
-            case CLASSIC -> Variant.CLASSIC;
-            case SLIM -> Variant.SLIM;
-        };
+    private static JsonObject uploadToMineskin(String url, SkinVariant variant) throws IOException {
+        var body = ("{\"variant\":\"%s\",\"name\":\"%s\",\"visibility\":%d,\"url\":\"%s\"}")
+                .formatted(variant.toString(), "none", 0, url);
        
-        var request = "file".equals(uri.getScheme())
-                ? GenerateRequest.upload(Files.newInputStream(Path.of(uri)))
-                .variant(mineskinVariant)
-                .name("skinrestorer-skin")
-                .visibility(Visibility.UNLISTED)
-                : GenerateRequest.url(uri)
-                .variant(mineskinVariant)
-                .name("skinrestorer-skin")
-                .visibility(Visibility.UNLISTED);
+        var request = HttpRequest.newBuilder()
+                .uri(MineskinSkinProvider.API_URI.resolve("generate/url"))
+                .POST(HttpRequest.BodyPublishers.ofString(body))
+                .header("Content-Type", "application/json")
+                .build();
        
-        var skin = MINESKIN_CLIENT.queue().submit(request)
-                .thenApply(QueueResponse::getJob)
-                .thenCompose(jobInfo -> jobInfo.waitForCompletion(MINESKIN_CLIENT))
-                .thenCompose(jobReference -> jobReference.getOrLoadSkin(MINESKIN_CLIENT))
-                .join();
+        var response = WebUtils.executeRequest(request);
+        WebUtils.throwOnClientErrors(response);
        
-        return Optional.of(new Property(
-                PlayerUtils.TEXTURES_KEY,
-                skin.texture().data().value(),
-                skin.texture().data().signature()
-        ));
+        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,100 +1,38 @@
 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.*;
+import com.google.gson.JsonObject;
+import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.yggdrasil.YggdrasilEnvironment;
-import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
-import com.mojang.authlib.yggdrasil.response.NameAndId;
-import com.mojang.util.UndashedUuid;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.exception.TransparentException;
 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.CachedUserNameToIdResolver;
-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";
-    public static final String PROFILE_CACHE_FILENAME = "mojang_profile_cache.json";
-    private static final Environment ENVIRONMENT;
-    private static final URI SERVICES_SERVER_URI;
-    private static final URI SESSION_SERVER_URI;
-    private static final CachedUserNameToIdResolver PROFILE_CACHE;
    
-    private static LoadingCache<UUID, Optional<Property>> SKIN_CACHE;
+    private static final URI API_URI;
+    private static final URI SESSION_SERVER_URI;
    
    static {
        try {
-            ENVIRONMENT = EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
-            
-            SERVICES_SERVER_URI = new URI(ENVIRONMENT.servicesHost());
-            SESSION_SERVER_URI = new URI(ENVIRONMENT.sessionHost());
+            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 CachedUserNameToIdResolver(new GameProfileRepository() {
-            @Override
-            public void findProfilesByNames(String[] names, ProfileLookupCallback callback) {
-                for (var name : names) {
-                    try {
-                        var profile = MojangSkinProvider.getProfile(name);
-                        callback.onProfileLookupSucceeded(profile.name(), profile.id());
-                    } catch (IOException e) {
-                        throw new TransparentException(e);
-                    }
-                }
-            }
-            
-            @Override
-            public Optional<NameAndId> findProfileByName(String name) {
-                try {
-                    var profile = MojangSkinProvider.getProfile(name);
-                    return Optional.of(new NameAndId(profile.id(), profile.name()));
-                } catch (IOException e) {
-                    throw new TransparentException(e);
-                }
-            }
-        }, SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile());
-    }
-    
-    public static void reload() {
-        createCache();
-    }
-    
-    private 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.name(), null);
+        return new SkinProviderContext(MojangSkinProvider.PROVIDER_NAME, gameProfile.getName(), null);
    }
    
    @Override
@@ -108,34 +46,24 @@ public final class MojangSkinProvider implements SkinProvider {
    }
    
    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
+    public Result<Optional<Property>, Exception> getSkin(String username, SkinVariant variant) {
        try {
-            if (!StringUtil.isValidPlayerName(username))
-                throw new IllegalArgumentException("invalid username");
+            var uuid = MojangSkinProvider.getUuid(username);
+            var profile = MojangSkinProvider.getMojangProfile(uuid);
            
-            var cachedProfile = MojangSkinProvider.PROFILE_CACHE.get(username);
-            if (cachedProfile.isEmpty())
-                throw new IllegalArgumentException("no profile found for " + username);
+            var properties = profile.getAsJsonArray("properties");
+            var textures = PlayerUtils.findTexturesProperty(properties);
            
-            return Result.success(SKIN_CACHE.get(cachedProfile.get().id()));
-        } catch (UncheckedExecutionException e) {
-            return Result.error((Exception) e.getCause());
+            return Result.ofNullable(textures);
        } 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 NameAndId getProfile(final String name) throws IOException {
+    private static String getUuid(final String name) throws IOException {
        var request = HttpRequest.newBuilder()
-                .uri(MojangSkinProvider.SERVICES_SERVER_URI
-                        .resolve("/minecraft/profile/lookup/name/")
+                .uri(MojangSkinProvider.API_URI
+                        .resolve("users/profiles/minecraft/")
                        .resolve(name)
                )
                .GET()
@@ -147,14 +75,18 @@ public final class MojangSkinProvider implements SkinProvider {
        if (response.statusCode() != 200)
            throw new IllegalArgumentException("no profile with name " + name);
        
-        return JsonUtils.fromJson(response.body(), NameAndId.class);
+        var profile = JsonUtils.parseJson(response.body());
+        if (profile == null)
+            return null;
+        
+        return profile.get("id").getAsString();
    }
    
-    private static GameProfile getProfileWithProperties(UUID uuid) throws IOException {
+    private static JsonObject getMojangProfile(String uuid) throws IOException {
        var request = HttpRequest.newBuilder()
                .uri(MojangSkinProvider.SESSION_SERVER_URI
-                        .resolve("/session/minecraft/profile/")
-                        .resolve(UndashedUuid.toString(uuid) + "?unsigned=false")
+                        .resolve("session/minecraft/profile/")
+                        .resolve(uuid + "?unsigned=false")
                )
                .GET()
                .build();
@@ -165,6 +97,6 @@ public final class MojangSkinProvider implements SkinProvider {
        if (response.statusCode() != 200)
            throw new IllegalArgumentException("no profile with uuid " + uuid);
        
-        return JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class).profile();
+        return JsonUtils.parseJson(response.body());
    }
 }
--- 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,33 +1,20 @@
 package net.lionarius.skinrestorer.skin.provider;

-import com.google.common.collect.ImmutableSet;
 import com.mojang.authlib.properties.Property;
 import net.lionarius.skinrestorer.skin.SkinVariant;
 import net.lionarius.skinrestorer.util.Result;

 import java.util.Optional;
-import java.util.Set;

 public interface SkinProvider {
    EmptySkinProvider EMPTY = new EmptySkinProvider();
    MojangSkinProvider MOJANG = new MojangSkinProvider();
    ElyBySkinProvider ELY_BY = new ElyBySkinProvider();
    MineskinSkinProvider MINESKIN = new MineskinSkinProvider();
-    CollectionSkinProvider COLLECTION = new CollectionSkinProvider();
-    SkinShuffleSkinProvider SKIN_SHUFFLE = new SkinShuffleSkinProvider();
-    
-    Set<String> BUILTIN_PROVIDER_NAMES = ImmutableSet.of(
-            EmptySkinProvider.PROVIDER_NAME,
-            MojangSkinProvider.PROVIDER_NAME,
-            ElyBySkinProvider.PROVIDER_NAME,
-            MineskinSkinProvider.PROVIDER_NAME,
-            CollectionSkinProvider.PROVIDER_NAME,
-            SkinShuffleSkinProvider.PROVIDER_NAME
-    );
    
    String getArgumentName();
    
    boolean hasVariantSupport();
    
-    Result<Optional<Property>, Exception> fetchSkin(String argument, SkinVariant variant);
+    Result<Optional<Property>, Exception> getSkin(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
@@ -42,7 +42,7 @@ public final class SkinProviderRegistry {
    
    public void register(@NotNull String name, @NotNull SkinProvider provider, boolean isPublic) {
        if (this.registry.containsKey(name))
-            return;
+            throw new IllegalArgumentException("Skin provider with name " + name + " is already registered");
        
        this.registry.put(name, new Entry(provider, isPublic));
    }
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinShuffleSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinShuffleSkinProvider.java
@@ -1,27 +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 SkinShuffleSkinProvider implements SkinProvider {
-    
-    public static final String PROVIDER_NAME = "skinshuffle";
-    
-    @Override
-    public String getArgumentName() {
-        return "unsupported";
-    }
-    
-    @Override
-    public boolean hasVariantSupport() {
-        return false;
-    }
-    
-    @Override
-    public Result<Optional<Property>, Exception> fetchSkin(String argument, SkinVariant variant) {
-        return Result.error(new UnsupportedOperationException("SkinShuffle Provider does not support fetching skins"));
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java
@@ -19,7 +19,6 @@ public final class Translation {
    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;
@@ -47,11 +46,11 @@ public final class Translation {
    }
    
    public static void reloadTranslations() {
-        translations = Translation.loadTranslationMap(SkinRestorer.getConfig().language());
+        translations = Translation.loadTranslationMap(SkinRestorer.getConfig().getLanguage());
    }
    
    private static ImmutableMap<String, String> loadTranslationMap(String lang) {
-        var json = FileUtils.readResource(SkinRestorer.assetPath(String.format("lang/%s.json", lang)));
+        var json = FileUtils.readResource(SkinRestorer.resource(String.format("lang/%s.json", lang)));
        
        var type = new TypeToken<Map<String, String>>() {}.getType();
        Map<String, String> map = null;
--- a/common/src/main/java/net/lionarius/skinrestorer/util/FileUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/FileUtils.java
@@ -3,7 +3,6 @@ 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;
@@ -18,31 +17,27 @@ public final class FileUtils {
    
    private FileUtils() {}
    
-    public static void tryMigrateOldSkinDirectory(Path oldDirectory, Path newDirectory) {
+    public static void tryMigrateOldSkinDirectory(Path newDirectory) {
        try {
-            try (var stream = Files.list(oldDirectory)) {
+            var configDirectory = SkinRestorer.getConfigDir();
+            try (var stream = Files.list(configDirectory)) {
                var files = stream.filter(file -> {
-                    var name = file.getFileName().toString();
+                    var name = file.getFileName();
                    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);
-                }
+                
+                for (var file : files)
+                    Files.move(file, newDirectory.resolve(file.getFileName()), StandardCopyOption.REPLACE_EXISTING);
            }
        } catch (Exception e) {
-            SkinRestorer.LOGGER.error("Could not migrate skin directory", e);
+            SkinRestorer.LOGGER.error("could not migrate skin directory", e);
        }
    }
    
@@ -55,7 +50,7 @@ public final class FileUtils {
                return StringUtils.readString(reader);
            }
        } catch (IOException e) {
-            SkinRestorer.LOGGER.error("Failed to read resource", e);
+            SkinRestorer.LOGGER.error("failed to read resource", e);
            return null;
        }
    }
@@ -67,7 +62,7 @@ public final class FileUtils {
            
            return Files.readString(file);
        } catch (Exception e) {
-            SkinRestorer.LOGGER.error("Failed to read file", e);
+            SkinRestorer.LOGGER.error("failed to read file", e);
            return null;
        }
    }
@@ -83,7 +78,7 @@ public final class FileUtils {
            
            Files.writeString(file, content);
        } catch (IOException e) {
-            SkinRestorer.LOGGER.error("Failed to write file", e);
+            SkinRestorer.LOGGER.error("failed to write file", e);
        }
    }
    
@@ -92,7 +87,7 @@ public final class FileUtils {
            if (Files.exists(file))
                Files.delete(file);
        } catch (IOException e) {
-            SkinRestorer.LOGGER.error("Failed to delete file", 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,28 +1,16 @@
 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.google.gson.*;
 import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.properties.PropertyMap;
-import com.mojang.util.UUIDTypeAdapter;
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.util.gson.PostProcessingEnabler;

 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
-import java.util.UUID;

 public final class JsonUtils {
    
-    public static final Gson GSON = new GsonBuilder()
-            .registerTypeAdapterFactory(new PostProcessingEnabler())
-            .registerTypeAdapter(UUID.class, new UUIDTypeAdapter())
-            .registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer())
-            .setPrettyPrinting()
-            .create();
+    private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
    
    private JsonUtils() {}
    
@@ -43,7 +31,7 @@ public final class JsonUtils {
    }
    
    public static JsonObject parseJson(String json) {
-        return GSON.fromJson(json, JsonObject.class);
+        return JsonParser.parseString(json).getAsJsonObject();
    }
    
    public static JsonObject skinPropertyToJson(Property property) {
@@ -54,7 +42,7 @@ public final class JsonUtils {
            
            return json;
        } catch (Exception e) {
-            SkinRestorer.LOGGER.error("Could not parse skin property", 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,13 +1,11 @@
 package net.lionarius.skinrestorer.util;

-import com.google.common.collect.Iterables;
-import com.google.common.collect.LinkedHashMultimap;
+import com.google.gson.JsonArray;
 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.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
 import net.lionarius.skinrestorer.mixin.ChunkMapAccessor;
+import net.lionarius.skinrestorer.mixin.TrackedEntityMixin;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.server.level.ChunkMap;
@@ -15,7 +13,10 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.PlayerList;

-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;

 public final class PlayerUtils {
    
@@ -40,7 +41,7 @@ public final class PlayerUtils {
    }
    
    public static void refreshPlayer(ServerPlayer player) {
-        ServerLevel serverLevel = player.level();
+        ServerLevel serverLevel = player.serverLevel();
        PlayerList playerList = serverLevel.getServer().getPlayerList();
        ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap;
        
@@ -51,14 +52,13 @@ public final class PlayerUtils {
                )
        ));
        
-        var trackedEntity = ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId());
+        var trackedEntity = (TrackedEntityMixin) ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId());
        if (trackedEntity != null) {
-            var seenBy = Set.copyOf(trackedEntity.getSeenBy());
-            for (var observerConnection : seenBy) {
+            for (var observerConnection : trackedEntity.getSeenBy()) {
                var observer = observerConnection.getPlayer();
                trackedEntity.invokeRemovePlayer(observer);
                
-                var trackedObserverEntity = ((ChunkMapAccessor) chunkMap).getEntityMap().get(observer.getId());
+                var trackedObserverEntity = (TrackedEntityMixin) ((ChunkMapAccessor) chunkMap).getEntityMap().get(observer.getId());
                if (trackedObserverEntity != null) {
                    trackedObserverEntity.invokeRemovePlayer(player);
                    trackedObserverEntity.invokeUpdatePlayer(player);
@@ -87,39 +87,28 @@ public final class PlayerUtils {
            playerList.sendPlayerPermissionLevel(player);
            playerList.sendLevelInfo(player, serverLevel);
            playerList.sendAllPlayerInfo(player);
-            playerList.sendActivePlayerEffects(player);
+            PlayerUtils.sendActivePlayerEffects(player);
        }
    }
    
-    private static void sendActivePlayerEffects(ServerPlayer player) {
+    public static void sendActivePlayerEffects(ServerPlayer player) {
        for (var effect : player.getActiveEffects()) {
-            player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect, false));
+            player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect));
        }
    }
    
-    public static GameProfile cloneGameProfile(GameProfile profile) {
-        var newProfile = new GameProfile(profile.id(), profile.name());
-        newProfile.properties().putAll(profile.properties());
-        
-        return newProfile;
-    }
-    
    public static Property getPlayerSkin(GameProfile profile) {
-        return Iterables.getFirst(profile.properties().get(TEXTURES_KEY), null);
+        return profile.getProperties().get(TEXTURES_KEY).stream().findFirst().orElse(null);
    }
    
-    public static GameProfile applyRestoredSkin(GameProfile profile, Property skin) {
-        var propertiesMap = profile.properties();
+    public static void applyRestoredSkin(GameProfile profile, Property skin) {
+        profile.getProperties().removeAll(TEXTURES_KEY);
        
-        var newProperties = LinkedHashMultimap.create(propertiesMap);
-        newProperties.removeAll(TEXTURES_KEY);
-        if (skin != null) {
-            newProperties.put(TEXTURES_KEY, skin);
-        }
-        
-        return new GameProfile(profile.id(), profile.name(), new PropertyMap(newProperties));
+        if (skin != null)
+            profile.getProperties().put(TEXTURES_KEY, skin);
    }
    
+    
    public static boolean areSkinPropertiesEquals(Property x, Property y) {
        if (x == y)
            return true;
@@ -139,9 +128,24 @@ public final class PlayerUtils {
        return xJson.equals(yJson);
    }
    
-    public static GameProfile toProfile(MinecraftProfilePropertiesResponse response) {
-        final GameProfile profile = new GameProfile(response.id(), response.name());
-        profile.properties().putAll(response.properties());
-        return profile;
+    public static Property findTexturesProperty(JsonArray properties) {
+        Property textures = null;
+        for (var property : properties) {
+            var propertyObject = property.getAsJsonObject();
+            if (propertyObject == null)
+                continue;
+            
+            try {
+                textures = JsonUtils.fromJson(propertyObject, Property.class);
+                break;
+            } catch (Exception e) {
+                // ignored
+            }
+        }
+        
+        if (textures == null)
+            throw new IllegalStateException("no textures in profile");
+        
+        return textures;
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/util/Result.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/Result.java
@@ -19,18 +19,6 @@ public class Result<S, E> {
        this.errorValue = 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));
-    }
-    
    public S getSuccessValue() {
        return successValue;
    }
@@ -81,4 +69,16 @@ public class Result<S, E> {
    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/StringUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/StringUtils.java
@@ -17,8 +17,4 @@ public final class StringUtils {
        
        return response.toString();
    }
-    
-    public static boolean isValidPlayerName(String playerName) {
-        return playerName.length() <= 16 && playerName.chars().filter(i -> i <= 32 || i >= 127).findAny().isEmpty();
-    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/util/TickedScheduler.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/TickedScheduler.java
@@ -1,60 +0,0 @@
-package net.lionarius.skinrestorer.util;
-
-import net.minecraft.server.MinecraftServer;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Map;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.PriorityBlockingQueue;
-
-public class TickedScheduler implements Runnable {
-    private final MinecraftServer server;
-    private final Queue<TickTask> queue = new PriorityBlockingQueue<>();
-    private final Map<Integer, Integer> idMap = new ConcurrentHashMap<>();
-    
-    public TickedScheduler(MinecraftServer server) {
-        this.server = server;
-    }
-    
-    public void schedule(Runnable task, int delay) {
-        this.schedule(task, delay, task);
-    }
-    
-    public void schedule(Runnable task, int delay, Object id) {
-        var taskId = id.hashCode();
-        var serverTick = this.server.getTickCount();
-        this.idMap.merge(taskId, serverTick, Integer::max);
-        this.queue.add(new TickTask(serverTick, serverTick + delay, taskId, task));
-    }
-    
-    public void cancel(Object id) {
-        var taskId = id.hashCode();
-        this.idMap.remove(taskId);
-    }
-    
-    @Override
-    public void run() {
-        TickTask nextTask;
-        while ((nextTask = this.queue.peek()) != null) {
-            if (nextTask.runOnTick() > this.server.getTickCount())
-                break;
-            
-            var tickTask = this.queue.remove();
-            var lastTaskScheduledOnTick = this.idMap.get(tickTask.id());
-            
-            if (lastTaskScheduledOnTick != null && lastTaskScheduledOnTick <= tickTask.scheduledOnTick()) {
-                this.idMap.remove(tickTask.id());
-                if (tickTask.task() != null)
-                    tickTask.task().run();
-            }
-        }
-    }
-    
-    private record TickTask(int scheduledOnTick, int runOnTick, int id, Runnable task) implements Comparable<TickTask> {
-        @Override
-        public int compareTo(@NotNull TickedScheduler.TickTask other) {
-            return Integer.compare(this.runOnTick, other.runOnTick);
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java
@@ -10,39 +10,45 @@ import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
+import java.util.Date;

 public final class WebUtils {
    
-    public static final String USER_AGENT;
-    
-    private static HttpClient HTTP_CLIENT = null;
-    
-    static {
-        USER_AGENT = String.format("SkinRestorer/%d", System.currentTimeMillis() % 65535);
-    }
-    
    private WebUtils() {}
    
-    public static void recreateHttpClient() {
-        HTTP_CLIENT = WebUtils.buildClient();
-    }
+    public static final String USER_AGENT;
    
-    private static HttpClient buildClient() {
+    static {
+        var date = new Date();
+        USER_AGENT = String.format("SkinRestorer/%d", date.getTime() % 65535);
+        
        var builder = HttpClient.newBuilder();
-        
-        var proxy = SkinRestorer.getConfig().proxy();
-        proxy.ifPresent(value -> builder.proxy(ProxySelector.of(InetSocketAddress.createUnresolved(value.host(), value.port()))));
-        
+        var proxy = SkinRestorer.getConfig().getProxy();
        try {
-            builder.connectTimeout(Duration.of(SkinRestorer.getConfig().requestTimeout(), ChronoUnit.SECONDS));
+            if (proxy != null) {
+                var colonIndex = proxy.lastIndexOf(':');
+                if (colonIndex != -1) {
+                    var host = proxy.substring(0, colonIndex);
+                    var port = Integer.parseInt(proxy.substring(colonIndex + 1));
+                    
+                    builder.proxy(ProxySelector.of(InetSocketAddress.createUnresolved(host, port)));
+                }
+            }
+        } catch (Exception e) {
+            SkinRestorer.LOGGER.error("failed to parse proxy", e);
+        }
+        try {
+            builder.connectTimeout(Duration.of(SkinRestorer.getConfig().getRequestTimeout(), ChronoUnit.SECONDS));
        } catch (IllegalArgumentException e) {
-            SkinRestorer.LOGGER.error("Failed to set request timeout", e);
+            SkinRestorer.LOGGER.error("failed to set request timeout", e);
            builder.connectTimeout(Duration.of(10, ChronoUnit.SECONDS));
        }
        
-        return builder.build();
+        HTTP_CLIENT = builder.build();
    }
    
+    private static final HttpClient HTTP_CLIENT;
+    
    public static HttpResponse<String> executeRequest(HttpRequest request) throws IOException {
        try {
            var modifiedRequest = HttpRequest.newBuilder(request, (name, value) -> true)
@@ -62,16 +68,30 @@ public final class WebUtils {
    }
    
    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;
-        };
+        String message = null;
+        switch (response.statusCode()) {
+            case 400:
+                message = "bad request";
+                break;
+            case 401:
+                message = "unauthorized";
+                break;
+            case 403:
+                message = "forbidden";
+                break;
+            case 404:
+                message = "not found";
+                break;
+            case 405:
+                message = "method not allowed";
+                break;
+            case 408:
+                message = "request timeout";
+                break;
+            case 429:
+                message = "too many requests";
+                break;
+        }
        
        if (message != null)
            throw new IllegalStateException(message);
--- a/common/src/main/java/net/lionarius/skinrestorer/util/gson/GsonPostProcessable.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/gson/GsonPostProcessable.java
@@ -1,5 +0,0 @@
-package net.lionarius.skinrestorer.util.gson;
-
-public interface GsonPostProcessable {
-    void gsonPostProcess();
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/util/gson/PostProcessingEnabler.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/gson/PostProcessingEnabler.java
@@ -1,34 +0,0 @@
-package net.lionarius.skinrestorer.util.gson;
-
-import com.google.gson.Gson;
-import com.google.gson.TypeAdapter;
-import com.google.gson.TypeAdapterFactory;
-import com.google.gson.reflect.TypeToken;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-public class PostProcessingEnabler implements TypeAdapterFactory {
-    @Override
-    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
-        var adapter = gson.getDelegateAdapter(this, type);
-        
-        return new TypeAdapter<>() {
-            @Override
-            public void write(JsonWriter out, T value) throws IOException {
-                adapter.write(out, value);
-            }
-            
-            @Override
-            public T read(JsonReader in) throws IOException {
-                var value = adapter.read(in);
-                
-                if (value instanceof GsonPostProcessable postProcessable)
-                    postProcessable.gsonPostProcess();
-                
-                return value;
-            }
-        };
-    }
-}
--- a/common/src/main/resources/META-INF/accesstransformer.cfg
+++ b/common/src/main/resources/META-INF/accesstransformer.cfg
--- a/common/src/main/resources/assets/skinrestorer/lang/cs_cz.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/cs_cz.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Načítání skinu..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/de_de.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/de_de.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Skin wird geladen..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/en_us.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/en_us.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Loading skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/es_ar.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/es_ar.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Cargando skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/es_es.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/es_es.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Cargando skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/es_mx.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/es_mx.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Cargando skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/fil_ph.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/fil_ph.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Naglo-load ng skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/fr_ca.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/fr_ca.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Chargement du skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/fr_fr.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/fr_fr.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Chargement du skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/hi_in.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/hi_in.json
@@ -3,6 +3,5 @@
    "skinrestorer.command.skin.no_changes": "कोई त्वचा परिवर्तन नहीं",
    "skinrestorer.command.skin.failed": "त्वचा बदलने में विफल: %s",
    "skinrestorer.command.skin.ok": "त्वचा बदल दी गई",
-    "skinrestorer.command.skin.loading": "त्वचा लोड हो रही है...",
-    "skinrestorer.command.skin.config_reloaded": "कॉन्फ़िगरेशन फिर से लोड किया गया है"
+    "skinrestorer.command.skin.loading": "त्वचा लोड हो रही है..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/hu_hu.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/hu_hu.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Skin betöltése..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/id_id.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/id_id.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Memuat skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/it_it.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/it_it.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Caricamento della skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/pl_pl.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/pl_pl.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Ładowanie skina..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/pt_br.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/pt_br.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Carregando skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/pt_pt.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/pt_pt.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Carregando skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/ru_ru.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/ru_ru.json
@@ -3,6 +3,5 @@
    "skinrestorer.command.skin.no_changes": "Изменений скина нет",
    "skinrestorer.command.skin.failed": "Не удалось изменить скин: %s",
    "skinrestorer.command.skin.ok": "Скин изменён",
-    "skinrestorer.command.skin.loading": "Загрузка скина...",
-    "skinrestorer.command.skin.config_reloaded": "Конфигурация была перезагружена"
+    "skinrestorer.command.skin.loading": "Загрузка скина..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/tr_tr.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/tr_tr.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Skin yükleniyor..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/uk_ua.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/uk_ua.json
@@ -3,6 +3,5 @@
    "skinrestorer.command.skin.no_changes": "Змін скіна немає",
    "skinrestorer.command.skin.failed": "Не вдалося змінити скіна: %s",
    "skinrestorer.command.skin.ok": "Скін змінено",
-    "skinrestorer.command.skin.loading": "Завантаження скіна...",
-    "skinrestorer.command.skin.config_reloaded": "Конфігурацію перезавантажено"
+    "skinrestorer.command.skin.loading": "Завантаження скіна..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/vi_vn.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/vi_vn.json
@@ -3,6 +3,5 @@
    "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"
+    "skinrestorer.command.skin.loading": "Đang tải skin..."
 }
--- a/common/src/main/resources/assets/skinrestorer/lang/zh_cn.json
+++ b/common/src/main/resources/assets/skinrestorer/lang/zh_cn.json
@@ -3,6 +3,5 @@
    "skinrestorer.command.skin.no_changes": "没有皮肤更改",
    "skinrestorer.command.skin.failed": "更改皮肤失败：%s",
    "skinrestorer.command.skin.ok": "皮肤已更改",
-    "skinrestorer.command.skin.loading": "正在加载皮肤...",
-    "skinrestorer.command.skin.config_reloaded": "配置已重新加载"
+    "skinrestorer.command.skin.loading": "正在加载皮肤..."
 }
--- 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-common.mixins.json
+++ b/common/src/main/resources/skinrestorer-common.mixins.json
@@ -2,15 +2,12 @@
    "required": true,
    "minVersion": "0.8",
    "package": "net.lionarius.skinrestorer.mixin",
-    "compatibilityLevel": "JAVA_17",
-    "priority": 1100,
-    "refmap": "${mod_id}.refmap.json",
+    "compatibilityLevel": "JAVA_8",
    "mixins": [
-        "ChunkMapAccessor",
-        "PlayerAccessor",
        "PlayerListMixin",
        "ServerLoginPacketListenerImplMixin",
-        "TrackedEntityAccessorInvoker"
+        "ChunkMapAccessor",
+        "TrackedEntityMixin"
    ],
    "injectors": {
        "defaultRequire": 1
--- a/common/src/main/resources/skinrestorer.accesswidener
+++ b/common/src/main/resources/skinrestorer.accesswidener
@@ -1 +0,0 @@
-accessWidener v2 named
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -1,47 +1,49 @@
 plugins {
-    id 'multiloader-loader'
+    id "com.github.johnrengelman.shadow"
+}

-    id 'fabric-loom'
+architectury {
+    platformSetupLoomIde()
+    fabric()
+}

-    id 'multiloader-publish'
+configurations {
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentFabric.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don"t use the `shadow` configuration from the plugin itself as it"s meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
 }

 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}"
+    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"

-    modCompileOnly "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
-
-    include implementation("org.mineskin:java-client:${mineskin_client_version}")
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowBundle project(path: ":common", configuration: "transformProductionFabric")
 }

-loom {
-    def aw = project(':common').file("src/main/resources/${mod_id}.accesswidener")
-    if (aw.exists()) {
-        accessWidenerPath.set(aw)
-    }
+processResources {
+    inputs.property "version", project.version

-    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')
-        }
+    filesMatching("fabric.mod.json") {
+        expand version: project.version
    }
 }
+
+shadowJar {
+    configurations = [project.configurations.shadowBundle]
+    archiveClassifier = "dev-shadow"
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+}
--- a/fabric/gradle.properties
+++ b/fabric/gradle.properties
@@ -1,6 +0,0 @@
-# Fabric, see https://fabricmc.net/develop/ for new versions
-fabric_loader_version=0.15.0
-fabric_api_version=0.139.4+1.21.11
-
-optional_dependencies=fabric-api
-additional_modloaders=quilt
--- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/SkinRestorerFabric.java
+++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/SkinRestorerFabric.java
@@ -1,19 +1,12 @@
 package net.lionarius.skinrestorer.fabric;

 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
-import net.lionarius.skinrestorer.platform.Services;

 public final class SkinRestorerFabric implements ModInitializer {
-    
-    public static final boolean FABRIC_API_LOADED = Services.PLATFORM.isModLoaded("fabric-api");
-    
    @Override
    public void onInitialize() {
-        SkinRestorer.onInitialize();
-        
-        if (SkinShuffleCompatibility.shouldApply())
-            net.lionarius.skinrestorer.fabric.compat.skinshuffle.SkinShuffleCompatibility.initialize();
+        SkinRestorer.onInitialize(FabricLoader.getInstance().getConfigDir());
    }
 }
--- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/compat/skinshuffle/SkinShuffleCompatibility.java
+++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/compat/skinshuffle/SkinShuffleCompatibility.java
@@ -1,37 +0,0 @@
-package net.lionarius.skinrestorer.fabric.compat.skinshuffle;
-
-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleHandshakePayload;
-import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleSkinRefreshPayload;
-import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleSkinRefreshV1Payload;
-import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleSkinRefreshV2Payload;
-import net.lionarius.skinrestorer.fabric.SkinRestorerFabric;
-
-public final class SkinShuffleCompatibility {
-    
-    private SkinShuffleCompatibility() {}
-    
-    public static void initialize() {
-        if (!SkinRestorerFabric.FABRIC_API_LOADED) {
-            SkinRestorer.LOGGER.warn("fabric-api is not loaded, SkinShuffle compatibility will not be available");
-            return;
-        }
-        
-        PayloadTypeRegistry.playS2C().register(SkinShuffleHandshakePayload.PACKET_ID, SkinShuffleHandshakePayload.PACKET_CODEC);
-        PayloadTypeRegistry.playC2S().register(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleSkinRefreshV1Payload.PACKET_CODEC);
-        PayloadTypeRegistry.playC2S().register(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleSkinRefreshV2Payload.PACKET_CODEC);
-        
-        ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.onPlayerJoin(handler.getPlayer()));
-        
-        ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshPacket);
-        
-        ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshPacket);
-    }
-    
-    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, ServerPlayNetworking.Context context) {
-        net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.handleSkinRefresh(SkinRestorer.getMinecraftServer(), context.player(), payload);
-    }
-}
--- 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,7 +1,7 @@
 package net.lionarius.skinrestorer.fabric.mixin;

 import com.mojang.brigadier.CommandDispatcher;
-import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.command.SkinCommand;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -21,6 +21,6 @@ public abstract class CommandsMixin {
    @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) {
-        SkinRestorer.Events.onCommandRegister(dispatcher);
+        SkinCommand.register(dispatcher);
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lionarius	a67b5b9cb6	backport to 1.20.3-1.20.4	2024-07-03 02:31:38 +03:00
lionarius	731338aac3	backport to 1.20.5-1.20.6	2024-07-03 01:56:27 +03:00