diff --git a/build.gradle b/build.gradle index 5be6436..d50e37e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { // see https://fabricmc.net/develop/ for new versions - id 'fabric-loom' version '1.11-SNAPSHOT' apply false + 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 diff --git a/common/build.gradle b/common/build.gradle index c168537..88b391d 100644 --- a/common/build.gradle +++ b/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' diff --git a/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java b/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java index 2296958..1220221 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java +++ b/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.ResourceLocation; +import net.minecraft.resources.Identifier; 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 ResourceLocation resourceLocation(String name) { - return ResourceLocation.fromNamespaceAndPath(SkinRestorer.MOD_ID, name); + public static Identifier resourceLocation(String name) { + return Identifier.fromNamespaceAndPath(SkinRestorer.MOD_ID, name); } public static String assetPath(String name) { diff --git a/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java b/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java index c2ab49d..b8628a2 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java +++ b/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java @@ -15,6 +15,7 @@ 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; @@ -55,7 +56,7 @@ public final class SkinCommand { base.then( literal("config") - .requires(commandSourceStack -> commandSourceStack.hasPermission(4)) + .requires(commandSourceStack -> Commands.LEVEL_OWNERS.check(commandSourceStack.permissions())) .then(literal("reload").executes(SkinCommand::configReloadSubcommand)) ); @@ -269,7 +270,7 @@ public final class SkinCommand { BiFunction, Collection, Integer> consumer ) { return argument("targets", GameProfileArgument.gameProfile()) - .requires(source -> source.hasPermission(2)) + .requires(source -> Commands.LEVEL_GAMEMASTERS.check(source.permissions())) .executes(context -> consumer.apply(context, GameProfileArgument.getGameProfiles(context, "targets"))); } } diff --git a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java index 431fe20..6730985 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java +++ b/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.ResourceLocation; +import net.minecraft.resources.Identifier; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; @@ -23,8 +23,8 @@ public class SkinShuffleCompatibility { return SkinShuffleCompatibility.SHOULD_APPLY; } - public static ResourceLocation resourceLocation(String name) { - return ResourceLocation.fromNamespaceAndPath(SkinShuffleCompatibility.MOD_ID, name); + public static Identifier resourceLocation(String name) { + return Identifier.fromNamespaceAndPath(SkinShuffleCompatibility.MOD_ID, name); } public static void onPlayerJoin(ServerPlayer player) { diff --git a/fabric/build.gradle b/fabric/build.gradle index 62adc91..27c744a 100644 --- a/fabric/build.gradle +++ b/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}" diff --git a/fabric/gradle.properties b/fabric/gradle.properties index 7dc2ea4..9f16c0d 100644 --- a/fabric/gradle.properties +++ b/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.133.14+1.21.9 +fabric_api_version=0.139.4+1.21.11 optional_dependencies=fabric-api additional_modloaders=quilt diff --git a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java index 6212f81..6ebb954 100644 --- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java +++ b/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;getNanos()J", ordinal = 0)) + at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getNanos()J", ordinal = 0)) private void onServerStarted(CallbackInfo ci) { SkinRestorer.Events.onServerStarted((MinecraftServer) (Object) this); } diff --git a/forge/build.gradle b/forge/build.gradle index c52c1d9..588a178 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -24,7 +24,8 @@ tasks.named('jarJar') { jar.finalizedBy('jarJar') minecraft { - mappings channel: 'parchment', version: "${parchment_minecraft}-${parchment_version}-${minecraft_version}" + mappings channel: 'official', version: minecraft_version +// mappings channel: 'parchment', version: "${parchment_minecraft}-${parchment_version}-${minecraft_version}" copyIdeResources = true //Calls processResources when in dev diff --git a/forge/gradle.properties b/forge/gradle.properties index d1e8843..211825c 100644 --- a/forge/gradle.properties +++ b/forge/gradle.properties @@ -1,5 +1,5 @@ # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions -forge_version=59.0.0 -forge_loader_version_range=[59,) +forge_version=61.0.0 +forge_loader_version_range=[61,) # Forge sometimes skips minor minecraft versions (like 1.20.5) -forge_minecraft_version=1.21.9 +forge_minecraft_version=1.21.11 diff --git a/gradle.properties b/gradle.properties index 2ee5965..7f59327 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ group=net.lionarius java_version=21 # Common -minecraft_version=1.21.9 -minecraft_version_list=1.21.9 -minecraft_version_range=[1.21.9, 1.22) +minecraft_version=1.21.11 +minecraft_version_list=1.21.11 +minecraft_version_range=[1.21.11, 1.22) mod_id=skinrestorer mod_name=SkinRestorer mod_version=2.4.3 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 0c9aca9..7caa74f 100644 --- a/neoforge/build.gradle +++ b/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 { diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties index 4ecb081..b80f750 100644 --- a/neoforge/gradle.properties +++ b/neoforge/gradle.properties @@ -1,3 +1,3 @@ # NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions -neoforge_version=21.9.0-beta +neoforge_version=21.11.0-beta neoforge_loader_version_range=[4,)