1.21.4, removed GodBridge, fixed hide score log message

.github/workflows/gradle.yml

@@ -1,7 +1,7 @@
 name: Java CI with Gradle
 
 concurrency:
-  group: "build-1.21"
+  group: "build-1.21.4"
   cancel-in-progress: true
 
 on:
@@ -30,9 +30,9 @@ jobs:
       - uses: "marvinpinto/action-automatic-releases@latest"
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "1.21.3-build-${{ github.run_number }}"
+          automatic_release_tag: "1.21.4-build-${{ github.run_number }}"
           prerelease: false
-          title: "1.21.3 Build ${{ github.run_number }}"
+          title: "1.21.4 Build ${{ github.run_number }}"
           files: |
             ./build/libs/*.jar
 

README.md

@@ -7,7 +7,7 @@
   <!-- Fancy badges -->
 <a href="https://github.com/cqb13/Numby-hack/releases"><img src="https://img.shields.io/badge/Version-v2.2-green" alt="Version"></a>
 <a href="https://anticope.ml/addons/?"><img src="https://img.shields.io/badge/Verified-Yes!-green" alt="Verified"></a>
-<img src="https://img.shields.io/badge/Minecraft%20Version-1.21-green" alt="Minecraft Version">
+<img src="https://img.shields.io/badge/Minecraft%20Version-1.21.4-green" alt="Minecraft Version">
 <img src="https://img.shields.io/github/downloads/cqb13/Numby-hack/total?color=green">
 <img src="https://img.shields.io/github/languages/code-size/cqb13/Numby-hack?color=green" alt="Code Size">
 <img src="https://img.shields.io/github/stars/cqb13/Numby-hack?color=green" alt="Stars">

build.gradle

@@ -1,60 +1,60 @@
-plugins {
-	id "fabric-loom" version "1.7-SNAPSHOT"
-}
-
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
-
-repositories {
-	//mavenCentral()
-	//mavenLocal()
-	maven { url "https://maven.meteordev.org/releases"}
-	maven { url "https://maven.meteordev.org/snapshots" }
-	//maven { url 'https://jitpack.io' }
-}
-
-configurations {
-	// configuration that holds jars to include in the jar
-	//extraLibs
-}
-
-dependencies {
-	// To change the versions see the gradle.properties file
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	modImplementation("meteordevelopment:meteor-client:${project.meteor_version}-SNAPSHOT")
-}
-
-processResources {
-	inputs.property "version", project.version
-
-
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version,
-				"mc_version": project.minecraft_version,
-				"gh_hash": (System.getenv("GITHUB_SHA") ?: "")
-	}
-}
-
-jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
-	}
-}
-tasks.withType(Jar) {
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-tasks.withType(JavaCompile).configureEach {
-	it.options.encoding = "UTF-8"
-
-	def targetVersion = 21
-	if (JavaVersion.current().isJava9Compatible()) {
-		 it.options.release = targetVersion
-	}
-}
+plugins {
+	id "fabric-loom" version "1.9-SNAPSHOT"
+}
+
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
+
+archivesBaseName = project.archives_base_name
+version = project.mod_version
+group = project.maven_group
+
+repositories {
+	//mavenCentral()
+	//mavenLocal()
+	maven { url "https://maven.meteordev.org/releases"}
+	maven { url "https://maven.meteordev.org/snapshots" }
+	//maven { url 'https://jitpack.io' }
+}
+
+configurations {
+	// configuration that holds jars to include in the jar
+	//extraLibs
+}
+
+dependencies {
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+
+	modImplementation("meteordevelopment:meteor-client:${project.minecraft_version}-SNAPSHOT")
+}
+
+processResources {
+	inputs.property "version", project.version
+
+
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version,
+				"mc_version": project.minecraft_version,
+				"gh_hash": (System.getenv("GITHUB_SHA") ?: "")
+	}
+}
+
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.archivesBaseName}"}
+	}
+}
+tasks.withType(Jar) {
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+tasks.withType(JavaCompile).configureEach {
+	it.options.encoding = "UTF-8"
+
+	def targetVersion = 21
+	if (JavaVersion.current().isJava9Compatible()) {
+		 it.options.release = targetVersion
+	}
+}

gradle.properties

@@ -2,13 +2,11 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.21.3
-yarn_mappings=1.21.3+build.2
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.7
 loader_version=0.16.9
 
 # Mod Properties
 mod_version=2.3
 maven_group=cqb13.NumbyHack
-archives_base_name=Numby-Hack
-
-meteor_version=0.5.9
+archives_base_name=Numby-Hack

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/cqb13/NumbyHack/NumbyHack.java

@@ -49,7 +49,6 @@ public void onInitialize() {
 		Modules.get().add(new Confetti());
 		Modules.get().add(new FloRida());
 		Modules.get().add(new GameSettings());
-		Modules.get().add(new GodBridge());
 		Modules.get().add(new IgnoreDeaths());
 		Modules.get().add(new JumpHelper());
 		Modules.get().add(new LogOutSpots());

src/main/java/cqb13/NumbyHack/mixins/DeathScreenMixin.java

@@ -21,8 +21,7 @@ public abstract class DeathScreenMixin {
 
     @Inject(method = "init", at = @At("TAIL"))
     private void removeScore(CallbackInfo ci) {
-        if (Modules.get().get(GameSettings.class).toggleHideScore())
+        if (Modules.get().get(GameSettings.class).hideTheScore())
             scoreText = Text.empty();
     }
-
 }

src/main/java/cqb13/NumbyHack/modules/general/ConditionToggle.java

@@ -1,7 +1,6 @@
 package cqb13.NumbyHack.modules.general;
 
 import cqb13.NumbyHack.NumbyHack;
-import meteordevelopment.meteorclient.events.entity.DamageEvent;
 import meteordevelopment.meteorclient.events.game.GameLeftEvent;
 import meteordevelopment.meteorclient.events.packets.PacketEvent;
 import meteordevelopment.meteorclient.events.world.TickEvent;
@@ -11,10 +10,13 @@
 import meteordevelopment.meteorclient.settings.SettingGroup;
 import meteordevelopment.meteorclient.systems.friends.Friends;
 import meteordevelopment.meteorclient.systems.modules.Module;
+import meteordevelopment.meteorclient.utils.player.ChatUtils;
 import meteordevelopment.orbit.EventHandler;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.packet.s2c.play.DeathMessageS2CPacket;
+import net.minecraft.network.packet.s2c.play.HealthUpdateS2CPacket;
+import net.minecraft.text.Text;
 
 import java.util.List;
 
@@ -117,25 +119,18 @@ public ConditionToggle() {
         super(NumbyHack.CATEGORY, "condition-toggle", "toggles modules based on conditions");
     }
 
-    //death toggle
+    //death toggle and damage toggle
     @EventHandler
     private void onPacketReceive(PacketEvent.Receive event)  {
         if (event.packet instanceof DeathMessageS2CPacket packet) {
             Entity entity = mc.world.getEntityById(packet.playerId());
             if (entity == mc.player && death.get()) {
                 toggleModules(deathOnToggleModules.get(), deathOffToggleModules.get());
             }
-        }
-    }
-
-    //damage toggle
-    @EventHandler
-    private void onDamage(DamageEvent event) {
-        if (event.entity.getUuid() == null) return;
-        if (!event.entity.getUuid().equals(mc.player.getUuid())) return;
-
-        if (damage.get()) {
-            toggleModules(damageOnToggleModules.get(), damageOffToggleModules.get());
+        } else if (event.packet instanceof HealthUpdateS2CPacket packet) {
+            if (mc.player.getHealth() - packet.getHealth() > 0 && damage.get()) {
+                toggleModules(damageOnToggleModules.get(), damageOffToggleModules.get());
+            }
         }
     }
 
@@ -169,11 +164,15 @@ private void onTick(TickEvent.Post event) {
     private void toggleModules(List<Module> onModules, List<Module> offModules) {
         for (Module module : offModules) {
             if (module.isActive()) {
+                if (this.chatFeedback) {
+                    ChatUtils.sendMsg(Text.of("Deactivated " + module.name));
+                }
                 module.toggle();
             }
         }
         for (Module module : onModules) {
             if (!module.isActive()) {
+                ChatUtils.sendMsg(Text.of("Activated " + module.name));
                 module.toggle();
             }
         }

src/main/java/cqb13/NumbyHack/modules/general/GameSettings.java

@@ -57,13 +57,7 @@ public class GameSettings extends Module {
             .name("hide-score")
             .description("Hides the score when you die.")
             .defaultValue(true)
-            .build()
-    );
-
-    private final Setting<Boolean> chatFeedback = sgGeneral.add(new BoolSetting.Builder()
-            .name("chat-feedback")
-            .description("Sends updates in the chat.")
-            .defaultValue(true)
+            .onChanged(this::toggleHideScore)
             .build()
     );
 
@@ -96,13 +90,16 @@ private void toggleAdvancedTooltips(Boolean b) {
         sendChatInfo("Advanced Tooltips", b ? "enabled" : "disabled");
     }
 
-    public boolean toggleHideScore() {
-        sendChatInfo("Hide Score", hideScore.get() ? "enabled" : "disabled");
+    private void toggleHideScore(Boolean b) {
+        sendChatInfo("Hide Score", b ? "enabled" : "disabled");
+    }
+
+    public boolean hideTheScore() {
         return isActive() && hideScore.get();
     }
 
     private void sendChatInfo(String setting, String value) {
-        if (!chatFeedback.get()) return;
+        if (!this.chatFeedback) return;
         ChatUtils.info("Set %s to %s.", setting, value);
     }
 }

src/main/resources/fabric.mod.json

@@ -29,6 +29,6 @@
   "depends": {
     "java": ">=21",
     "minecraft": ">=${mc_version}",
-    "meteor-client": ">=0.5.5"
+    "meteor-client": "*"
   }
 }