Skip to content

Commit 16f052a

Browse files
moehreagmoehreag
committed
port to 1.19.3-rc1
- now uses the new KeyBindOption since QFAPI doesn't exist for this version (yet), also now only depends on **3** qsl modules, of which 2 are required by the config lib: client commands, lifecycle events and resource loader. - added some things for the PackDisplayHud - since there is no ModMenu release, a dummy jar is added just to compile against. It has no other functionality.
1 parent 897e6fb commit 16f052a

30 files changed

+228
-207
lines changed

‎build.gradle‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ plugins {
77
}
88

99
archivesBaseName = project.archives_base_name
10-
version = project.version
10+
version = project.version+"+"+project.minecraft_version
1111
group = project.maven_group
1212

1313
repositories {
1414
maven {
1515
url "https://moehreag.duckdns.org/maven/releases"
1616
}
17+
maven {
18+
url "https://moehreag.duckdns.org/maven/snapshots"
19+
}
1720

1821
maven {
1922
url 'https://repo.hypixel.net/repository/Hypixel/'
@@ -37,11 +40,17 @@ dependencies {
3740
mappings "org.quiltmc:quilt-mappings:${minecraft_version}+build.${quilt_mappings}:intermediary-v2"
3841

3942
modImplementation "org.quiltmc:quilt-loader:${project.loader_version}"
40-
modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quilted_fabric_api_version}"
43+
//modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quilted_fabric_api_version}"
44+
45+
//modImplementation "org.quiltmc:qsl:${qsl_version}+${minecraft_version}"
46+
47+
modImplementation "org.quiltmc.qsl.core:resource_loader:${qsl_version}+${minecraft_version}"
4148

4249
modImplementation include("io.github.axolotlclient:AxolotlClient-config:${project.config_version}+${project.minecraft_version}")
4350

44-
modImplementation "com.terraformersmc:modmenu:4.0.5"
51+
modImplementation files("modmenuDummy.jar")
52+
53+
//modImplementation "com.terraformersmc:modmenu:4.0.5"
4554

4655
include( implementation('com.github.JnCrMx:discord-game-sdk4j:0.5.5'))
4756

‎gradle.properties‎

Lines changed: 6 additions & 6 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.2
7-
quilt_mappings = 21
8-
loader_version = 0.17.6
6+
minecraft_version = 1.19.3-rc1
7+
quilt_mappings = 1
8+
loader_version = 0.18.1-beta.19
99

1010
# Quilted Fabric API
11-
quilted_fabric_api_version = 4.0.0-beta.19+0.64.0-1.19.2
11+
qsl_version = 4.0.0-alpha.4
1212

1313
# AxolotlClientConfig
14-
config_version = 1.0.13
14+
config_version = 1.0.14-beta.11
1515

1616
# Mod Properties
17-
version = 2.2.5+1.19.2
17+
version = 2.2.5
1818
maven_group = io.github.axolotlclient
1919
archives_base_name = AxolotlClient

‎modmenuDummy.jar‎

3.4 KB
Binary file not shown.

‎src/main/java/io/github/axolotlclient/config/screen/CreditsScreen.java‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import io.github.axolotlclient.AxolotlClient;
2828
import io.github.axolotlclient.AxolotlclientConfig.Color;
2929
import io.github.axolotlclient.modules.hud.util.DrawUtil;
30-
import io.github.axolotlclient.modules.hud.util.Rectangle;
3130
import io.github.axolotlclient.util.Util;
3231
import net.minecraft.client.MinecraftClient;
3332
import net.minecraft.client.gui.Element;
@@ -44,6 +43,7 @@
4443
import net.minecraft.client.util.math.MatrixStack;
4544
import net.minecraft.sound.SoundEvents;
4645
import net.minecraft.text.ClickEvent;
46+
import net.minecraft.text.ScreenTexts;
4747
import net.minecraft.text.Style;
4848
import net.minecraft.text.Text;
4949
import net.minecraft.util.Formatting;
@@ -153,26 +153,24 @@ public void init() {
153153
creditsList = new CreditsList(client, width, height, 50, height - 50, 25);
154154
addSelectableChild(creditsList);
155155

156-
this.addDrawableChild(
157-
new ButtonWidget(width / 2 - 75, height - 50 + 22, 150, 20, Text.translatable("back"), buttonWidget -> {
158-
if (creditOverlay == null) {
159-
MinecraftClient.getInstance().setScreen(parent);
160-
stopBGM();
161-
} else {
162-
creditOverlay = null;
163-
}
164-
}));
165-
166-
this.addDrawableChild(new ButtonWidget(6, this.height - 26, 100, 20,
167-
Text.translatable("creditsBGM").append(": ").append(
168-
Text.translatable(AxolotlClient.CONFIG.creditsBGM.get() ? "options.on" : "options.off")),
156+
this.addDrawableChild(new ButtonWidget.Builder(ScreenTexts.BACK, buttonWidget -> {
157+
if (creditOverlay == null) {
158+
MinecraftClient.getInstance().setScreen(parent);
159+
stopBGM();
160+
} else {
161+
creditOverlay = null;
162+
}
163+
}).positionAndSize(width / 2 - 75, height - 50 + 22, 150, 20).build());
164+
165+
this.addDrawableChild(new ButtonWidget.Builder(Text.translatable("creditsBGM").append(": ")
166+
.append(Text.translatable(AxolotlClient.CONFIG.creditsBGM.get() ? "options.on" : "options.off")),
169167
buttonWidget -> {
170168
AxolotlClient.CONFIG.creditsBGM.toggle();
171169
AxolotlClient.configManager.save();
172170
stopBGM();
173171
buttonWidget.setMessage(Text.translatable("creditsBGM").append(": ").append(
174172
Text.translatable(AxolotlClient.CONFIG.creditsBGM.get() ? "options.on" : "options.off")));
175-
}));
173+
}).positionAndSize(6, this.height - 26, 100, 20).build());
176174
}
177175

178176
private void initCredits() {
@@ -281,7 +279,7 @@ private class Credit extends ElementListWidget.Entry<Credit> {
281279
public Credit(String name, String... things) {
282280
this.name = name;
283281
this.things = things;
284-
c = new ButtonWidget(-2, -2, 1, 1, Text.of(name), buttonWidget -> creditOverlay = new Overlay(this));
282+
c = ButtonWidget.builder(Text.of(name), buttonWidget -> creditOverlay = new Overlay(this)).positionAndSize(-2, -2, 1, 1).build();
285283
}
286284

287285
@Override

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import net.minecraft.client.MinecraftClient;
2727
import net.minecraft.client.gui.screen.ConnectScreen;
2828
import net.minecraft.client.network.ServerAddress;
29+
import net.minecraft.client.network.ServerInfo;
2930
import org.spongepowered.asm.mixin.Mixin;
3031
import org.spongepowered.asm.mixin.injection.At;
3132
import org.spongepowered.asm.mixin.injection.Inject;
@@ -34,8 +35,9 @@
3435
@Mixin(ConnectScreen.class)
3536
public abstract class ConnectScreenMixin {
3637

37-
@Inject(method = "connect(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/network/ServerAddress;)V", at = @At("HEAD"))
38-
private void onServerJoin(MinecraftClient client, ServerAddress address, CallbackInfo ci) {
38+
@Inject(method = "connect(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/client/network/ServerAddress;Lnet/minecraft/client/network/ServerInfo;)V",
39+
at = @At(value = "INVOKE", target = "Ljava/lang/Thread;start()V", shift = At.Shift.AFTER))
40+
private void onServerJoin(MinecraftClient client, ServerAddress address, ServerInfo serverInfo, CallbackInfo ci) {
3941
FeatureDisabler.onServerJoin(address.getAddress());
4042
}
4143
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import net.minecraft.client.util.math.MatrixStack;
3434
import net.minecraft.entity.Entity;
3535
import net.minecraft.text.Text;
36-
import net.minecraft.util.math.Matrix4f;
36+
import org.joml.Matrix4f;
3737
import org.spongepowered.asm.mixin.Mixin;
3838
import org.spongepowered.asm.mixin.injection.At;
3939
import org.spongepowered.asm.mixin.injection.Inject;
@@ -43,14 +43,14 @@
4343
@Mixin(EntityRenderer.class)
4444
public abstract class EntityRendererMixin<T extends Entity> {
4545

46-
@Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLnet/minecraft/util/math/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I", ordinal = 0))
46+
@Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;m_mrvofiwb(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I", ordinal = 0))
4747
public void addBadges(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
4848
CallbackInfo ci) {
4949
if (entity instanceof AbstractClientPlayerEntity && text.getString().contains(entity.getName().getString()))
5050
AxolotlClient.addBadge(entity, matrices);
5151
}
5252

53-
@ModifyArg(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLnet/minecraft/util/math/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I"), index = 8)
53+
@ModifyArg(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;m_mrvofiwb(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I"), index = 8)
5454
public int bgColor(int color) {
5555
if (AxolotlClient.CONFIG.nametagBackground.get()) {
5656
return color;
@@ -59,12 +59,12 @@ public int bgColor(int color) {
5959
}
6060
}
6161

62-
@ModifyArg(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLnet/minecraft/util/math/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I"), index = 4)
62+
@ModifyArg(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;m_mrvofiwb(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I"), index = 4)
6363
public boolean enableShadows(boolean shadow) {
6464
return AxolotlClient.CONFIG.useShadows.get();
6565
}
6666

67-
@Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLnet/minecraft/util/math/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I", ordinal = 1))
67+
@Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/font/TextRenderer;m_mrvofiwb(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;ZII)I", ordinal = 1))
6868
public void addLevel(T entity, Text string, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
6969
CallbackInfo ci) {
7070
if (entity instanceof AbstractClientPlayerEntity) {
@@ -79,7 +79,7 @@ public void addLevel(T entity, Text string, MatrixStack matrices, VertexConsumer
7979
float y = string.getString().contains("deadmau5") ? -20 : -10;
8080

8181
Matrix4f matrix4f = matrices.peek().getModel();
82-
MinecraftClient.getInstance().textRenderer.draw(text, x, y,
82+
MinecraftClient.getInstance().textRenderer.m_etfbxupi(text, x, y,
8383
LevelHead.getInstance().textColor.get().getAsInt(), AxolotlClient.CONFIG.useShadows.get(),
8484
matrix4f, vertexConsumers, false, LevelHead.getInstance().background.get() ? 127 : 0,
8585
light);

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,24 @@
2323
package io.github.axolotlclient.mixin;
2424

2525
import io.github.axolotlclient.modules.hud.HudEditScreen;
26-
import net.minecraft.client.MinecraftClient;
2726
import net.minecraft.client.gui.screen.GameMenuScreen;
27+
import net.minecraft.client.gui.screen.Screen;
2828
import net.minecraft.client.gui.widget.ButtonWidget;
2929
import net.minecraft.text.Text;
3030
import org.spongepowered.asm.mixin.Mixin;
31+
import org.spongepowered.asm.mixin.Shadow;
3132
import org.spongepowered.asm.mixin.injection.At;
32-
import org.spongepowered.asm.mixin.injection.ModifyArgs;
33-
import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
33+
import org.spongepowered.asm.mixin.injection.Redirect;
34+
35+
import java.util.function.Supplier;
3436

3537
@Mixin(GameMenuScreen.class)
3638
public abstract class GameMenuScreenMixin {
3739

38-
@ModifyArgs(method = "initWidgets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ButtonWidget;<init>(IIIILnet/minecraft/text/Text;Lnet/minecraft/client/gui/widget/ButtonWidget$PressAction;)V", ordinal = 3))
39-
public void addClientOptionsButton(Args args) {
40-
args.set(4, Text.translatable("title_short"));
41-
args.set(5, (ButtonWidget.PressAction) (buttonWidget) -> MinecraftClient.getInstance()
42-
.setScreen(new HudEditScreen(((GameMenuScreen) (Object) this))));
40+
@Shadow protected abstract ButtonWidget m_cqzqwlun(Text text, Supplier<Screen> supplier);
41+
42+
@Redirect(method = "initWidgets", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/GameMenuScreen;m_rkfzqxdi(Lnet/minecraft/text/Text;Ljava/lang/String;)Lnet/minecraft/client/gui/widget/ButtonWidget;", ordinal = 1))
43+
private ButtonWidget addClientOptionsButton(GameMenuScreen instance, Text text, String string){
44+
return m_cqzqwlun(Text.translatable("title_short"), () -> new HudEditScreen(((GameMenuScreen) (Object) this)));
4345
}
4446
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void reload(Executor prepareExecutor, Executor applyExecutor, Completable
5252

5353
PackDisplayHud hud = (PackDisplayHud) HudManager.getInstance().get(PackDisplayHud.ID);
5454
if (hud != null) {
55-
hud.setPacks(resourcePacks);
55+
hud.update();
5656
}
5757
}
5858

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import net.minecraft.client.MinecraftClient;
2828
import net.minecraft.client.gui.screen.Screen;
2929
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
30-
import net.minecraft.item.ItemGroup;
3130
import net.minecraft.text.ClickEvent;
3231
import net.minecraft.text.Style;
3332
import org.spongepowered.asm.mixin.Mixin;
@@ -44,8 +43,7 @@ public abstract class ScreenMixin {
4443
public void modifyTooltipPosition(Args args) {
4544
if (ScrollableTooltips.getInstance().enabled.get()) {
4645
if ((MinecraftClient.getInstance().currentScreen instanceof CreativeInventoryScreen)
47-
&& ((CreativeInventoryScreen) MinecraftClient.getInstance().currentScreen)
48-
.getSelectedTab() != ItemGroup.INVENTORY.getIndex()) {
46+
&& ((CreativeInventoryScreen) MinecraftClient.getInstance().currentScreen).m_zqfbkfzl()) {
4947
return;
5048
}
5149

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ public void inMenu(int y, int spacingY, CallbackInfo ci) {
6262
}
6363
}
6464

65-
@ModifyArgs(method = "initWidgetsNormal", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/ButtonWidget;<init>(IIIILnet/minecraft/text/Text;Lnet/minecraft/client/gui/widget/ButtonWidget$PressAction;Lnet/minecraft/client/gui/widget/ButtonWidget$TooltipSupplier;)V", ordinal = 1))
65+
@ModifyArgs(method = "initWidgetsNormal",
66+
at = @At(value = "INVOKE",
67+
target = "Lnet/minecraft/client/gui/widget/ButtonWidget;builder(Lnet/minecraft/text/Text;Lnet/minecraft/client/gui/widget/ButtonWidget$PressAction;)Lnet/minecraft/client/gui/widget/ButtonWidget$Builder;", ordinal = 2))
6668
public void noRealmsbutOptionsButton(Args args) {
6769
if (!QuiltLoader.isModLoaded("modmenu")) {
68-
args.set(4, Text.translatable("config"));
69-
args.set(5, (ButtonWidget.PressAction) buttonWidget -> MinecraftClient.getInstance()
70+
args.set(0, Text.translatable("config"));
71+
args.set(1, (ButtonWidget.PressAction) buttonWidget -> MinecraftClient.getInstance()
7072
.setScreen(new HudEditScreen(this)));
7173
}
7274
}

0 commit comments

Comments
 (0)