Skip to content

Commit 9f448d0

Browse files
moehreagmoehreag
authored
3.1.3 (#144)
Changelog: - Fix a few bugs - Update to 1.21.5, drop 1.21.4 - Add Tablist background customization (closes #120)
2 parents 9c81f85 + 7b22b1d commit 9f448d0

File tree

247 files changed

+323
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+323
-201
lines changed

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@ jobs:
3333
- name: Build
3434
run: ./gradlew build collectBuilds
3535

36+
- name: Generate Version Changelog
37+
run: ./gradlew generateVersionChangelog
38+
3639
- name: Release
3740
uses: Kira-NT/[email protected]
3841
with:
3942
github-token: "${{ secrets.GITHUB_TOKEN }}"
40-
changelog-file: "CHANGELOG.md"
43+
changelog-file: "build/changelog"
4144
files: builds/*.jar

‎1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/PlayerListHudMixin.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
2828
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
29+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
2930
import com.mojang.authlib.GameProfile;
3031
import com.mojang.blaze3d.systems.RenderSystem;
3132
import io.github.axolotlclient.AxolotlClient;
@@ -284,4 +285,22 @@ private Text nickHider(PlayerListEntry entry, Operation<Text> original) {
284285
this.footer = BedwarsMod.getInstance().getGame().get().getBottomBarText();
285286
ci.cancel();
286287
}
288+
289+
@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/PlayerListHud;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), slice = @Slice(to = @At(value = "INVOKE", target = "Lnet/minecraft/client/options/GameOptions;getTextBackgroundColor(I)I")))
290+
private void modifyBackground(MatrixStack stack, int x1, int y1, int x2, int y2, int color, Operation<Void> original) {
291+
var tablist = Tablist.getInstance();
292+
if (!tablist.backgroundEnabled.get()) {
293+
return;
294+
}
295+
if (tablist.customBackgroundColor.get()) {
296+
original.call(stack, x1, y1, x2, y2, tablist.backgroundColor.get().toInt());
297+
return;
298+
}
299+
original.call(stack, x1, y1, x2, y2, color);
300+
}
301+
302+
@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/PlayerListHud;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/PlayerListHud;renderLatencyIcon(Lnet/minecraft/client/util/math/MatrixStack;IIILnet/minecraft/client/network/PlayerListEntry;)V")))
303+
private void modifyBackground$2(MatrixStack stack, int x1, int y1, int x2, int y2, int color, Operation<Void> original) {
304+
modifyBackground(stack, x1, y1, x2, y2, color, original);
305+
}
287306
}

‎1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,10 @@ public void onScoreboardRender(ScoreboardRenderEvent event) {
401401
while (this.seconds % 60 != target) {
402402
updateClock();
403403
}
404-
topBarText = new LiteralText(calculateTopBarText());
405-
bottomBarText = new LiteralText(calculateBottomBarText());
404+
if (me != null) {
405+
topBarText = new LiteralText(calculateTopBarText());
406+
bottomBarText = new LiteralText(calculateBottomBarText());
407+
}
406408
}
407409
}
408410

‎1.16_combat-6/src/main/java/io/github/axolotlclient/modules/tablist/Tablist.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,16 @@ public class Tablist extends AbstractModule {
5050
private final ColorOption pingColor4 = new ColorOption("pingColor4", Color.parse("#FFFF8800"));
5151
private final ColorOption pingColor5 = new ColorOption("pingColor5", Color.parse("#FFFF0000"));
5252
private final BooleanOption shadow = new BooleanOption("shadow", true);
53+
public final BooleanOption backgroundEnabled = new BooleanOption("enable_background", true);
54+
public final BooleanOption customBackgroundColor = new BooleanOption("custom_background_color", false);
55+
public final ColorOption backgroundColor = new ColorOption("bgcolor", new Color(Integer.MIN_VALUE));
5356
private final OptionCategory tablist = OptionCategory.create("tablist");
5457

5558
@Override
5659
public void init() {
5760
tablist.add(numericalPing, showPlayerHeads, shadow, showHeader, showFooter, alwaysShowHeadLayer);
5861
tablist.add(pingColor0, pingColor1, pingColor2, pingColor3, pingColor4, pingColor5);
62+
tablist.add(backgroundEnabled, customBackgroundColor, backgroundColor);
5963

6064
AxolotlClient.CONFIG.rendering.add(tablist);
6165
}

‎1.20/src/main/java/io/github/axolotlclient/mixin/PlayerListHudMixin.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
2929
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
30+
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
3031
import com.llamalad7.mixinextras.sugar.Local;
3132
import com.mojang.authlib.GameProfile;
3233
import com.mojang.blaze3d.systems.RenderSystem;
@@ -277,4 +278,22 @@ private Text nickHider(PlayerListEntry entry, Operation<Text> original) {
277278
this.footer = BedwarsMod.getInstance().getGame().get().getBottomBarText();
278279
ci.cancel();
279280
}
281+
282+
@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;fill(IIIII)V"), slice = @Slice(to = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/GameOptions;getTextBackgroundColor(I)I")))
283+
private void modifyBackground(GuiGraphics instance, int x1, int y1, int x2, int y2, int color, Operation<Void> original) {
284+
var tablist = Tablist.getInstance();
285+
if (!tablist.backgroundEnabled.get()) {
286+
return;
287+
}
288+
if (tablist.customBackgroundColor.get()) {
289+
original.call(instance, x1, y1, x2, y2, tablist.backgroundColor.get().toInt());
290+
return;
291+
}
292+
original.call(instance, x1, y1, x2, y2, color);
293+
}
294+
295+
@WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;fill(IIIII)V"), slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/PlayerListHud;renderLatencyIcon(Lnet/minecraft/client/gui/GuiGraphics;IIILnet/minecraft/client/network/PlayerListEntry;)V")))
296+
private void modifyBackground$2(GuiGraphics instance, int x1, int y1, int x2, int y2, int color, Operation<Void> original) {
297+
modifyBackground(instance, x1, y1, x2, y2, color, original);
298+
}
280299
}

‎1.20/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/BedwarsGame.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,8 +400,10 @@ public void onScoreboardRender(ScoreboardRenderEvent event) {
400400
while (this.seconds % 60 != target) {
401401
updateClock();
402402
}
403-
topBarText = Text.literal(calculateTopBarText());
404-
bottomBarText = Text.literal(calculateBottomBarText());
403+
if (me != null) {
404+
topBarText = Text.literal(calculateTopBarText());
405+
bottomBarText = Text.literal(calculateBottomBarText());
406+
}
405407
}
406408
}
407409

‎1.20/src/main/java/io/github/axolotlclient/modules/tablist/Tablist.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,16 @@ public class Tablist extends AbstractModule {
5050
private final ColorOption pingColor4 = new ColorOption("pingColor4", Color.parse("#FFFF8800"));
5151
private final ColorOption pingColor5 = new ColorOption("pingColor5", Color.parse("#FFFF0000"));
5252
private final BooleanOption shadow = new BooleanOption("shadow", true);
53+
public final BooleanOption backgroundEnabled = new BooleanOption("enable_background", true);
54+
public final BooleanOption customBackgroundColor = new BooleanOption("custom_background_color", false);
55+
public final ColorOption backgroundColor = new ColorOption("bgcolor", new Color(Integer.MIN_VALUE));
5356
private final OptionCategory tablist = OptionCategory.create("tablist");
5457

5558
@Override
5659
public void init() {
5760
tablist.add(numericalPing, showPlayerHeads, shadow, showHeader, showFooter, alwaysShowHeadLayer);
5861
tablist.add(pingColor0, pingColor1, pingColor2, pingColor3, pingColor4, pingColor5);
62+
tablist.add(backgroundEnabled, customBackgroundColor, backgroundColor);
5963

6064
AxolotlClient.CONFIG.rendering.add(tablist);
6165
}

‎1.21.4/src/main/resources/assets/axolotlclient/post_effect/motion_blur.json‎

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

‎1.21.4/src/main/resources/assets/axolotlclient/shaders/post/motion_blur.json‎

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

‎1.21.4/build.gradle.kts‎ renamed to ‎1.21.5/build.gradle.kts‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@ plugins {
55
id("io.github.p03w.machete")
66
}
77

8+
val minecraft = "1.21.5"
9+
val minecraftFriendly = minecraft
10+
val parchmentMinecraft = "1.21.4"
11+
val parchment = "2025.03.23"
12+
val modmenu = "14.0.0-rc.1"
13+
val fapi = "0.119.5"
814
group = project.property("maven_group") as String
9-
version = "${project.property("version")}+${project.property("minecraft_1214")}"
15+
version = "${project.property("version")}+$minecraftFriendly"
1016
base.archivesName = "AxolotlClient"
1117

1218
loom {
@@ -27,26 +33,26 @@ repositories {
2733
}
2834

2935
dependencies {
30-
minecraft("com.mojang:minecraft:${project.property("minecraft_1214")}")
36+
minecraft("com.mojang:minecraft:$minecraft")
3137
mappings(loom.layered {
3238
officialMojangMappings {
3339
nameSyntheticMembers = true
3440
}
35-
parchment("org.parchmentmc.data:parchment-1.21.4:2024.12.29@zip")
41+
parchment("org.parchmentmc.data:parchment-$parchmentMinecraft:$parchment@zip")
3642
})
3743

3844
modImplementation("net.fabricmc:fabric-loader:${project.property("fabric_loader")}")
3945

40-
modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fapi_1214")}+${project.property("minecraft_1214")}")
46+
modImplementation("net.fabricmc.fabric-api:fabric-api:$fapi+$minecraftFriendly")
4147

42-
modImplementation("io.github.axolotlclient:AxolotlClient-config:${project.property("config")}+${project.property("minecraft_1214")}") {
48+
modImplementation("io.github.axolotlclient:AxolotlClient-config:${project.property("config")}+$minecraftFriendly") {
4349
exclude(group = "com.terraformersmc")
4450
exclude(group = "org.lwjgl")
4551
}
46-
include("io.github.axolotlclient:AxolotlClient-config:${project.property("config")}+${project.property("minecraft_1214")}")
52+
include("io.github.axolotlclient:AxolotlClient-config:${project.property("config")}+$minecraftFriendly")
4753
modImplementation("io.github.axolotlclient.AxolotlClient-config:AxolotlClientConfig-common:${project.property("config")}")
4854

49-
modImplementation("com.terraformersmc:modmenu:13.0.0-beta.1")
55+
modImplementation("com.terraformersmc:modmenu:$modmenu")
5056

5157
implementation(include(project(path = ":common", configuration = "shadow"))!!)
5258

0 commit comments

Comments
 (0)