update rpc library

moehreag · moehreag · commit f19acc65b2e6 · 2025-11-18T09:31:46.000+01:00
- fix multiple bugs
- update BridgeVersion
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java b/1.20/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java
@@ -67,7 +67,7 @@ protected void createRichPresence() {
 			details = "";
 		}
 
-		setRichPresence(createRichPresence(AxolotlClient.VERSION, state, details));
+		setRichPresence(createRichPresence(state, details));
 	}
 
 	public void init() {
diff --git a/1.21/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java b/1.21/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java
@@ -67,7 +67,7 @@ protected void createRichPresence() {
 			details = "";
 		}
 
-		setRichPresence(createRichPresence(AxolotlClient.VERSION, state, details));
+		setRichPresence(createRichPresence(state, details));
 	}
 
 	public void init() {
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/EntityRendererMixin.java
@@ -46,7 +46,6 @@
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(EntityRenderer.class)
@@ -125,10 +124,10 @@ public abstract class EntityRendererMixin<T extends Entity> {
 			AxolotlClient.config().useShadows.get());
 	}
 
-	@Redirect(method = "renderNameTag(Lnet/minecraft/entity/Entity;Ljava/lang/String;DDDI)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/BufferBuilder;vertex(DDD)Lcom/mojang/blaze3d/vertex/BufferBuilder;"))
-	public BufferBuilder axolotlclient$noBg(BufferBuilder instance, double d, double e, double f) {
+	@WrapOperation(method = "renderNameTag(Lnet/minecraft/entity/Entity;Ljava/lang/String;DDDI)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/BufferBuilder;vertex(DDD)Lcom/mojang/blaze3d/vertex/BufferBuilder;"))
+	public BufferBuilder axolotlclient$noBg(BufferBuilder instance, double d, double e, double f, Operation<BufferBuilder> original) {
 		if (AxolotlClient.config().nametagBackground.get()) {
-			instance.vertex(d, e, f);
+			original.call(instance, d, e, f);
 		}
 		return instance;
 	}
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/LivingEntityRendererMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/LivingEntityRendererMixin.java
@@ -25,6 +25,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.vertex.BufferBuilder;
 import io.github.axolotlclient.AxolotlClient;
 import io.github.axolotlclient.modules.freelook.Perspective;
 import io.github.axolotlclient.modules.hud.gui.hud.PlayerHud;
@@ -37,10 +38,7 @@
 import net.minecraft.entity.living.LivingEntity;
 import net.minecraft.text.Text;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Constant;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -81,6 +79,14 @@ protected LivingEntityRendererMixin(EntityRenderDispatcher entityRenderDispatche
 		return orig;
 	}
 
+	@WrapOperation(method = "renderNameTag(Lnet/minecraft/entity/living/LivingEntity;DDD)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/BufferBuilder;vertex(DDD)Lcom/mojang/blaze3d/vertex/BufferBuilder;"))
+	public BufferBuilder axolotlclient$noBg(BufferBuilder instance, double d, double e, double f, Operation<BufferBuilder> original) {
+		if (AxolotlClient.config().nametagBackground.get()) {
+			original.call(instance, d, e, f);
+		}
+		return instance;
+	}
+
 	@ModifyConstant(method = "setupOverlayColor(Lnet/minecraft/entity/living/LivingEntity;FZ)Z", constant = @Constant(floatValue = 1.0f, ordinal = 0))
 	private float axolotlclient$customHitColorRed(float constant) {
 		return AxolotlClient.config().hitColor.get().getRed() / 255F;
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/mixin/MinecraftClientMixin.java b/1.8.9/src/main/java/io/github/axolotlclient/mixin/MinecraftClientMixin.java
@@ -173,7 +173,7 @@ protected MinecraftClientMixin(TextureManager textureManager) {
 		}
 	}
 
