Crash attempt with ThunderHack client

README.md

@@ -48,14 +48,11 @@
 | **Freecam**       	 | **Added good baritone control via Freecam**                         |       
 | **Waypoints**     	 | **Added display of distances in label names, sorting, name search** |
 | **Hidden module** 	 | **Hiding original modules and third-party modules from the GUI**    |
-| **UI, Hud, ESP, GUI**  | **Added support for the Russian language in Minecraft**        |
 
 ## Meteor Client fixes
 | Module            | Fix                                                        		  |
 |-------------------|---------------------------------------------------------------------|
-| **Auto Tool**     | **No work in creative mode**                         				  |       
-| **Long Jump**     | **Does not stop the work of other modules that modify Timer** 	  |
-| **Speed**     	| **Does not stop the work of other modules that modify Timer** 	  |
+| **Auto Tool**     | **No work in creative mode**                         				  |
 
 
 ## Integrations with mods

src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java

@@ -3,6 +3,7 @@
 import meteordevelopment.meteorclient.addons.GithubRepo;
 import meteordevelopment.meteorclient.commands.Commands;
 import meteordevelopment.meteorclient.gui.tabs.Tabs;
+import meteordevelopment.meteorclient.systems.modules.misc.BetterChat;
 import nekiplay.meteorplus.features.commands.ClearInventory;
 import nekiplay.meteorplus.features.commands.Eclip;
 import nekiplay.meteorplus.features.commands.GPT;
@@ -25,18 +26,16 @@
 import meteordevelopment.meteorclient.systems.hud.HudGroup;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
 import nekiplay.meteorplus.features.modules.fastladder.FastLadderPlus;
 import nekiplay.meteorplus.features.modules.fly.FlyPlus;
 import nekiplay.meteorplus.features.modules.jesus.JesusPlus;
 import nekiplay.meteorplus.features.modules.nofall.NoFallPlus;
 import nekiplay.meteorplus.features.modules.speed.SpeedPlus;
 import nekiplay.meteorplus.features.modules.spider.SpiderPlus;
