Skip to content

Commit 57d6a6d

Browse files
committed
Freelook + new Credits screen
- includes code by TheKodeToad
1 parent 891aeb8 commit 57d6a6d

File tree

11 files changed

+485
-229
lines changed

11 files changed

+485
-229
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import io.github.axolotlclient.config.options.BooleanOption;
88
import io.github.axolotlclient.config.options.OptionCategory;
99
import io.github.axolotlclient.modules.AbstractModule;
10+
import io.github.axolotlclient.modules.freelook.Freelook;
1011
import io.github.axolotlclient.modules.hud.HudManager;
1112
import io.github.axolotlclient.modules.hypixel.HypixelMods;
1213
import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
@@ -111,6 +112,7 @@ public static void getModules(){
111112
modules.put(MotionBlur.ID, new MotionBlur());
112113
modules.put(ScrollableTooltips.ID, ScrollableTooltips.Instance);
113114
modules.put(DiscordRPC.ID, DiscordRPC.getInstance());
115+
modules.put(Freelook.ID, Freelook.INSTANCE);
114116
}
115117

116118
public static boolean isUsingClient(UUID uuid){

src/main/java/io/github/axolotlclient/config/ConfigManager.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,10 @@ private static void setOptions(JsonObject config, OptionCategory category){
8484
}
8585
if(!category.getSubCategories().isEmpty()){
8686
for (OptionCategory sub: category.getSubCategories()) {
87-
JsonObject subCat = config.get(sub.getName()).getAsJsonObject();
88-
setOptions(subCat, sub);
87+
if(config.has(sub.getName())) {
88+
JsonObject subCat = config.get(sub.getName()).getAsJsonObject();
89+
setOptions(subCat, sub);
90+
}
8991
}
9092
}
9193
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public OptionType getType() {
3939

4040
@Override
4141
public void setValueFromJsonElement(JsonElement element) {
42-
for(int i=0; i<values.length-1;i++){
42+
for(int i=0; i<values.length;i++){
4343
String v = values[i];
4444
if(Objects.equals(v, element.getAsString())){
4545
this.i = i;
@@ -55,7 +55,7 @@ public void setDefaults() {
5555
return;
5656
}
5757

58-
for(int i=0;i< values.length-1; i++){
58+
for(int i=0;i< values.length; i++){
5959
String v = values[i];
6060
if(Objects.equals(v, def)){
6161
this.i=i;

0 commit comments

Comments
 (0)