-	@Inject(method = "updateWindow", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;onResolutionChanged(II)V"))
+	@Inject(method = "onResolutionChanged()V", at = @At(value = "TAIL"))
 	public void axolotlclient$onResize(CallbackInfo ci) {
 		Util.window = null;
 		HudManager.getInstance().refreshAllBounds();
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java
@@ -69,7 +69,7 @@ protected void createRichPresence() {
 			details = "";
 		}
 
-		setRichPresence(createRichPresence(AxolotlClient.VERSION, state, details));
+		setRichPresence(createRichPresence(state, details));
 	}
 
 	public void init() {
diff --git a/1.latest/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java b/1.latest/src/main/java/io/github/axolotlclient/modules/rpc/DiscordRPC.java
@@ -67,7 +67,7 @@ protected void createRichPresence() {
 			details = "";
 		}
 
-		setRichPresence(createRichPresence(AxolotlClient.VERSION, state, details));
+		setRichPresence(createRichPresence(state, details));
 	}
 
 	public void init() {
diff --git a/1.latest/src/main/resources/fabric.mod.json b/1.latest/src/main/resources/fabric.mod.json
@@ -39,7 +39,7 @@
 		"axolotlclient.e4mc.mixins.json"
 	],
 	"custom": {
-		"axolotlclient:bridge_impl_version": "V1_21_8",
+		"axolotlclient:bridge_impl_version": "V1_21_10",
 		"loom:injected_interfaces": {
 			"net/minecraft/class_2960": [
 				"io/github/axolotlclient/bridge/util/AxoIdentifier"
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
 	testRuntimeOnly(compileOnly("org.lwjgl:lwjgl-tinyfd:3.2.2")!!)
 	testRuntimeOnly(compileOnly("org.lwjgl:lwjgl-sdl:3.4.0-SNAPSHOT")!!)
 
-	shadow(implementation("io.github.CDAGaming:DiscordIPC:0.10.2") {
+	shadow(implementation("io.github.cdagaming:DiscordIPC:0.11.0") {
 		isTransitive = false
 	})
 	shadow(implementation("com.kohlschutter.junixsocket:junixsocket-common:2.10.1")!!)
diff --git a/common/src/main/java/io/github/axolotlclient/bridge/BridgeVersion.java b/common/src/main/java/io/github/axolotlclient/bridge/BridgeVersion.java
@@ -31,7 +31,7 @@ public enum BridgeVersion {
 	V1_16_COMBAT("1.16_combat-6"),
 	V1_20("1.20"),
 	V1_21("1.21"),
-	V1_21_8("1.21.8");
+	V1_21_10("1.21.10");
 
 	private final String name;
 
diff --git a/common/src/main/java/io/github/axolotlclient/bridge/internal/RequiresImpl.java b/common/src/main/java/io/github/axolotlclient/bridge/internal/RequiresImpl.java
@@ -38,5 +38,5 @@
     }
 
     BridgeVersion min() default BridgeVersion.V1_8;
-    BridgeVersion max() default BridgeVersion.V1_21_8;
+    BridgeVersion max() default BridgeVersion.V1_21_10;
 }
diff --git a/common/src/main/java/io/github/axolotlclient/modules/rpc/RPCCommon.java b/common/src/main/java/io/github/axolotlclient/modules/rpc/RPCCommon.java
@@ -27,10 +27,8 @@
 import com.google.gson.JsonObject;
 import com.jagrosh.discordipc.IPCClient;
 import com.jagrosh.discordipc.IPCListener;
-import com.jagrosh.discordipc.entities.ActivityType;
-import com.jagrosh.discordipc.entities.Packet;
-import com.jagrosh.discordipc.entities.RichPresence;
-import com.jagrosh.discordipc.entities.User;
+import com.jagrosh.discordipc.entities.*;
+import io.github.axolotlclient.AxolotlClientCommon;
 import io.github.axolotlclient.AxolotlClientConfig.api.options.OptionCategory;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.BooleanOption;
 import io.github.axolotlclient.AxolotlClientConfig.impl.options.StringArrayOption;
@@ -89,14 +87,15 @@ public void shutdown() {
 		}
 	}
 
-	protected RichPresence createRichPresence(String gameVersion, String state, String details) {
+	protected RichPresence createRichPresence(String state, String details) {
 		RichPresence.Builder builder = new RichPresence.Builder();
-		builder.setLargeImage("icon", "AxolotlClient " + gameVersion);
+		builder.setLargeImageWithTooltip("icon", "AxolotlClient " + AxolotlClientCommon.VERSION+"+"+AxolotlClientCommon.GAME_VERSION);
 		if (showTime.get()) {
 			builder.setStartTimestamp(time.getEpochSecond());
 		}
 		builder.setState(state)
 			.setDetails(details);
+		builder.setStatusDisplayType(StatusDisplayType.Name);
 		builder.setActivityType(ActivityType.Playing);
 		return builder.build();
 	}
@@ -165,6 +164,7 @@ public void onDisconnect(IPCClient client, Throwable t) {
 				logger.info("Started RPC");
 				running = true;
 			} catch (Exception e) {
+				logger.warn("Failed to start RPC", e);
 				enabled.set(false);
 			}
 		}
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ fabric.loom.disableMinecraftVerification=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.7-alpha.1
+version=3.1.7-alpha.2
 
 maven_group=io.github.axolotlclient
 

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ protected void createRichPresence() {`
`67`	`67`	`details = "";`
`68`	`68`	`}`
`69`	`69`
`70`		`- setRichPresence(createRichPresence(AxolotlClient.VERSION, state, details));`
	`70`	`+ setRichPresence(createRichPresence(state, details));`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public void init() {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@`
`46`	`46`	`import org.spongepowered.asm.mixin.Unique;`
`47`	`47`	`import org.spongepowered.asm.mixin.injection.At;`
`48`	`48`	`import org.spongepowered.asm.mixin.injection.Inject;`
`49`		`-import org.spongepowered.asm.mixin.injection.Redirect;`
`50`	`49`	`import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;`
`51`	`50`
`52`	`51`	`@Mixin(EntityRenderer.class)`
`@@ -125,10 +124,10 @@ public abstract class EntityRendererMixin<T extends Entity> {`
`125`	`124`	`AxolotlClient.config().useShadows.get());`
`126`	`125`	`}`
`127`	`126`
`128`		`- @Redirect(method = "renderNameTag(Lnet/minecraft/entity/Entity;Ljava/lang/String;DDDI)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/BufferBuilder;vertex(DDD)Lcom/mojang/blaze3d/vertex/BufferBuilder;"))`
`129`		`- public BufferBuilder axolotlclient$noBg(BufferBuilder instance, double d, double e, double f) {`
	`127`	`+ @WrapOperation(method = "renderNameTag(Lnet/minecraft/entity/Entity;Ljava/lang/String;DDDI)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/BufferBuilder;vertex(DDD)Lcom/mojang/blaze3d/vertex/BufferBuilder;"))`
	`128`	`+ public BufferBuilder axolotlclient$noBg(BufferBuilder instance, double d, double e, double f, Operation<BufferBuilder> original) {`
`130`	`129`	`if (AxolotlClient.config().nametagBackground.get()) {`
`131`		`- instance.vertex(d, e, f);`
	`130`	`+ original.call(instance, d, e, f);`
`132`	`131`	`}`
`133`	`132`	`return instance;`
`134`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ protected MinecraftClientMixin(TextureManager textureManager) {`
`173`	`173`	`}`
`174`	`174`	`}`
`175`	`175`
`176`		`- @Inject(method = "updateWindow", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;onResolutionChanged(II)V"))`
	`176`	`+ @Inject(method = "onResolutionChanged()V", at = @At(value = "TAIL"))`
`177`	`177`	`public void axolotlclient$onResize(CallbackInfo ci) {`
`178`	`178`	`Util.window = null;`
`179`	`179`	`HudManager.getInstance().refreshAllBounds();`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ protected void createRichPresence() {`
`69`	`69`	`details = "";`
`70`	`70`	`}`
`71`	`71`
`72`		`- setRichPresence(createRichPresence(AxolotlClient.VERSION, state, details));`
	`72`	`+ setRichPresence(createRichPresence(state, details));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`public void init() {`