Fixed LegacyPvP

FabiPunktExe · FabiPunktExe · commit 70e904ced5eb · 2023-07-24T18:51:55.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,2 @@
 ## SimpleClient %version%
-- Made server IP in Discord integration lower case
-- Added LegacyPvP for >=1.19.4<br>Can be enabled by the server 
+- Fixed Legacy PvP 
diff --git a/gradle.properties b/gradle.properties
@@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # SimpleClient
-simpleclient_version=0.3.4
+simpleclient_version=0.3.5
 discord_game_sdk_version=v0.5.5
diff --git a/simpleclient-1.19.4/src/main/java/simpleclient/mixin/feature/legacypvp/PlayerMixin.java b/simpleclient-1.19.4/src/main/java/simpleclient/mixin/feature/legacypvp/PlayerMixin.java
@@ -5,11 +5,12 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import simpleclient.feature.LegacyPvP;
 
 @Mixin(Player.class)
 public class PlayerMixin {
     @Inject(at = @At(value = "HEAD"), method = "getCurrentItemAttackStrengthDelay", cancellable = true)
     public void getCurrentItemAttackStrengthDelay(CallbackInfoReturnable<Float> ci) {
-        ci.setReturnValue(0.0F);
+        if (LegacyPvP.ENABLED) ci.setReturnValue(0.0F);
     }
 }
diff --git a/simpleclient-1.20.1/src/main/java/simpleclient/mixin/feature/legacypvp/PlayerMixin.java b/simpleclient-1.20.1/src/main/java/simpleclient/mixin/feature/legacypvp/PlayerMixin.java
@@ -5,11 +5,12 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import simpleclient.feature.LegacyPvP;
 
 @Mixin(Player.class)
 public class PlayerMixin {
     @Inject(at = @At(value = "HEAD"), method = "getCurrentItemAttackStrengthDelay", cancellable = true)
     public void getCurrentItemAttackStrengthDelay(CallbackInfoReturnable<Float> ci) {
-        ci.setReturnValue(0.0F);
+        if (LegacyPvP.ENABLED) ci.setReturnValue(0.0F);
     }
 }
diff --git a/simpleclient-1.20.1/src/main/java/simpleclient/mixin/feature/tnt_timer/TntRendererMixin.java b/simpleclient-1.20.1/src/main/java/simpleclient/mixin/feature/tnt_timer/TntRendererMixin.java
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/GuiMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/GuiMixin.java
@@ -1,4 +1,4 @@
-package simpleclient.mixin.legacypvp;
+package simpleclient.mixin.feature.legacypvp;
 
 import net.minecraft.client.AttackIndicatorStatus;
 import net.minecraft.client.Minecraft;
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/HumanoidModelMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/HumanoidModelMixin.java
@@ -1,4 +1,4 @@
-package simpleclient.mixin.legacypvp;
+package simpleclient.mixin.feature.legacypvp;
 
 import net.minecraft.client.model.HumanoidModel;
 import net.minecraft.client.model.geom.ModelPart;
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/ItemInHandRendererMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/ItemInHandRendererMixin.java
@@ -1,4 +1,4 @@
-package simpleclient.mixin.legacypvp;
+package simpleclient.mixin.feature.legacypvp;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/LivingEntityMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/LivingEntityMixin.java
@@ -1,4 +1,4 @@
-package simpleclient.mixin.legacypvp;
+package simpleclient.mixin.feature.legacypvp;
 
 import net.minecraft.world.entity.LivingEntity;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/PlayerItemInHandLayerMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/PlayerItemInHandLayerMixin.java
@@ -1,4 +1,4 @@
-package simpleclient.mixin.legacypvp;
+package simpleclient.mixin.feature.legacypvp;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/PlayerMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/PlayerMixin.java
@@ -1,15 +1,16 @@
-package simpleclient.mixin.legacypvp;
+package simpleclient.mixin.feature.legacypvp;
 
 import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import simpleclient.feature.LegacyPvP;
 
 @Mixin(Player.class)
 public class PlayerMixin {
     @Inject(at = @At(value = "HEAD"), method = "getCurrentItemAttackStrengthDelay", cancellable = true)
     public void getCurrentItemAttackStrengthDelay(CallbackInfoReturnable<Float> ci) {
-        ci.setReturnValue(0.0F);
+        if (LegacyPvP.ENABLED) ci.setReturnValue(0.0F);
     }
 }
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/SwordItemMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/legacypvp/SwordItemMixin.java
@@ -1,4 +1,4 @@
-package simpleclient.mixin.legacypvp;
+package simpleclient.mixin.feature.legacypvp;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
diff --git a/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/tnt_timer/TntRendererMixin.java b/simpleclient-1.20/src/main/java/simpleclient/mixin/feature/tnt_timer/TntRendererMixin.java
@@ -1,4 +1,4 @@
-package simpleclient.mixin.tnt_timer;
+package simpleclient.mixin.feature.tnt_timer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.MultiBufferSource;
diff --git a/simpleclient-1.20/src/main/resources/simpleclient.mixins.json b/simpleclient-1.20/src/main/resources/simpleclient.mixins.json
@@ -19,7 +19,7 @@
     "performance.LevelRendererMixin",
     "performance.OptionsMixin",
     "performance.SharedConstantsMixin",
-    "tnt_timer.TntRendererMixin"
+    "feature.tnt_timer.TntRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,12 @@`
`5`	`5`	`import org.spongepowered.asm.mixin.injection.At;`
`6`	`6`	`import org.spongepowered.asm.mixin.injection.Inject;`
`7`	`7`	`import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;`
	`8`	`+import simpleclient.feature.LegacyPvP;`
`8`	`9`
`9`	`10`	`@Mixin(Player.class)`
`10`	`11`	`public class PlayerMixin {`
`11`	`12`	`@Inject(at = @At(value = "HEAD"), method = "getCurrentItemAttackStrengthDelay", cancellable = true)`
`12`	`13`	`public void getCurrentItemAttackStrengthDelay(CallbackInfoReturnable<Float> ci) {`
`13`		`- ci.setReturnValue(0.0F);`
	`14`	`+ if (LegacyPvP.ENABLED) ci.setReturnValue(0.0F);`
`14`	`15`	`}`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package simpleclient.mixin.legacypvp;`
	`1`	`+package simpleclient.mixin.feature.legacypvp;`
`2`	`2`
`3`	`3`	`import net.minecraft.client.AttackIndicatorStatus;`
`4`	`4`	`import net.minecraft.client.Minecraft;`