Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Commit a3b189f

Browse files
committed
scrollable Tooltips
1 parent 82e9f07 commit a3b189f

File tree

16 files changed

+210
-115
lines changed

16 files changed

+210
-115
lines changed

run/options.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ guiScale:2
3434
particles:1
3535
maxFps:260
3636
graphicsMode:1
37-
ao:1
37+
ao:2
3838
prioritizeChunkUpdates:0
3939
biomeBlendRadius:2
4040
renderClouds:"false"
@@ -112,6 +112,8 @@ key_key.hotbar.6:key.keyboard.6
112112
key_key.hotbar.7:key.keyboard.7
113113
key_key.hotbar.8:key.keyboard.8
114114
key_key.hotbar.9:key.keyboard.9
115+
key_key.dynamicfps.toggle_forced:key.keyboard.unknown
116+
key_key.dynamicfps.toggle_disabled:key.keyboard.unknown
115117
key_key.openHud:key.keyboard.right.shift
116118
key_key.toggleSprint:key.keyboard.k
117119
key_key.toggleSneak:key.keyboard.i

src/main/java/io/github/axolotlclient/AxolotlClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import io.github.axolotlclient.modules.hypixel.HypixelMods;
1212
import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
1313
import io.github.axolotlclient.modules.motionblur.MotionBlur;
14+
import io.github.axolotlclient.modules.scrollableTooltips.ScrollableTooltips;
1415
import io.github.axolotlclient.modules.zoom.Zoom;
1516
import io.github.axolotlclient.util.DiscordRPC;
1617
import io.github.axolotlclient.util.Util;
@@ -49,8 +50,6 @@ public class AxolotlClient implements ClientModInitializer {
4950
public static List<ResourcePack> packs = new ArrayList<>();
5051
public static HashMap<Identifier, Resource> runtimeResources = new HashMap<>();
5152

52-
public static boolean initalized = false;
53-
5453
public static final Identifier badgeIcon = new Identifier("axolotlclient", "textures/badge.png");
5554

5655
public static final OptionCategory config = new OptionCategory("storedOptions");
@@ -109,6 +108,7 @@ public static void getModules(){
109108
modules.put(HudManager.ID, HudManager.getINSTANCE());
110109
modules.put(HypixelMods.ID, HypixelMods.INSTANCE);
111110
modules.put(MotionBlur.ID, new MotionBlur());
111+
modules.put(ScrollableTooltips.ID, ScrollableTooltips.Instance);
112112
}
113113

114114
public static boolean isUsingClient(UUID uuid){

src/main/java/io/github/axolotlclient/Axolotlclient.java-

Lines changed: 0 additions & 97 deletions
This file was deleted.

src/main/java/io/github/axolotlclient/config/options/BooleanOption.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,20 @@
44
import com.google.gson.JsonPrimitive;
55
import org.jetbrains.annotations.NotNull;
66

7-
public class BooleanOption extends OptionBase implements Option {
7+
public class BooleanOption extends OptionBase {
88

99
private boolean option;
1010
private final boolean Default;
1111

12-
public BooleanOption(String name, boolean Default) {
13-
super(name);
12+
public BooleanOption(String name, String tooltipLocation, boolean Default) {
13+
super(name, tooltipLocation);
1414
this.Default = Default;
1515
}
1616

17+
public BooleanOption(String name, boolean Default) {
18+
this(name, null, Default);
19+
}
20+
1721
public boolean get(){
1822
return option;
1923
}

src/main/java/io/github/axolotlclient/config/options/ColorOption.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ public ColorOption(String name, String def){
1414
this(name, Color.parse(def));
1515
}
1616

17-
public ColorOption(String name, Color def){
17+
public ColorOption(String name, String tooltipLocation, Color def){
1818
super(name);
1919
this.def=def;
2020
}
2121

22+
public ColorOption(String name, Color def){
23+
this(name, null, def);
24+
}
25+
2226
public Color get(){
2327
return value;
2428
}

src/main/java/io/github/axolotlclient/config/options/DoubleOption.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ public class DoubleOption extends OptionBase implements Option {
1111
private final double min;
1212
private final double max;
1313

14-
public DoubleOption(String name, double Default, double min, double max) {
15-
super(name);
14+
public DoubleOption(String name, String tooltipLocation, double Default, double min, double max) {
15+
super(name, tooltipLocation);
1616
this.Default=Default;
1717
this.min=min;
1818
this.max=max;
1919
}
2020

21+
public DoubleOption(String name, double Default, double min, double max) {
22+
this(name, null, Default, min, max);
23+
}
24+
2125
public double get(){
2226
return option;
2327
}

src/main/java/io/github/axolotlclient/config/options/FloatOption.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@ public class FloatOption extends OptionBase implements Option{
1111
float def;
1212
float option;
1313

14-
public FloatOption(String name, Float min, Float max, Float def) {
15-
super(name);
14+
public FloatOption(String name, String tooltipLocation, Float def, Float min, Float max) {
15+
super(name, tooltipLocation);
1616
this.min=min;
1717
this.max=max;
1818
this.def=def;
1919
}
2020

21+
public FloatOption(String name, Float min, Float max, Float def) {
22+
this(name, null, def, min, max);
23+
}
24+
2125
public float get(){
2226
return option;
2327
}

src/main/java/io/github/axolotlclient/config/options/IntegerOption.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ public class IntegerOption extends OptionBase implements Option{
1212
private final int max;
1313

1414
public IntegerOption(String name, int Default, int min, int max) {
15-
super(name);
15+
this(name, null, Default, min, max);
16+
}
17+
18+
public IntegerOption(String name, String tooltipLocation, int Default, int min, int max) {
19+
super(name, tooltipLocation);
1620
this.Default=Default;
1721
this.min=min;
1822
this.max=max;

src/main/java/io/github/axolotlclient/config/options/OptionBase.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
11
package io.github.axolotlclient.config.options;
22

3+
import net.minecraft.text.Text;
4+
import org.jetbrains.annotations.Nullable;
5+
36
public abstract class OptionBase implements Option {
7+
48
public String name;
9+
public String tooltipKeyPrefix;
10+
511
public OptionBase(String name){
612
this.name=name;
713
}
814

15+
public OptionBase(String name, String tooltipKeyPrefix){
16+
this.name = name;
17+
this.tooltipKeyPrefix = tooltipKeyPrefix;
18+
}
19+
20+
@Override
21+
public @Nullable Text getTooltip() {
22+
return Option.super.getTooltip(tooltipKeyPrefix);
23+
}
24+
925
public String getName(){
1026
return name;
1127
}

src/main/java/io/github/axolotlclient/config/options/StringOption.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ public class StringOption extends OptionBase implements Option{
99
private String value;
1010
private final String def;
1111

12-
public StringOption(String name, String def){
13-
super(name);
12+
public StringOption(String name, String tooltipLocation, String def){
13+
super(name, tooltipLocation);
1414
this.def = def;
1515
}
1616

17+
public StringOption(String name, String def){
18+
this(name, null, def);
19+
}
20+
1721
public String get(){
1822
return value;
1923
}

0 commit comments

Comments
 (0)