Verox/EZCheat-Fabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed small bugs / problems

Browse Source
This commit is contained in:
Verox001 2025-07-18 02:18:15 +02:00
parent 4ee09e5a13
commit 9b5a368ed1
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/cimeyclust/ezcheat/Ezcheat.java
View File

@ -122,6 +122,12 @@ public class Ezcheat implements ModInitializer {
if (!bad.isEmpty()) { if (!bad.isEmpty()) {
String msg = "Unallowed mods: " + String.join(", ", bad); String msg = "Unallowed mods: " + String.join(", ", bad);
// Make sure msg is not too long. If it is, truncate it.
if (msg.length() > 256) {
msg = msg.substring(0, 256) + "...";
}
player.networkHandler.disconnect(Text.literal(msg)); player.networkHandler.disconnect(Text.literal(msg));
LOGGER.info("Kicked {} for unallowed mods: {}", player.getName().getString(), bad); LOGGER.info("Kicked {} for unallowed mods: {}", player.getName().getString(), bad);
} else { } else {

25
src/main/java/com/cimeyclust/ezcheat/client/EzcheatClient.java
View File

@ -7,6 +7,7 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import net.fabricmc.loader.api.metadata.ModOrigin;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
import java.io.IOException; import java.io.IOException;
@ -21,7 +22,11 @@ public class EzcheatClient implements ClientModInitializer {
@Override @Override
public void onInitializeClient() { public void onInitializeClient() {
ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> { ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> {
Ezcheat.LOGGER.info("Joined server: {}", handler.getConnection().getAddress());
Ezcheat.LOGGER.info("Is Singleplayer: {}", client.isInSingleplayer());
if (!client.isInSingleplayer()) { if (!client.isInSingleplayer()) {
Ezcheat.LOGGER.info("Sending mod hashes to server");
this.sendHashes(); this.sendHashes();
} }
}); });
@ -38,22 +43,28 @@ public class EzcheatClient implements ClientModInitializer {
Map<String, String> hashes = new HashMap<>(); Map<String, String> hashes = new HashMap<>();
for (var mod : FabricLoader.getInstance().getAllMods()) { for (var mod : FabricLoader.getInstance().getAllMods()) {
try { try {
Path path = null; var origin = mod.getOrigin();
var paths = mod.getOrigin().getPaths(); // Skip nested origins
for (Path p : paths) { if (origin.getKind() == ModOrigin.Kind.NESTED) {
Ezcheat.LOGGER.debug("Skipping nested mod {}", mod.getMetadata().getId());
continue;
}
Path modFile = null;
for (Path p : origin.getPaths()) {
if (Files.isRegularFile(p)) { if (Files.isRegularFile(p)) {
path = p; modFile = p;
break; break;
} }
} }
if (path == null) { if (modFile == null) {
Ezcheat.LOGGER.debug("Skipping mod {}: No valid path", mod.getMetadata().getId()); Ezcheat.LOGGER.debug("Skipping mod {}: No valid path", mod.getMetadata().getId());
continue; continue;
} }
if (path.startsWith(modsDir)) { if (modFile.startsWith(modsDir)) {
try (InputStream in = Files.newInputStream(path)) { try (InputStream in = Files.newInputStream(modFile)) {
hashes.put(mod.getMetadata().getId(), DigestUtils.sha256Hex(in)); hashes.put(mod.getMetadata().getId(), DigestUtils.sha256Hex(in));
} }
} }