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

Commit 35de288

Browse files
moehreagmoehreag
committed
Parity patches to 1.19
1 parent 54a8c4e commit 35de288

File tree

5 files changed

+47
-27
lines changed

5 files changed

+47
-27
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.mojang.blaze3d.platform.GlStateManager;
44
import io.github.axolotlclient.config.AxolotlClientConfig;
5+
import io.github.axolotlclient.config.Color;
56
import io.github.axolotlclient.config.ConfigManager;
67
import io.github.axolotlclient.config.options.BooleanOption;
78
import io.github.axolotlclient.config.options.OptionCategory;
@@ -11,6 +12,7 @@
1112
import io.github.axolotlclient.modules.hypixel.nickhider.NickHider;
1213
import io.github.axolotlclient.modules.motionblur.MotionBlur;
1314
import io.github.axolotlclient.modules.zoom.Zoom;
15+
import io.github.axolotlclient.util.DiscordRPC;
1416
import io.github.axolotlclient.util.Util;
1517
import net.fabricmc.api.ModInitializer;
1618
import net.fabricmc.loader.api.FabricLoader;
@@ -95,8 +97,11 @@ public static boolean isUsingClient(UUID uuid){
9597
}
9698

9799

98-
public static void TickClient(){
100+
public static void tickClient(){
99101

102+
DiscordRPC.update();
103+
Zoom.tick();
104+
Color.tickChroma();
100105
HudManager.tick();
101106
HypixelMods.getInstance().tick();
102107

‎src/main/java/io/github/axolotlclient/config/AxolotlClientConfig.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ public class AxolotlClientConfig {
2020
public final BooleanOption customSky = new BooleanOption("customSky", true);
2121
public final BooleanOption showSunMoon = new BooleanOption("showSunMoon", true);
2222
public final IntegerOption cloudHeight = new IntegerOption("cloudHeight", 128, 100, 512);
23-
public final FloatOption zoomDivisor = new FloatOption("zoomDivisor", 1F, 16F, 4F);
24-
public final FloatOption zoomSpeed = new FloatOption("zoomSpeed", 1F, 10F, 7.5F);
25-
public final BooleanOption zoomScrolling = new BooleanOption("zoomScrolling", false);
26-
public final BooleanOption decreaseSensitivity = new BooleanOption("decreaseSensitivity", true);
27-
public final BooleanOption smoothCamera = new BooleanOption("smoothCamera", false);
2823
public final BooleanOption dynamicFOV = new BooleanOption("dynamicFov", true);
2924
public final BooleanOption fullBright = new BooleanOption("fullBright", false);
3025
public final IntegerOption chromaSpeed = new IntegerOption("chromaSpeed", 20, 10, 50);
@@ -53,7 +48,6 @@ public class AxolotlClientConfig {
5348
public final OptionCategory general = new OptionCategory(new Identifier("axolotlclient", "general"), "general");
5449
public final OptionCategory nametagOptions = new OptionCategory(new Identifier("axolotlclient", "nametagOptions"), "nametagOptions");
5550
public final OptionCategory rendering = new OptionCategory(new Identifier("axolotlclient", "rendering"), "rendering");
56-
public final OptionCategory zoom = new OptionCategory("zoom");
5751
public final OptionCategory outlines= new OptionCategory("blockOutlines");
5852
public final OptionCategory motionBlur = new OptionCategory("motionBlur");
5953

@@ -85,7 +79,6 @@ public void init(){
8579
categories.add(nametagOptions);
8680
categories.add(rendering);
8781

88-
rendering.addSubCategory(zoom);
8982
rendering.addSubCategory(outlines);
9083

9184
categories.forEach(OptionCategory::clearOptions);
@@ -118,12 +111,6 @@ public void init(){
118111
motionBlur.add(motionBlurInGuis);
119112
rendering.addSubCategory(motionBlur);
120113

121-
zoom.add(zoomDivisor);
122-
zoom.add(zoomSpeed);
123-
zoom.add(zoomScrolling);
124-
zoom.add(decreaseSensitivity);
125-
zoom.add(smoothCamera);
126-
127114
outlines.add(enableCustomOutlines);
128115
outlines.add(outlineColor);
129116
outlines.add(outlineChroma);

‎src/main/java/io/github/axolotlclient/mixin/MinecraftClientMixin.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,7 @@ public void stop(CallbackInfo ci){
9898

9999
@Inject(method = "tick", at = @At("HEAD"))
100100
public void tickClient(CallbackInfo ci){
101-
Color.tickChroma();
102-
AxolotlClient.TickClient();
103-
DiscordRPC.update();
104-
Zoom.tick();
101+
AxolotlClient.tickClient();
105102
}
106103

107104

‎src/main/java/io/github/axolotlclient/modules/hud/gui/hud/PackDisplayHud.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import java.util.ArrayList;
1515
import java.util.List;
16+
import java.util.concurrent.atomic.AtomicInteger;
1617

1718
public class PackDisplayHud extends AbstractHudEntry {
1819

@@ -33,6 +34,16 @@ public void init() {
3334
} catch (Exception ignored) {
3435
}
3536
});
37+
38+
AtomicInteger w = new AtomicInteger(20);
39+
widgets.forEach(packWidget -> {
40+
int textW = MinecraftClient.getInstance().textRenderer.getStringWidth(packWidget.name)+20;
41+
if(textW>w.get())
42+
w.set(textW);
43+
});
44+
width=w.get();
45+
46+
height=widgets.size()*18;
3647
}
3748

3849
@Override
@@ -49,8 +60,8 @@ public void render() {
4960
if(outline.get()) outlineRect(getBounds(), outlineColor.get());
5061

5162
int y= pos.y+1;
52-
for(PackDisplayHud.packWidget widget:widgets){
53-
widget.render(pos.x+1, y);
63+
for(int i=widgets.size()-1;i>=0;i--){ // Badly reverse the order (I'm sure there are better ways to do this)
64+
widgets.get(i).render(pos.x+1, y);
5465
y+=18;
5566
}
5667

‎src/main/java/io/github/axolotlclient/modules/zoom/Zoom.java‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package io.github.axolotlclient.modules.zoom;
22

33
import io.github.axolotlclient.AxolotlClient;
4+
import io.github.axolotlclient.config.AxolotlClientConfig;
5+
import io.github.axolotlclient.config.options.BooleanOption;
6+
import io.github.axolotlclient.config.options.FloatOption;
7+
import io.github.axolotlclient.config.options.OptionCategory;
48
import io.github.axolotlclient.modules.AbstractModule;
59
import io.github.axolotlclient.util.Util;
610
import net.legacyfabric.fabric.api.client.keybinding.v1.KeyBindingHelper;
@@ -21,10 +25,26 @@ public class Zoom extends AbstractModule {
2125
private static float animatedFactor = 1;
2226
private static float lastReturnedFov;
2327

28+
public static final FloatOption zoomDivisor = new FloatOption("zoomDivisor", 1F, 16F, 4F);
29+
public static final FloatOption zoomSpeed = new FloatOption("zoomSpeed", 1F, 10F, 7.5F);
30+
public static final BooleanOption zoomScrolling = new BooleanOption("zoomScrolling", false);
31+
public static final BooleanOption decreaseSensitivity = new BooleanOption("decreaseSensitivity", true);
32+
public static final BooleanOption smoothCamera = new BooleanOption("smoothCamera", false);
33+
34+
public final OptionCategory zoom = new OptionCategory("zoom");
35+
2436
public static final Identifier ID = new Identifier("zoom");
2537

2638
@Override
2739
public void init() {
40+
zoom.add(zoomDivisor);
41+
zoom.add(zoomSpeed);
42+
zoom.add(zoomScrolling);
43+
zoom.add(decreaseSensitivity);
44+
zoom.add(smoothCamera);
45+
46+
AxolotlClient.CONFIG.rendering.addSubCategory(zoom);
47+
2848
keyBinding = new KeyBinding("key.zoom", 46, "category.axolotlclient");
2949
KeyBindingHelper.registerKeyBinding(keyBinding);
3050
active = false;
@@ -35,7 +55,7 @@ private static boolean keyHeld() {
3555
}
3656

3757
public static float getFov(float current, float tickDelta) {
38-
float result = current * (AxolotlClient.CONFIG.zoomSpeed.get() == 10 ? targetFactor
58+
float result = current * (zoomSpeed.get() == 10 ? targetFactor
3959
: Util.lerp(lastAnimatedFactor, animatedFactor, tickDelta));
4060

4161
if (lastReturnedFov != 0 && lastReturnedFov != result) {
@@ -49,7 +69,7 @@ public static float getFov(float current, float tickDelta) {
4969
public static void setOptions() {
5070
originalSensitivity = MinecraftClient.getInstance().options.sensitivity;
5171

52-
if (AxolotlClient.CONFIG.smoothCamera.get()) {
72+
if (smoothCamera.get()) {
5373
originalSmoothCamera = MinecraftClient.getInstance().options.smoothCameraEnabled;
5474
MinecraftClient.getInstance().options.smoothCameraEnabled = true;
5575
}
@@ -58,7 +78,7 @@ public static void setOptions() {
5878
}
5979

6080
private static void updateSensitivity() {
61-
if (AxolotlClient.CONFIG.decreaseSensitivity.get()) {
81+
if (decreaseSensitivity.get()) {
6282
MinecraftClient.getInstance().options.sensitivity = originalSensitivity / divisor;
6383
}
6484
}
@@ -77,8 +97,8 @@ public static void update() {
7797
}
7898

7999
public static boolean scroll(int amount) {
80-
if (active && AxolotlClient.CONFIG.zoomScrolling.get() && amount != 0) {
81-
setDivisor(Math.max(1, divisor + (amount / Math.abs(amount))));
100+
if (active && zoomScrolling.get() && amount != 0) {
101+
setDivisor(Math.max(1, divisor + (amount / (float)Math.abs(amount))));
82102
updateSensitivity();
83103
return true;
84104
}
@@ -88,7 +108,7 @@ public static boolean scroll(int amount) {
88108

89109
public static void tick() {
90110
lastAnimatedFactor = animatedFactor;
91-
animatedFactor += (targetFactor - animatedFactor) * (AxolotlClient.CONFIG.zoomSpeed.get() / 10F);
111+
animatedFactor += (targetFactor - animatedFactor) * (zoomSpeed.get() / 10F);
92112
}
93113

94114
private static boolean shouldStart() {
@@ -106,7 +126,7 @@ private static void setDivisor(float value) {
106126

107127
private static void start() {
108128
active = true;
109-
setDivisor(AxolotlClient.CONFIG.zoomDivisor.get());
129+
setDivisor(zoomDivisor.get());
110130
setOptions();
111131
}
112132

0 commit comments

Comments
 (0)