Skip to content

Commit adfedea

Browse files
committed
1 parent e28fcda commit adfedea

File tree

8 files changed

+33
-11
lines changed

8 files changed

+33
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public static void addBadge(Entity entity, MatrixStack matrices){
155155
entity.getUuid() == MinecraftClient.getInstance().player.getUuid()?
156156
(NickHider.Instance.hideOwnName.get() ? NickHider.Instance.hiddenNameSelf.get(): Team.modifyText(entity.getScoreboardTeam(), entity.getName()).getString()):
157157
(NickHider.Instance.hideOtherNames.get() ? NickHider.Instance.hiddenNameOthers.get(): Team.modifyText(entity.getScoreboardTeam(), entity.getName()).getString())
158-
)/2 + (AxolotlClient.CONFIG.customBadge.get() ? MinecraftClient.getInstance().textRenderer.getWidth(AxolotlClient.CONFIG.badgeText.get()): 10));
158+
)/2 + (AxolotlClient.CONFIG.customBadge.get() ? MinecraftClient.getInstance().textRenderer.getWidth(" "+AxolotlClient.CONFIG.badgeText.get()): 10));
159159

160160
RenderSystem.color4f(1, 1, 1, 1);
161161

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,13 +287,20 @@ protected void onClick(AbstractButtonWidget button, double mouseX, double mouseY
287287

288288
@Override
289289
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
290-
if(left!=null && left.keyPressed(keyCode, scanCode, modifiers)) return true;
291-
return super.keyPressed(keyCode, scanCode, modifiers);
292-
}
290+
if(left instanceof StringOptionWidget || left instanceof ColorOptionWidget){
291+
return left.keyPressed(keyCode, scanCode, modifiers);
292+
}
293+
return false;
294+
//return left != null && left.keyPressed(keyCode, scanCode, modifiers);
295+
}
293296

294297
@Override
295298
public boolean charTyped(char c, int modifiers) {
296-
return this.left != null && left.charTyped(c, modifiers);
299+
if(left instanceof StringOptionWidget || left instanceof ColorOptionWidget){
300+
return left.charTyped(c, modifiers);
301+
}
302+
return false;
303+
//return this.left != null && left.charTyped(c, modifiers);
297304
}
298305

299306
@Override

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,20 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
142142
if(isPickerOpen() && picker.keyPressed(keyCode, scanCode, modifiers)){
143143
return true;
144144
}
145-
return this.list.keyPressed(keyCode, scanCode, modifiers) || super.keyPressed(keyCode, scanCode, modifiers);
145+
146+
if (keyCode == 256 && this.shouldCloseOnEsc()) {
147+
this.onClose();
148+
return true;
149+
} else if (keyCode == 258) {
150+
boolean bl = !hasShiftDown();
151+
if (!this.changeFocus(bl)) {
152+
this.changeFocus(bl);
153+
}
154+
155+
return false;
156+
}
157+
158+
return this.list.keyPressed(keyCode, scanCode, modifiers);
146159
}
147160

148161
@Override

src/main/java/io/github/axolotlclient/config/screen/widgets/BooleanWidget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float del
5050
}
5151

5252
private void renderSwitch(MatrixStack matrixStack){
53-
int x = option.get() ? this.x + width - 9: this.x;
53+
int x = option.get() ? this.x + width - width/5: this.x;
5454
this.drawTexture(matrixStack, x, this.y, 0, 66 + (hovered ? 20:0), 4, this.height/2);
5555
this.drawTexture(matrixStack, x, this.y + height/2, 0, 86 - height/2 + (hovered ? 20:0), 4, this.height/2);
5656
this.drawTexture(matrixStack, x + 4, this.y, 200 - 4, 66 + (hovered ? 20:0), 4, this.height);

src/main/java/io/github/axolotlclient/config/screen/widgets/StringOptionWidget.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ public boolean charTyped(char chr, int modifiers) {
4545
public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
4646
this.textField.keyPressed(keyCode, scanCode, modifiers);
4747
this.option.set(textField.getText());
48-
return super.keyPressed(keyCode, scanCode, modifiers);
48+
return true;//super.keyPressed(keyCode, scanCode, modifiers);
4949
}
5050

5151
@Override
5252
public boolean charTyped(char chr, int modifiers) {
53-
return textField.charTyped(chr, modifiers) || super.charTyped(chr, modifiers);
53+
return textField.charTyped(chr, modifiers);
5454
}
5555

5656
@Override

src/main/java/io/github/axolotlclient/modules/hud/gui/AbstractHudEntry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public abstract class AbstractHudEntry extends DrawUtil {
3030
public int height;
3131

3232
protected BooleanOption enabled = new BooleanOption("enabled",false);
33-
public DoubleOption scale = new DoubleOption("scale", 1, 0.1F, 2);
33+
public DoubleOption scale = new DoubleOption("scale", 1, 0.1F, 5);
3434
protected final ColorOption textColor = new ColorOption("textColor", Color.WHITE);
3535
protected final BooleanOption chroma = new BooleanOption("chroma", false);
3636
protected BooleanOption shadow = new BooleanOption("shadow", getShadowDefault());

src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void initRPC(){
6969
CreateParams params = new CreateParams();
7070

7171
params.setClientID(875835666729152573L);
72-
params.setFlags(CreateParams.Flags.DEFAULT);
72+
params.setFlags(CreateParams.Flags.NO_REQUIRE_DISCORD);
7373

7474
DiscordEventHandler handler = new DiscordEventHandler();
7575
params.registerEventHandler(handler);

src/main/resources/assets/axolotlclient/lang/en_us.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@
162162
"showS": "Show S",
163163
"showD": "Show D",
164164
"showSpace": "Show Spacebar",
165+
"reachdisplayhud": "ReachDisplay HUD",
166+
"blocks": "Blocks",
165167

166168
"togglesprint": "ToggleModifiers",
167169
"randomPlaceholder": "Random Placeholder",

0 commit comments

Comments
 (0)