Skip to content

Commit

Permalink
support 1.19.x
Browse files Browse the repository at this point in the history
  • Loading branch information
KawaiiZapic committed Aug 18, 2022
1 parent 9e00aa0 commit e284275
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ 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
maven_group = moe.zapic
archives_base_name = clock-hud

# Dependencies
fabric_version=0.57.0+1.18.2
cloth_config_version=6.2.62
fabric_version=0.60.0+1.19.2
cloth_config_version=7.0.72
26 changes: 13 additions & 13 deletions src/main/java/moe/zapic/clockhud/config/ConfigScreenBuilder.java
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/moe/zapic/clockhud/render/DayCountRender.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}

0 comments on commit e284275

Please sign in to comment.