diff --git a/build.gradle b/build.gradle index 0af07c5..bc5205f 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ java { // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task // if it is present. // If you remove this line, sources will not be generated. - withSourcesJar() + // withSourcesJar() } jar { diff --git a/gradle.properties b/gradle.properties index a8582b6..1b3ffd1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.18.2 - yarn_mappings=1.18.2+build.3 - loader_version=0.14.8 + minecraft_version=1.19.2 + yarn_mappings=1.19.2+build.4 + loader_version=0.14.9 # Mod Properties mod_version = 1.1.1 @@ -13,5 +13,5 @@ org.gradle.jvmargs=-Xmx1G archives_base_name = clock-hud # Dependencies - fabric_version=0.57.0+1.18.2 - cloth_config_version=6.2.62 \ No newline at end of file + fabric_version=0.60.0+1.19.2 + cloth_config_version=7.0.72 \ No newline at end of file diff --git a/src/main/java/moe/zapic/clockhud/config/ConfigScreenBuilder.java b/src/main/java/moe/zapic/clockhud/config/ConfigScreenBuilder.java index 0e72221..0b27c1c 100644 --- a/src/main/java/moe/zapic/clockhud/config/ConfigScreenBuilder.java +++ b/src/main/java/moe/zapic/clockhud/config/ConfigScreenBuilder.java @@ -4,58 +4,58 @@ import moe.zapic.clockhud.Main; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; public class ConfigScreenBuilder { public static Screen getConfigScreen() { var config = Main.config; var builder = ConfigBuilder.create() .setParentScreen(MinecraftClient.getInstance().currentScreen) - .setTitle(new TranslatableText("text.autoconfig.clock-hud.title")); - var category = builder.getOrCreateCategory(new TranslatableText("text.autoconfig.clock-hud.title")); + .setTitle(Text.translatable("text.autoconfig.clock-hud.title")); + var category = builder.getOrCreateCategory(Text.translatable("text.autoconfig.clock-hud.title")); var entry = builder.entryBuilder(); category.addEntry(entry - .startBooleanToggle(new TranslatableText("text.autoconfig.clock-hud.option.isShow"), config.isShow) + .startBooleanToggle(Text.translatable("text.autoconfig.clock-hud.option.isShow"), config.isShow) .setDefaultValue(true) .setSaveConsumer(v -> config.isShow = v) .build() ); category.addEntry(entry - .startBooleanToggle(new TranslatableText("text.autoconfig.clock-hud.option.showDayCount"), config.showDayCount) + .startBooleanToggle(Text.translatable("text.autoconfig.clock-hud.option.showDayCount"), config.showDayCount) .setDefaultValue(true) .setSaveConsumer(v -> config.showDayCount = v) .build() ); category.addEntry(entry - .startIntField(new TranslatableText("text.autoconfig.clock-hud.option.ScreenX"), config.ScreenX) + .startIntField(Text.translatable("text.autoconfig.clock-hud.option.ScreenX"), config.ScreenX) .setDefaultValue(4) .setSaveConsumer(v -> config.ScreenX = v) .build() ); category.addEntry(entry - .startIntField(new TranslatableText("text.autoconfig.clock-hud.option.ScreenY"), config.ScreenY) + .startIntField(Text.translatable("text.autoconfig.clock-hud.option.ScreenY"), config.ScreenY) .setDefaultValue(4) .setSaveConsumer(v -> config.ScreenY = v) .build() ); category.addEntry(entry - .startIntSlider(new TranslatableText("text.autoconfig.clock-hud.option.Scale"), config.Scale, 25, 200) + .startIntSlider(Text.translatable("text.autoconfig.clock-hud.option.Scale"), config.Scale, 25, 200) .setDefaultValue(100) - .setTextGetter(v -> new TranslatableText("text.autoconfig.clock-hud.option.ScalePercent", v)) + .setTextGetter(v -> Text.translatable("text.autoconfig.clock-hud.option.ScalePercent", v)) .setSaveConsumer(v -> config.Scale = v) .build() ); category.addEntry(entry - .startIntSlider(new TranslatableText("text.autoconfig.clock-hud.option.TipScale"), config.TipScale, 100, 200) + .startIntSlider(Text.translatable("text.autoconfig.clock-hud.option.TipScale"), config.TipScale, 100, 200) .setDefaultValue(150) - .setTextGetter(v -> new TranslatableText("text.autoconfig.clock-hud.option.ScalePercent", v)) + .setTextGetter(v -> Text.translatable("text.autoconfig.clock-hud.option.ScalePercent", v)) .setSaveConsumer(v -> config.TipScale = v) .build() ); category.addEntry(entry - .startIntSlider(new TranslatableText("text.autoconfig.clock-hud.option.Opacity"), config.Opacity, 0, 255) + .startIntSlider(Text.translatable("text.autoconfig.clock-hud.option.Opacity"), config.Opacity, 0, 255) .setDefaultValue(255) - .setTextGetter(v -> new TranslatableText("text.autoconfig.clock-hud.option.ScalePercent", (int)(v/2.55f))) + .setTextGetter(v -> Text.translatable("text.autoconfig.clock-hud.option.ScalePercent", (int)(v/2.55f))) .setSaveConsumer(v -> config.Opacity = v) .build() ); diff --git a/src/main/java/moe/zapic/clockhud/render/DayCountRender.java b/src/main/java/moe/zapic/clockhud/render/DayCountRender.java index 7f629fb..c0f7c4f 100644 --- a/src/main/java/moe/zapic/clockhud/render/DayCountRender.java +++ b/src/main/java/moe/zapic/clockhud/render/DayCountRender.java @@ -5,7 +5,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; public class DayCountRender { @@ -25,7 +25,7 @@ public static void render(MatrixStack matrices, float tickDelta, CallbackInfo ci matrices.translate(-mc.getWindow().getScaledWidth() * (scale - 1) / 2, - 30 * (scale - 1) / 2,0); matrices.scale(scale, scale, 1); setRenderStatus(); - DrawableHelper.drawCenteredText(matrices, mc.textRenderer, new TranslatableText("text.clock-hud.new-day-tip", currentDay), mc.getWindow().getScaledWidth() / 2, 30, (TextOpacity << 24) + 0xffffff); + DrawableHelper.drawCenteredText(matrices, mc.textRenderer, Text.translatable("text.clock-hud.new-day-tip", currentDay), mc.getWindow().getScaledWidth() / 2, 30, (TextOpacity << 24) + 0xffffff); matrices.pop(); renderTime += mc.getLastFrameDuration(); if (renderTime >= Duration) { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0309466..fed7f40 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -29,8 +29,8 @@ "depends": { "fabricloader": ">=0.14.6", "fabric": "*", - "minecraft": "~1.18", + "minecraft": "~1.19", "java": ">=17", - "cloth-config": "~6.2" + "cloth-config": "~7.0" } }