diff --git a/fabric/src/client/java/fr/rakambda/editsign/fabric/client/cloth/ClothConfigHook.java b/fabric/src/client/java/fr/rakambda/editsign/fabric/client/cloth/ClothConfigHook.java index d8233d1..dd27bf6 100644 --- a/fabric/src/client/java/fr/rakambda/editsign/fabric/client/cloth/ClothConfigHook.java +++ b/fabric/src/client/java/fr/rakambda/editsign/fabric/client/cloth/ClothConfigHook.java @@ -9,8 +9,6 @@ import net.fabricmc.api.Environment; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Optional; @@ -26,7 +24,7 @@ public Function load(){ return (screen) -> { var builder = ConfigBuilder.create() .setParentScreen(screen) - .setTitle(MutableComponent.create(new LiteralContents("EditSign"))); + .setTitle(Component.literal("EditSign")); var configuration = getMod().getConfiguration(); builder.setSavingRunnable(configuration::onUpdate); diff --git a/fabric/src/main/java/fr/rakambda/editsign/fabric/common/EditSignCommonsImpl.java b/fabric/src/main/java/fr/rakambda/editsign/fabric/common/EditSignCommonsImpl.java index 5498e3c..5c23ae9 100644 --- a/fabric/src/main/java/fr/rakambda/editsign/fabric/common/EditSignCommonsImpl.java +++ b/fabric/src/main/java/fr/rakambda/editsign/fabric/common/EditSignCommonsImpl.java @@ -9,8 +9,7 @@ import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import org.jetbrains.annotations.NotNull; @@ -22,7 +21,7 @@ public class EditSignCommonsImpl extends EditSignCommon{ @Override @NotNull public IComponent translate(@NotNull String key, Object... objects){ - return new ComponentWrapper(MutableComponent.create(new TranslatableContents(key, objects))); + return new ComponentWrapper(Component.translatable(key, objects)); } @Override diff --git a/forge/src/main/java/fr/rakambda/editsign/forge/ForgeEventSubscriber.java b/forge/src/main/java/fr/rakambda/editsign/forge/ForgeEventSubscriber.java index 45ab057..505058d 100644 --- a/forge/src/main/java/fr/rakambda/editsign/forge/ForgeEventSubscriber.java +++ b/forge/src/main/java/fr/rakambda/editsign/forge/ForgeEventSubscriber.java @@ -1,7 +1,6 @@ package fr.rakambda.editsign.forge; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.block.entity.SignBlockEntity; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -29,7 +28,7 @@ public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event){ } else{ if(player instanceof ServerPlayer serverPlayer){ - serverPlayer.sendSystemMessage(MutableComponent.create(new TranslatableContents(EditSign.MOD_ID + ".action.not_editable")), false); + serverPlayer.sendSystemMessage(Component.translatable(EditSign.MOD_ID + ".action.not_editable"), false); } } } diff --git a/forge/src/main/java/fr/rakambda/editsign/forge/config/cloth/ClothConfigHook.java b/forge/src/main/java/fr/rakambda/editsign/forge/config/cloth/ClothConfigHook.java index 99c63b0..0f2c1a7 100644 --- a/forge/src/main/java/fr/rakambda/editsign/forge/config/cloth/ClothConfigHook.java +++ b/forge/src/main/java/fr/rakambda/editsign/forge/config/cloth/ClothConfigHook.java @@ -7,9 +7,6 @@ import me.shedaniel.clothconfig2.api.ConfigCategory; import me.shedaniel.clothconfig2.gui.entries.StringListEntry; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.contents.LiteralContents; -import net.minecraft.network.chat.contents.TranslatableContents; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.ConfigScreenHandler; @@ -45,7 +42,7 @@ public void load(){ ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((minecraft, screen) -> { ConfigBuilder builder = ConfigBuilder.create() .setParentScreen(screen) - .setTitle(MutableComponent.create(new LiteralContents("EditSign"))); + .setTitle(Component.literal("EditSign")); fillConfigScreen(builder); @@ -71,7 +68,7 @@ public void fillConfigScreen(ConfigBuilder builder){ @NotNull private static Component translatable(@NotNull String key){ - return MutableComponent.create(new TranslatableContents(key)); + return Component.translatable(key); } private String getFieldName(String fieldName){ diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index b262d45..81315e7 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[44,)" +loaderVersion = "[45,)" issueTrackerURL = "https://github.com/${repoUser}/${repoName}/issues" license = "LGPL-3.0" @@ -15,7 +15,7 @@ description = '''Allow you to edit signs without breaking them.''' [[dependencies.editsign]] modId = "forge" mandatory = true -versionRange = "[44,)" +versionRange = "[45,)" ordering = "NONE" side = "BOTH" [[dependencies.editsign]] @@ -27,6 +27,6 @@ side = "BOTH" [[dependencies.editsign]] modId = "cloth-config" mandatory = false -versionRange = "[9.0.0,)" +versionRange = "[10.0.0,)" ordering = "NONE" side = "CLIENT" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5f4ba6d..4f5f5ff 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,15 +6,15 @@ jetbrains-annotations-version = "24.0.1" gson-version = "2.10.1" log4j2-version = "2.20.0" -minecraftVersion = "1.19.3" -fabric-loader-version = "0.14.12" -fabric-api-version = "0.72.0+1.19.3" -forge-version = "1.19.3-44.0.0" +minecraftVersion = "1.19.4" +fabric-loader-version = "0.14.17" +fabric-api-version = "0.75.3+1.19.4" +forge-version = "1.19.4-45.0.0" forgeMappingsVersion = "1.19.3" # Mod dependencies -modmenu-version = "5.0.2" -clothConfigVersion = "9.0.94" +modmenu-version = "6.1.0-rc.1" +clothConfigVersion = "10.0.96" fabric-loom-version = "1.1.10" forge-plugin-version = "5.1.68"