1.21.4: disable broken features

Author: moehreag

1.21.4/src/main/java/io/github/axolotlclient/AxolotlClient.java

@@ -37,7 +37,6 @@
 import io.github.axolotlclient.modules.Module;
 import io.github.axolotlclient.modules.ModuleLoader;
 import io.github.axolotlclient.modules.auth.Auth;
-import io.github.axolotlclient.modules.blur.MotionBlur;
 import io.github.axolotlclient.modules.freelook.Freelook;
 import io.github.axolotlclient.modules.hud.HudManager;
 import io.github.axolotlclient.modules.hypixel.HypixelMods;
@@ -80,7 +79,7 @@ public static void getModules() {
 		modules.add(Zoom.getInstance());
 		modules.add(HudManager.getInstance());
 		modules.add(HypixelMods.getInstance());
-		modules.add(MotionBlur.getInstance());
+		//modules.add(MotionBlur.getInstance()); // TODO fix motion blur, it's broken since 1.21.2's rendering changes
 		modules.add(ScrollableTooltips.getInstance());
 		modules.add(DiscordRPC.getInstance());
 		modules.add(Freelook.getInstance());

1.21.4/src/main/java/io/github/axolotlclient/mixin/LivingEntityMixin.java

@@ -22,19 +22,11 @@
 
 package io.github.axolotlclient.mixin;
 
-import io.github.axolotlclient.modules.hud.HudManager;
-import io.github.axolotlclient.modules.hud.gui.hud.simple.ComboHud;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
 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;
 
 @Mixin(LivingEntity.class)
 public abstract class LivingEntityMixin extends Entity {
@@ -43,8 +35,8 @@ public LivingEntityMixin(EntityType<?> type, Level world) {
 		super(type, world);
 	}
 
-	// TODO check whether this works while on servers
-	@Inject(method = "hurtServer", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/LivingEntity;lastDamageStamp:J"))
+	// TODO this doesn't work currently
+	/*@Inject(method = "hurtServer", at = @At(value = "FIELD", target = "Lnet/minecraft/world/entity/LivingEntity;lastDamageStamp:J"))
 	private void axolotlclient$onDamage(ServerLevel world, DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
 		// The client doesn't really get any sort of information about why a person is damaged
 		// Kinda sucks since that means combos can't be guarenteed (i.e. fall damage, or other person hits)
@@ -54,5 +46,5 @@ public LivingEntityMixin(EntityType<?> type, Level world) {
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
 			comboHud.onEntityDamage(this);
 		}
-	}
+	}*/
 }

1.21.4/src/main/java/io/github/axolotlclient/mixin/PlayerEntityMixin.java

@@ -28,8 +28,6 @@
 import io.github.axolotlclient.modules.particles.Particles;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
@@ -39,7 +37,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(Player.class)
 public abstract class PlayerEntityMixin extends LivingEntity {
@@ -72,8 +69,8 @@ protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, Level
 		}
 	}
 
-	// TODO check whether this actually still works now
-	@Inject(method = "hurtServer", at = @At("HEAD"))
+	// TODO this doesn't work currently
+	/*@Inject(method = "hurtServer", at = @At("HEAD"))
 	private void axolotlclient$damage(ServerLevel world, DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
 		if (source.getEntity() != null && getUUID() == Minecraft.getInstance().player.getUUID()) {
 			ReachHud reachDisplayHud = (ReachHud) HudManager.getInstance().get(ReachHud.ID);
@@ -86,5 +83,5 @@ protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, Level
 			ComboHud comboHud = (ComboHud) HudManager.getInstance().get(ComboHud.ID);
 			comboHud.onEntityDamage(this);
 		}
-	}
+	}*/
 }

1.21.4/src/main/java/io/github/axolotlclient/modules/hud/HudManager.java

@@ -98,17 +98,20 @@ public void init() {
 		add(new ItemUpdateHud());
 		add(new PackDisplayHud());
 		add(new IRLTimeHud());
-		add(new ReachHud());
+		add(new ReachHud()); // TODO
 		add(new MemoryHud());
 		add(new PlayerCountHud());
 		add(new CompassHud());
 		add(new TPSHud());
-		add(new ComboHud());
+		add(new ComboHud()); // TODO
 		add(new PlayerHud());
 		entries.put(BedwarsMod.getInstance().getUpgradesOverlay().getId(), BedwarsMod.getInstance().getUpgradesOverlay());
 
 		entries.values().forEach(HudEntry::init);
 
+		((ReachHud)get(ReachHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+		((ComboHud)get(ComboHud.ID)).getEnabled().setForceOff(true, "feature.broken");
+
 		refreshAllBounds();
 	}
 

CHANGELOG.md

@@ -23,6 +23,7 @@
 - migrate 1.21.4 to mojmap
 - add Activity support for MCCIsland
 - block more disallowed features on MCCIsland
+- 1.21.4: temporarily disable broken features: MotionBlur, ReachHud, ComboHud
 
 ### 3.0.6
 

common/src/main/resources/assets/axolotlclient/lang/en_us.json

@@ -598,5 +598,6 @@
 	"api.account.export.success.description": "Exported account data to %s",
 	"api.account.export.failure.title": "Export failed",
 	"api.account.export.failure.description_write": "Failed to write file, you may find more information in the log file!",
-	"api.account.export.failure.description_server": "Failed to request data from the server, please contact AxolotlClient with a log file to get support!"
+	"api.account.export.failure.description_server": "Failed to request data from the server, please contact AxolotlClient with a log file to get support!",
+	"feature.broken": "This feature is currently not working. If you know how to fix it please let us know!"
 }

gradle.properties

@@ -6,7 +6,7 @@ org.gradle.parallel=true
 axolotlclient.modules.all=true
 
 # Mod Properties
-version=3.1.0-beta.35
+version=3.1.0-beta.36
 
 maven_group=io.github.axolotlclient