+import net.minecraft.util.Identifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.rmi.registry.Registry;
-
 public class MeteorPlusAddon extends MeteorAddon {
 	public static final Logger LOG = LoggerFactory.getLogger(MeteorPlusAddon.class);
 	public static final Category CATEGORY = new Category("Meteor+", ModItems.LOGO_ITEM.getDefaultStack());
@@ -72,6 +71,10 @@ public void onInitialize() {
 		//region Modules
 		LOG.info(LOGPREFIX + " initializing modules...");
 		Modules modules = Modules.get();
+
+		BetterChat.registerCustomHead("[Meteor+]", new Identifier("meteorplus", "chat/icon.png"));
+
+		modules.add(new ChatPrefix());
 		modules.add(new ChatGPT());
 		modules.add(new ItemHighlightPlus());
 		modules.add(new FastLadderPlus());

src/main/java/nekiplay/meteorplus/features/modules/ChatPrefix.java

@@ -0,0 +1,62 @@
+package nekiplay.meteorplus.features.modules;
+
+import meteordevelopment.meteorclient.settings.ColorSetting;
+import meteordevelopment.meteorclient.settings.Setting;
+import meteordevelopment.meteorclient.settings.SettingGroup;
+import meteordevelopment.meteorclient.settings.StringSetting;
+import meteordevelopment.meteorclient.systems.modules.Module;
+import meteordevelopment.meteorclient.utils.player.ChatUtils;
+import meteordevelopment.meteorclient.utils.render.color.SettingColor;
+import nekiplay.meteorplus.MeteorPlusAddon;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.text.TextColor;
+import net.minecraft.util.Formatting;
+
+public class ChatPrefix extends Module {
+	public ChatPrefix() {
+		super(MeteorPlusAddon.CATEGORY, "chat-prefix", "prefix for enabling and disabling Meteor+ modules.");
+	}
+	private final SettingGroup sgGeneral = settings.getDefaultGroup();
+	private final Setting<String> prefix = sgGeneral.add(new StringSetting.Builder()
+		.name("prefix")
+		.description("Which prefix to be displayed for Meteor+ modules.")
+		.defaultValue("Meteor+")
+		.onChanged(reload -> setPrefixes())
+		.build()
+	);
+
+	private final Setting<SettingColor> prefixColor = sgGeneral.add(new ColorSetting.Builder()
+		.name("color")
+		.description("Which color to use for the prefix.")
+		.defaultValue(new SettingColor(0, 198, 77, 255))
+		.build()
+	);
+
+	@Override
+	public void onActivate() {
+		setPrefixes();
+	}
+
+	@Override
+	public void onDeactivate() {
+		ChatUtils.unregisterCustomPrefix("nekiplay.meteorplus.features.modules");
+	}
+
+	public void setPrefixes() {
+		if (isActive()) {
+			ChatUtils.registerCustomPrefix("nekiplay.meteorplus.features.modules", this::getPrefix);
+		}
+	}
+
+	public Text getPrefix() {
+		MutableText value = Text.literal(prefix.get());
+		MutableText prefix = Text.literal("");
+		value.setStyle(value.getStyle().withColor(TextColor.fromRgb(prefixColor.get().getPacked())));
+		prefix.setStyle(prefix.getStyle().withFormatting(Formatting.GRAY))
+			.append(Text.literal("["))
+			.append(value)
+			.append(Text.literal("] "));
+		return prefix;
+	}
+}

src/main/java/nekiplay/meteorplus/features/modules/fly/FlyPlus.java

@@ -12,6 +12,8 @@
 import meteordevelopment.orbit.EventHandler;
 import nekiplay.meteorplus.MeteorPlusAddon;
 import nekiplay.meteorplus.features.modules.fly.modes.*;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
 
 public class FlyPlus extends Module {
 	private final SettingGroup sgGeneral = settings.getDefaultGroup();

src/main/java/nekiplay/meteorplus/features/modules/fly/modes/Damage.java

@@ -36,7 +36,6 @@ public void onTickEventPre(TickEvent.Pre event) {
 			double velX = 0;
 			double velZ = 0;
 			double s = speed;
-			double speedValue = 0.01;
 			if (mc.options.forwardKey.isPressed()) {
 				velX += forward.x * s;
 				velZ += forward.z * s;

src/main/java/nekiplay/meteorplus/hud/TimerPlusCharge.java

@@ -10,7 +10,7 @@
 import nekiplay.meteorplus.MeteorPlusAddon;
 
 public class TimerPlusCharge extends HudElement {
-	public static final HudElementInfo<TimerPlusCharge> INFO = new HudElementInfo<>(MeteorPlusAddon.HUD_GROUP, "timer-plus-charge", "Displays timer plus charge.", TimerPlusCharge::new);
+	public static final HudElementInfo<TimerPlusCharge> INFO = new HudElementInfo<>(MeteorPlusAddon.HUD_GROUP, "timer+-charge", "Displays timer plus charge.", TimerPlusCharge::new);
 
 	private final SettingGroup sgGeneral = settings.getDefaultGroup();
 	private final SettingGroup sgScale = settings.createGroup("Scale");
@@ -105,7 +105,7 @@ public void render(HudRenderer renderer) {
 		}
 
 		if (isInEditor()) {
-			render(renderer, "4.3", textColor.get());
+			render(renderer, "4.3", rechargeTextColor.get());
 			return;
 		}
 		double percentage = find_percent(0, TimerPlus.rechargeDelay, TimerPlus.rechargeTimer);
@@ -117,7 +117,7 @@ private void render(HudRenderer renderer, String right, Color rightColor) {
 		double x = this.x + border.get();
 		double y = this.y + border.get();
 
-		double x2 = renderer.text("Timer Plus: ", x, y, textColor.get(), shadow.get(), getScale());
+		double x2 = renderer.text("Timer+: ", x, y, textColor.get(), shadow.get(), getScale());
 		x2 = renderer.text(right, x2, y, rightColor, shadow.get(), getScale());
 		x2 = renderer.text("%", x2, y, rightColor, shadow.get(), getScale());
 

src/main/java/nekiplay/meteorplus/items/ModItems.java

@@ -14,11 +14,5 @@ public class ModItems {
 	public static void Initialize() {
 		Registry.register(Registries.ITEM, new Identifier("meteorplus", "logo"), LOGO_ITEM);
 		Registry.register(Registries.ITEM, new Identifier("meteorplus", "logo_mods"), LOGO_MODS_ITEM);
-
-		ItemGroupEvents.modifyEntriesEvent(ItemGroups.OPERATOR).register(entries -> {
-			entries.add(LOGO_ITEM);
-			entries.add(LOGO_MODS_ITEM);
-		});
-
 	}
 }

src/main/java/nekiplay/meteorplus/mixin/minecraft/ClientPlayerEntityMixin.java

@@ -13,7 +13,7 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(ClientPlayerEntity.class)
+@Mixin(value = ClientPlayerEntity.class, priority = 1001)
 public class ClientPlayerEntityMixin {
 	@Shadow
 	public Input input;