backport to 1.21.9

This reverts commit 69a561f679.

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.13-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.11-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

common/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     minecraft "com.mojang:minecraft:${minecraft_version}"
     mappings loom.layered {
         officialMojangMappings()
-//        parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
+        parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
     }
     compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
 

common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java

@@ -15,7 +15,7 @@ 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.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.storage.LevelResource;
@@ -70,8 +70,8 @@ public final class SkinRestorer {
         return Optional.ofNullable(SkinRestorer.providersRegistry.get(name));
     }
     
-    public static Identifier resourceLocation(String name) {
-        return Identifier.fromNamespaceAndPath(SkinRestorer.MOD_ID, name);
+    public static ResourceLocation resourceLocation(String name) {
+        return ResourceLocation.fromNamespaceAndPath(SkinRestorer.MOD_ID, name);
     }
     
     public static String assetPath(String name) {

common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java

@@ -15,7 +15,6 @@ import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
 import net.lionarius.skinrestorer.translation.Translation;
 import net.lionarius.skinrestorer.util.PlayerUtils;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
 import net.minecraft.commands.arguments.GameProfileArgument;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.NameAndId;
@@ -56,7 +55,7 @@ public final class SkinCommand {
         
         base.then(
                 literal("config")
-                        .requires(commandSourceStack -> Commands.LEVEL_OWNERS.check(commandSourceStack.permissions()))
+                        .requires(commandSourceStack -> commandSourceStack.hasPermission(4))
                         .then(literal("reload").executes(SkinCommand::configReloadSubcommand))
         );
         
@@ -270,7 +269,7 @@ public final class SkinCommand {
             BiFunction<CommandContext<CommandSourceStack>, Collection<NameAndId>, 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")));
     }
 }

common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java

@@ -5,7 +5,7 @@ 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.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 
@@ -23,8 +23,8 @@ public class SkinShuffleCompatibility {
         return SkinShuffleCompatibility.SHOULD_APPLY;
     }
     
-    public static Identifier resourceLocation(String name) {
-        return Identifier.fromNamespaceAndPath(SkinShuffleCompatibility.MOD_ID, name);
+    public static ResourceLocation resourceLocation(String name) {
+        return ResourceLocation.fromNamespaceAndPath(SkinShuffleCompatibility.MOD_ID, name);
     }
     
     public static void onPlayerJoin(ServerPlayer player) {

fabric/build.gradle

@@ -10,7 +10,7 @@ dependencies {
     minecraft "com.mojang:minecraft:${minecraft_version}"
     mappings loom.layered {
         officialMojangMappings()
-//        parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
+        parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
     }
     modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
 

fabric/gradle.properties

@@ -1,6 +1,6 @@
 # Fabric, see https://fabricmc.net/develop/ for new versions
 fabric_loader_version=0.15.0
-fabric_api_version=0.139.4+1.21.11
+fabric_api_version=0.133.14+1.21.9
 
 optional_dependencies=fabric-api
 additional_modloaders=quilt

fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java

@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MinecraftServerMixin {
     
     @Inject(method = "runServer",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getNanos()J", ordinal = 0))
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getNanos()J", ordinal = 0))
     private void onServerStarted(CallbackInfo ci) {
         SkinRestorer.Events.onServerStarted((MinecraftServer) (Object) this);
     }

forge/build.gradle

@@ -24,8 +24,7 @@ tasks.named('jarJar') {
 jar.finalizedBy('jarJar')
 
 minecraft {
-    mappings channel: 'official', version: minecraft_version
-//    mappings channel: 'parchment', version: "${parchment_minecraft}-${parchment_version}-${minecraft_version}"
+    mappings channel: 'parchment', version: "${parchment_minecraft}-${parchment_version}-${minecraft_version}"
 
     copyIdeResources = true //Calls processResources when in dev
 

forge/gradle.properties

@@ -1,5 +1,5 @@
 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=61.0.0
-forge_loader_version_range=[61,)
+forge_version=59.0.0
+forge_loader_version_range=[59,)
 # Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.21.11
+forge_minecraft_version=1.21.9

gradle.properties

@@ -3,9 +3,9 @@ group=net.lionarius
 java_version=21
 
 # Common
-minecraft_version=1.21.11
-minecraft_version_list=1.21.11
-minecraft_version_range=[1.21.11, 1.22)
+minecraft_version=1.21.9
+minecraft_version_list=1.21.9
+minecraft_version_range=[1.21.9, 1.22)
 mod_id=skinrestorer
 mod_name=SkinRestorer
 mod_version=2.4.3

neoforge/build.gradle

@@ -17,10 +17,10 @@ neoForge {
         accessTransformers.from(at.absolutePath)
     }
 
-//    parchment {
-//        minecraftVersion = parchment_minecraft
-//        mappingsVersion = parchment_version
-//    }
+    parchment {
+        minecraftVersion = parchment_minecraft
+        mappingsVersion = parchment_version
+    }
 
     runs {
         configureEach {

neoforge/gradle.properties

@@ -1,3 +1,3 @@
 # NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions
-neoforge_version=21.11.0-beta
+neoforge_version=21.9.0-beta
 neoforge_loader_version_range=[4,)