Added Legacy PvP

Author: FabiPunktExe

changelog.md

@@ -1,2 +1,3 @@
 ## SimpleClient %version%
-- Fixed server IP in Discord integration
+- Made server IP in Discord integration lower case
+- Added LegacyPvP for >=1.19.4<br>Can be enabled by the server 

gradle.properties

@@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # SimpleClient
-simpleclient_version=0.3.3
+simpleclient_version=0.3.4
 discord_game_sdk_version=v0.5.5

simpleclient-1.19.4/src/main/java/simpleclient/SimpleClient.java

@@ -55,7 +55,7 @@ public void onInitializeClient() {
             if (mc.player != null && mc.level != null) {
                 if (DiscordRPC.INSTANCE.getIngameTimestamp() == null) DiscordRPC.INSTANCE.setIngameTimestamp(Instant.now());
                 if (mc.getSingleplayerServer() == null) {
-                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip, DiscordRPC.INSTANCE.getIngameTimestamp());
+                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip.toLowerCase(), DiscordRPC.INSTANCE.getIngameTimestamp());
                 } else {
                     String gamemode = mc.player.isCreative() ? "Creative Mode" : mc.player.isSpectator() ? "Spectator Mode" : "Survival Mode";
                     return DiscordRPC.activity("Singleplayer", gamemode, DiscordRPC.INSTANCE.getIngameTimestamp());

simpleclient-1.19.4/src/main/java/simpleclient/mixin/feature/legacypvp/GuiMixin.java

@@ -1,9 +1,9 @@
 package simpleclient.mixin.feature.legacypvp;
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.AttackIndicatorStatus;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiGraphics;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -20,15 +20,15 @@ abstract class GuiMixin {
     private AttackIndicatorStatus attackIndicator;
 
     @Inject(at = @At(value = "HEAD"), method = "render")
-    public void render1(GuiGraphics guiGraphics, float patrialTicks, CallbackInfo ci) {
+    public void render1(PoseStack poseStack, float patrialTicks, CallbackInfo ci) {
         if (LegacyPvP.ENABLED) {
             attackIndicator = minecraft.options.attackIndicator().get();
             minecraft.options.attackIndicator().set(AttackIndicatorStatus.OFF);
         }
     }
 
     @Inject(at = @At(value = "TAIL"), method = "render")
-    public void render2(GuiGraphics guiGraphics, float partialTicks, CallbackInfo ci) {
+    public void render2(PoseStack poseStack, float partialTicks, CallbackInfo ci) {
         if (LegacyPvP.ENABLED) minecraft.options.attackIndicator().set(attackIndicator);
     }
 }

simpleclient-1.19.4/src/main/java/simpleclient/mixin/feature/legacypvp/PlayerItemInHandLayerMixin.java

@@ -75,7 +75,7 @@ private void transformBlocking(PoseStack poseStack, boolean leftHand) {
 
     @Unique
     private void transformInverse(LivingEntity entity, ItemStack itemStack, ItemDisplayContext context, PoseStack poseStack, boolean leftHand) {
-        BakedModel model = Minecraft.getInstance().getItemRenderer().getModel(itemStack, entity.level(), entity, 0);
+        BakedModel model = Minecraft.getInstance().getItemRenderer().getModel(itemStack, entity.level, entity, 0);
         transformInverse(model.getTransforms().getTransform(context), leftHand, poseStack);
     }
 

simpleclient-1.20.1/src/main/java/simpleclient/SimpleClient.java

@@ -53,7 +53,7 @@ public void onInitializeClient() {
             if (mc.player != null && mc.level != null) {
                 if (DiscordRPC.INSTANCE.getIngameTimestamp() == null) DiscordRPC.INSTANCE.setIngameTimestamp(Instant.now());
                 if (mc.getSingleplayerServer() == null) {
-                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip, DiscordRPC.INSTANCE.getIngameTimestamp());
+                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip.toLowerCase(), DiscordRPC.INSTANCE.getIngameTimestamp());
                 } else {
                     String gamemode = mc.player.isCreative() ? "Creative Mode" : mc.player.isSpectator() ? "Spectator Mode" : "Survival Mode";
                     return DiscordRPC.activity("Singleplayer", gamemode, DiscordRPC.INSTANCE.getIngameTimestamp());

simpleclient-1.20/src/main/java/simpleclient/SimpleClient.java

@@ -48,7 +48,7 @@ public void onInitializeClient() {
             if (mc.player != null && mc.level != null) {
                 if (DiscordRPC.INSTANCE.getIngameTimestamp() == null) DiscordRPC.INSTANCE.setIngameTimestamp(Instant.now());
                 if (mc.getSingleplayerServer() == null) {
-                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip, DiscordRPC.INSTANCE.getIngameTimestamp());
+                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServer().ip.toLowerCase(), DiscordRPC.INSTANCE.getIngameTimestamp());
                 } else {
                     String gamemode = mc.player.isCreative() ? "Creative Mode" : mc.player.isSpectator() ? "Spectator Mode" : "Survival Mode";
                     return DiscordRPC.activity("Singleplayer", gamemode, DiscordRPC.INSTANCE.getIngameTimestamp());

simpleclient-1.8.9/src/main/java/simpleclient/SimpleClient.java

@@ -48,7 +48,7 @@ public void onInitializeClient() {
             if (mc.player != null && mc.world != null) {
                 if (DiscordRPC.INSTANCE.getIngameTimestamp() == null) DiscordRPC.INSTANCE.setIngameTimestamp(Instant.now());
                 if (mc.getServer() == null) {;
-                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServerEntry().address, DiscordRPC.INSTANCE.getIngameTimestamp());
+                    return DiscordRPC.activity("Multiplayer", mc.getCurrentServerEntry().address.toLowerCase(), DiscordRPC.INSTANCE.getIngameTimestamp());
                 } else {
                     PlayerListEntry entry = mc.getNetworkHandler().getPlayerListEntry(mc.player.getGameProfile().getId());
                     LevelInfo.GameMode mode = entry.getGameMode();