Skip to content

Commit 90896a4

Browse files
committed
Update to 1.19.1
- port of the new credits screen - text alignment option - port of other fixes
1 parent 5c1e7bd commit 90896a4

24 files changed

+352
-153
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
modImplementation "org.quiltmc:quilt-loader:${project.loader_version}"
3434
modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quilted_fabric_api_version}-${minecraft_version}"
3535

36-
modImplementation "com.terraformersmc:modmenu:4.0.0"
36+
modImplementation "com.terraformersmc:modmenu:4.0.5"
3737

3838
include( implementation('com.github.JnCrMx:discord-game-sdk4j:0.5.5'))
3939

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ org.gradle.jvmargs = -Xmx1G
33
org.gradle.parallel = true
44

55
# Dependencies
6-
minecraft_version = 1.19
6+
minecraft_version = 1.19.1
77
quilt_mappings = 1
8-
loader_version = 0.17.1-beta.6
8+
loader_version = 0.17.2-beta.1
99

1010
# QSL version number is shared between all the modules.
1111
qsl_version = 2.0.0-beta.8
1212

1313
# Quilted Fabric API
14-
quilted_fabric_api_version = 2.0.0-beta.9+0.58.0
14+
quilted_fabric_api_version = 4.0.0-beta.1+0.58.5
1515

1616
# Mod Properties
17-
version = 2.1.5+1.19
17+
version = 2.1.5+1.19.1
1818
maven_group = io.github.axolotlclient
1919
archives_base_name = AxolotlClient

run/options.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version:3105
1+
version:3117
22
quilt_available_resource_packs:["programer_art","vanilla"]
33
autoJump:false
44
autoSuggestions:true
@@ -76,7 +76,7 @@ hideBundleTutorial:false
7676
syncChunkWrites:false
7777
showAutosaveIndicator:true
7878
allowServerListing:false
79-
chatPreview:true
79+
chatPreview:1
8080
onlyShowSecureChat:false
8181
key_key.attack:key.mouse.left
8282
key_key.use:key.mouse.right
@@ -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.f
115+
key_key.modmenu.open_menu:key.keyboard.unknown
116+
key_key.freelook:key.keyboard.v
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: 8 additions & 4 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;
@@ -76,7 +77,9 @@ public void onInitializeClient(ModContainer container) {
7677
} else if (QuiltLoader.isModLoaded("baritone")) {
7778
badmod = "Baritone";
7879
} else if (QuiltLoader.isModLoaded("xaerominimap")) {
79-
badmod = "Xaero's Minimap";
80+
badmod = "Xaero's Minimap";
81+
} else if (QuiltLoader.isModLoaded("essential")){
82+
badmod = "Essential";
8083
} else {
8184
showWarning = false;
8285
}
@@ -86,14 +89,14 @@ public void onInitializeClient(ModContainer container) {
8689

8790
getModules();
8891
CONFIG.init();
89-
modules.forEach((identifier, abstractModule) -> abstractModule.init());
92+
modules.values().forEach(AbstractModule::init);
9093

9194
CONFIG.config.addAll(CONFIG.getCategories());
9295
CONFIG.config.add(config);
9396

9497
ConfigManager.load();
9598

96-
modules.forEach((identifier, abstractModule) -> abstractModule.lateInit());
99+
modules.values().forEach(AbstractModule::lateInit);
97100

98101
ResourceLoader.registerBuiltinResourcePack(new Identifier("axolotlclient", "axolotlclient-ui"), container, ResourcePackActivationType.NORMAL);
99102
ClientTickEvents.END.register(client -> tickClient());
@@ -108,6 +111,7 @@ public static void getModules(){
108111
modules.put(MotionBlur.ID, new MotionBlur());
109112
modules.put(ScrollableTooltips.ID, ScrollableTooltips.Instance);
110113
modules.put(DiscordRPC.ID, DiscordRPC.getInstance());
114+
modules.put(Freelook.ID, Freelook.INSTANCE);
111115
}
112116

113117
public static boolean isUsingClient(UUID uuid){
@@ -122,7 +126,7 @@ public static boolean isUsingClient(UUID uuid){
122126

123127
public static void tickClient(){
124128

125-
modules.forEach((identifier, abstractModule) -> abstractModule.tick());
129+
modules.values().forEach(AbstractModule::tick);
126130
Color.tickChroma();
127131

128132
if(tickTime % 20 == 0){

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ public static void load() {
6565
JsonObject config = JsonParser.parseReader(new FileReader(confPath.toString())).getAsJsonObject();
6666

6767
for(OptionCategory category:categories) {
68-
setOptions(config.get(category.getName()).getAsJsonObject(), category);
68+
if(config.has(category.getName())) {
69+
setOptions(config.get(category.getName()).getAsJsonObject(), category);
70+
}
6971
}
7072
} catch (Exception e){
7173
AxolotlClient.LOGGER.error("Failed to load config! Using default values... \nError: ");
@@ -84,8 +86,10 @@ private static void setOptions(JsonObject config, OptionCategory category){
8486
}
8587
if(!category.getSubCategories().isEmpty()){
8688
for (OptionCategory sub: category.getSubCategories()) {
87-
JsonObject subCat = config.get(sub.getName()).getAsJsonObject();
88-
setOptions(subCat, sub);
89+
if(config.has(sub.getName())) {
90+
JsonObject subCat = config.get(sub.getName()).getAsJsonObject();
91+
setOptions(subCat, sub);
92+
}
8993
}
9094
}
9195
}

src/main/java/io/github/axolotlclient/config/screen/ButtonWidgetList.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import net.minecraft.client.MinecraftClient;
2727
import net.minecraft.client.gui.DrawableHelper;
2828
import net.minecraft.client.gui.widget.ButtonListWidget;
29-
import net.minecraft.client.gui.widget.ButtonWidget;
3029
import net.minecraft.client.gui.widget.ClickableWidget;
3130
import net.minecraft.client.util.math.MatrixStack;
3231
import org.lwjgl.opengl.GL11;
@@ -121,9 +120,9 @@ public void renderTooltips(MatrixStack matrices, int mouseX, int mouseY){
121120
}
122121

123122
@Override
124-
protected void renderList(MatrixStack matrices, int x, int y, int mouseX, int mouseY, float delta) {
123+
protected void renderList(MatrixStack matrices, int x, int y, float delta) {
125124
Util.applyScissor(new Rectangle(0, top, this.width, bottom-top));
126-
super.renderList(matrices, x, y, mouseX, mouseY, delta);
125+
super.renderList(matrices, x, y, delta);
127126
GL11.glDisable(GL11.GL_SCISSOR_TEST);
128127
}
129128

0 commit comments

Comments
 (0)