Skip to content

Commit 01b9039

Browse files
committed
Add warning message to done button in Onboarding screen
1 parent 42d1495 commit 01b9039

File tree

8 files changed

+22
-20
lines changed

8 files changed

+22
-20
lines changed

src/main/java/org/visuals/legacy/animatium/config/AnimatiumConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ public final class AnimatiumConfig {
4545
public static Screen getConfigScreen(@Nullable Screen parent) {
4646
return YetAnotherConfigLib.create(CONFIG, (defaults, config, builder) -> {
4747
builder.title(Component.translatable("animatium.title"));
48-
builder.category(MovementConfigCategory.setup(defaults.movement, config.movement));
49-
builder.category(ScreenConfigCategory.setup(defaults.screen, config.screen));
50-
builder.category(ItemsConfigCategory.setup(defaults.items, config.items));
51-
builder.category(FixesConfigCategory.setup(defaults.fixes, config.fixes));
52-
builder.category(OtherConfigCategory.setup(defaults.other, config.other));
53-
builder.category(ExtrasConfigCategory.setup(defaults.extras, config.extras));
48+
builder.category(MovementConfigCategory.create(defaults.movement, config.movement));
49+
builder.category(ScreenConfigCategory.create(defaults.screen, config.screen));
50+
builder.category(ItemsConfigCategory.create(defaults.items, config.items));
51+
builder.category(FixesConfigCategory.create(defaults.fixes, config.fixes));
52+
builder.category(OtherConfigCategory.create(defaults.other, config.other));
53+
builder.category(ExtrasConfigCategory.create(defaults.extras, config.extras));
5454
return builder;
5555
}).generateScreen(parent);
5656
}

src/main/java/org/visuals/legacy/animatium/config/category/ExtrasConfigCategory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class ExtrasConfigCategory extends Category {
5656
public boolean ignoreHasteSpeed = false;
5757
public boolean ignoreMiningFatigueSpeed = false;
5858

59-
public static ConfigCategory setup(final ExtrasConfigCategory defaults, final ExtrasConfigCategory config) {
59+
public static ConfigCategory create(final ExtrasConfigCategory defaults, final ExtrasConfigCategory config) {
6060
final ConfigCategory.Builder category = ConfigCategory.createBuilder();
6161
category.name(Component.translatable("animatium.category.extras"));
6262
category.option(booleanOption("minimalViewBobbing", defaults, config));

src/main/java/org/visuals/legacy/animatium/config/category/FixesConfigCategory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class FixesConfigCategory extends Category {
4444
public boolean fixEquipAnimationOnItemUse = true;
4545
public boolean fixItemUsageVisualInGUI = true;
4646

47-
public static ConfigCategory setup(final FixesConfigCategory defaults, final FixesConfigCategory config) {
47+
public static ConfigCategory create(final FixesConfigCategory defaults, final FixesConfigCategory config) {
4848
final ConfigCategory.Builder category = ConfigCategory.createBuilder();
4949
category.name(Component.translatable("animatium.category.fixes"));
5050
category.option(booleanOption("fixSneakingFeetPosition", defaults, config));

src/main/java/org/visuals/legacy/animatium/config/category/ItemsConfigCategory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class ItemsConfigCategory extends Category {
6666
public boolean heldItemVisibilityInBoat = true;
6767
public boolean itemPickupPosition = true;
6868

69-
public static ConfigCategory setup(final ItemsConfigCategory defaults, final ItemsConfigCategory config) {
69+
public static ConfigCategory create(final ItemsConfigCategory defaults, final ItemsConfigCategory config) {
7070
final ConfigCategory.Builder category = ConfigCategory.createBuilder();
7171
category.name(Component.translatable("animatium.category.items"));
7272

src/main/java/org/visuals/legacy/animatium/config/category/MovementConfigCategory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class MovementConfigCategory extends Category {
5353
public boolean legacyDamageTilt = true;
5454
public boolean offsetHurtTime = true;
5555

56-
public static ConfigCategory setup(final MovementConfigCategory defaults, final MovementConfigCategory config) {
56+
public static ConfigCategory create(final MovementConfigCategory defaults, final MovementConfigCategory config) {
5757
final ConfigCategory.Builder category = ConfigCategory.createBuilder();
5858
category.name(Component.translatable("animatium.category.movement"));
5959

src/main/java/org/visuals/legacy/animatium/config/category/OtherConfigCategory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class OtherConfigCategory extends Category {
5757
public boolean flameOffset = true;
5858
public boolean disableRandomBlockRotations = true;
5959

60-
public static ConfigCategory setup(final OtherConfigCategory defaults, final OtherConfigCategory config) {
60+
public static ConfigCategory create(final OtherConfigCategory defaults, final OtherConfigCategory config) {
6161
final ConfigCategory.Builder category = ConfigCategory.createBuilder();
6262
category.name(Component.translatable("animatium.category.other"));
6363

src/main/java/org/visuals/legacy/animatium/config/category/ScreenConfigCategory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class ScreenConfigCategory extends Category {
4747
public boolean panoramaRendering = true;
4848
public CameraVersion cameraVersion = CameraVersion.V1_8;
4949

50-
public static ConfigCategory setup(final ScreenConfigCategory defaults, final ScreenConfigCategory config) {
50+
public static ConfigCategory create(final ScreenConfigCategory defaults, final ScreenConfigCategory config) {
5151
final ConfigCategory.Builder category = ConfigCategory.createBuilder();
5252
category.name(Component.translatable("animatium.category.screen"));
5353
category.option(booleanOption("crosshairInThirdPerson", defaults, config));

src/main/java/org/visuals/legacy/animatium/screens/OnboardingScreen.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,27 @@
2525

2626
package org.visuals.legacy.animatium.screens;
2727

28+
import net.minecraft.ChatFormatting;
2829
import net.minecraft.client.gui.GuiGraphics;
2930
import net.minecraft.client.gui.components.Button;
31+
import net.minecraft.client.gui.components.Tooltip;
3032
import net.minecraft.client.gui.screens.Screen;
3133
import net.minecraft.client.input.MouseButtonEvent;
3234
import net.minecraft.network.chat.CommonComponents;
3335
import net.minecraft.network.chat.Component;
3436
import net.minecraft.util.ARGB;
3537
import org.visuals.legacy.animatium.config.AnimatiumConfig;
36-
import org.visuals.legacy.animatium.util.rendering.RenderUtils;
3738
import org.visuals.legacy.animatium.util.config.ConfigUtil;
3839
import org.visuals.legacy.animatium.util.config.Version;
40+
import org.visuals.legacy.animatium.util.rendering.RenderUtils;
3941

4042
public class OnboardingScreen extends Screen {
4143
private final Screen original;
4244
private Version version = Version.MODERN;
4345

4446
private Button v1_7Button = null;
4547
private Button v1_8Button = null;
46-
// private Button v1_12Button = null;
48+
private Button v1_12Button = null;
4749
private Button modernButton = null;
4850

4951
public OnboardingScreen(Screen original) {
@@ -70,9 +72,9 @@ protected void init() {
7072
this.v1_8Button = this.addRenderableWidget(Button.builder(Component.literal("1.8"), button -> this.version = Version.V1_8)
7173
.bounds((this.width / 2) - (buttonWidth / 2), this.height / 2, buttonWidth, Button.DEFAULT_HEIGHT)
7274
.build());
73-
// this.v1_12Button = this.addRenderableWidget(Button.builder(Component.literal("1.12"), button -> this.version = Version.V1_12)
74-
// .bounds((this.width / 2) - (buttonWidth / 2), this.height / 2, buttonWidth, Button.DEFAULT_HEIGHT)
75-
// .build());
75+
this.v1_12Button = Button.builder(Component.literal("1.12"), button -> this.version = Version.V1_12)
76+
.bounds((this.width / 2) - (buttonWidth / 2), this.height / 2, buttonWidth, Button.DEFAULT_HEIGHT)
77+
.build();
7678
this.modernButton = this.addRenderableWidget(Button.builder(Component.literal("Modern"), button -> this.version = Version.MODERN)
7779
.bounds(((this.width / 2) - (buttonWidth / 2) + (buttonWidth + Button.DEFAULT_SPACING)), this.height / 2, buttonWidth, Button.DEFAULT_HEIGHT)
7880
.build());
@@ -83,7 +85,7 @@ protected void init() {
8385
this.version.apply(AnimatiumConfig.instance());
8486
AnimatiumConfig.save();
8587
this.minecraft.setScreen(this.original);
86-
}).pos((this.width / 2) - (Button.DEFAULT_WIDTH / 2), (int) (this.height / 1.2F)).build());
88+
}).pos((this.width / 2) - (Button.DEFAULT_WIDTH / 2), (int) (this.height / 1.2F)).tooltip(Tooltip.create(Component.literal("WARNING! THIS WILL RESET ALL YOUR SETTINGS").withStyle(ChatFormatting.RED))).build());
8789
}
8890

8991
@Override
@@ -133,8 +135,8 @@ private void updateVersionButtonState() {
133135
this.v1_8Button.active = this.version != Version.V1_8;
134136
updateVersionButtonMessage(this.v1_8Button);
135137

136-
// this.v1_12.active = this.version != Version.V1_12;
137-
// updateVersionButtonMessage(this.v1_12Button);
138+
this.v1_12Button.active = this.version != Version.V1_12;
139+
updateVersionButtonMessage(this.v1_12Button);
138140

139141
this.modernButton.active = this.version != Version.MODERN;
140142
updateVersionButtonMessage(this.modernButton);

0 commit comments

Comments
 (0)