From 91a6edfba721c54a71a523db7481d85bd9dc6592 Mon Sep 17 00:00:00 2001 From: LCLP Date: Thu, 13 Jun 2024 20:26:54 +0200 Subject: [PATCH] upgrade to 1.21 --- README.md | 2 +- gradle.properties | 14 +++++++------- .../client/ClientPlayNetworkHandlerMixin.java | 2 +- .../{ => mixin}/client/MinecraftClientMixin.java | 2 +- .../{ => mixin}/client/SoundSystemMixin.java | 2 +- src/client/resources/notica.client.mixins.json | 2 +- src/main/java/work/lclpnet/notica/NoticaInit.java | 2 +- .../notica/impl/FabricInstrumentSoundProvider.java | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 9 files changed, 17 insertions(+), 17 deletions(-) rename src/client/java/work/lclpnet/notica/{ => mixin}/client/ClientPlayNetworkHandlerMixin.java (94%) rename src/client/java/work/lclpnet/notica/{ => mixin}/client/MinecraftClientMixin.java (93%) rename src/client/java/work/lclpnet/notica/{ => mixin}/client/SoundSystemMixin.java (95%) diff --git a/README.md b/README.md index 7d74286..2bf6c69 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ If you want to load a song from a file specified by a `Path`, you can use: ```java Path path = Path.of("path", "to", "song.nbs"); -Identifier id = new Identifier("myMod", "foo"); +Identifier id = Identifier.of("myMod", "foo"); CheckedSong song; try (var in = Files.newInputStream(path)) { diff --git a/gradle.properties b/gradle.properties index 345a24a..976d568 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.6 -yarn_mappings=1.20.6+build.1 -loader_version=0.15.10 +minecraft_version=1.21 +yarn_mappings=1.21+build.1 +loader_version=0.15.11 # Mod Properties maven_group=work.lclpnet.mods archives_base_name=notica # Dependencies -fabric_version=0.97.8+1.20.6 -kibu_hooks_version=0.49.0+1.20.6 +fabric_version=0.100.1+1.21 +kibu_hooks_version=0.50.0+1.21 kibu_hook_api_version=1.3.0 -kibu_translation_api_version=0.14.0+1.20.6 -kibu_access_lib_version=0.12.0+1.20.6 \ No newline at end of file +kibu_translation_api_version=0.14.0+1.21 +kibu_access_lib_version=0.15.0+1.21 \ No newline at end of file diff --git a/src/client/java/work/lclpnet/notica/client/ClientPlayNetworkHandlerMixin.java b/src/client/java/work/lclpnet/notica/mixin/client/ClientPlayNetworkHandlerMixin.java similarity index 94% rename from src/client/java/work/lclpnet/notica/client/ClientPlayNetworkHandlerMixin.java rename to src/client/java/work/lclpnet/notica/mixin/client/ClientPlayNetworkHandlerMixin.java index 36191e2..0bdbc43 100644 --- a/src/client/java/work/lclpnet/notica/client/ClientPlayNetworkHandlerMixin.java +++ b/src/client/java/work/lclpnet/notica/mixin/client/ClientPlayNetworkHandlerMixin.java @@ -1,4 +1,4 @@ -package work.lclpnet.notica.client; +package work.lclpnet.notica.mixin.client; import net.minecraft.client.network.ClientPlayNetworkHandler; import net.minecraft.network.packet.s2c.play.GameJoinS2CPacket; diff --git a/src/client/java/work/lclpnet/notica/client/MinecraftClientMixin.java b/src/client/java/work/lclpnet/notica/mixin/client/MinecraftClientMixin.java similarity index 93% rename from src/client/java/work/lclpnet/notica/client/MinecraftClientMixin.java rename to src/client/java/work/lclpnet/notica/mixin/client/MinecraftClientMixin.java index d6093e0..69e18bb 100644 --- a/src/client/java/work/lclpnet/notica/client/MinecraftClientMixin.java +++ b/src/client/java/work/lclpnet/notica/mixin/client/MinecraftClientMixin.java @@ -1,4 +1,4 @@ -package work.lclpnet.notica.client; +package work.lclpnet.notica.mixin.client; import net.minecraft.client.MinecraftClient; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/client/java/work/lclpnet/notica/client/SoundSystemMixin.java b/src/client/java/work/lclpnet/notica/mixin/client/SoundSystemMixin.java similarity index 95% rename from src/client/java/work/lclpnet/notica/client/SoundSystemMixin.java rename to src/client/java/work/lclpnet/notica/mixin/client/SoundSystemMixin.java index ca9bcf4..77f9785 100644 --- a/src/client/java/work/lclpnet/notica/client/SoundSystemMixin.java +++ b/src/client/java/work/lclpnet/notica/mixin/client/SoundSystemMixin.java @@ -1,4 +1,4 @@ -package work.lclpnet.notica.client; +package work.lclpnet.notica.mixin.client; import net.minecraft.client.sound.SoundInstance; import net.minecraft.client.sound.SoundSystem; diff --git a/src/client/resources/notica.client.mixins.json b/src/client/resources/notica.client.mixins.json index d9b569b..a4441ba 100644 --- a/src/client/resources/notica.client.mixins.json +++ b/src/client/resources/notica.client.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "work.lclpnet.notica.client", + "package": "work.lclpnet.notica.mixin.client", "compatibilityLevel": "JAVA_21", "injectors": { "defaultRequire": 1 diff --git a/src/main/java/work/lclpnet/notica/NoticaInit.java b/src/main/java/work/lclpnet/notica/NoticaInit.java index d090689..0f4cb5b 100644 --- a/src/main/java/work/lclpnet/notica/NoticaInit.java +++ b/src/main/java/work/lclpnet/notica/NoticaInit.java @@ -111,6 +111,6 @@ private void createDirectory(Path dir) { * @return An identifier of this mod with the given path. */ public static Identifier identifier(String path) { - return new Identifier(MOD_ID, path); + return Identifier.of(MOD_ID, path); } } \ No newline at end of file diff --git a/src/main/java/work/lclpnet/notica/impl/FabricInstrumentSoundProvider.java b/src/main/java/work/lclpnet/notica/impl/FabricInstrumentSoundProvider.java index c11e309..bd8e141 100644 --- a/src/main/java/work/lclpnet/notica/impl/FabricInstrumentSoundProvider.java +++ b/src/main/java/work/lclpnet/notica/impl/FabricInstrumentSoundProvider.java @@ -88,7 +88,7 @@ public SoundEvent getExtendedSound(final @NotNull SoundEvent sound, byte key, sh } // create a new sound event - Identifier id = new Identifier(name); + Identifier id = Identifier.of(name); SoundEventAccessor access = (SoundEventAccessor) sound; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 14714b0..f12bb4e 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,13 +32,13 @@ ], "depends": { "fabricloader": ">=0.15.10", - "minecraft": "~1.20.5", + "minecraft": "~1.21", "java": ">=21", "fabric-api": "*", "kibu-hook-api": ">=1.3.0", - "kibu-hooks": ">=0.49.0", + "kibu-hooks": ">=0.50.0", "kibu-translation-api": ">=0.14.0", - "kibu-access-lib": ">=0.12.0" + "kibu-access-lib": ">=0.15.0" }, "suggests": {} } \ No newline at end of file