0.1.3

Logging4J · Dec 14, 2023 · f4f2f8e · f4f2f8e
1 parent badb15e
commit f4f2f8e
Show file tree

Hide file tree

Showing 22 changed files with 337 additions and 75 deletions.
diff --git a/README.md b/README.md
@@ -2,14 +2,14 @@
 
 [![Downloads](https://img.shields.io/github/downloads/Logging4J/Currymod/total)](https://github.com/Logging4J/CurryMod/releases/)
 
-A 1.20.3 Fabric Minecraft Sex Hack straight out of Mumbai India (TUCO APPROVED) (GONE SEXUAL AT 3AM) (GONE WRONG) (IN DA HOOD) (WITH THE BOYS)
+A 1.20.4 Fabric Minecraft Sex Hack straight out of Mumbai India (TUCO APPROVED) (GONE SEXUAL AT 3AM) (GONE WRONG) (IN DA HOOD) (WITH THE BOYS)
 
 featuring - qq rat and the boat dupe
 
 ---
 
 ## Current Release
-- [v0.1.2](https://github.com/Logging4J/CurryMod/releases/)
+- [v0.1.3](https://github.com/Logging4J/CurryMod/releases/)
 
 ---
 

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.20.4
 yarn_mappings=1.20.4+build.1
 loader_version=0.15.1
 
-mod_version=0.1.2
+mod_version=0.1.3
 maven_group=wtf.l4j
 archives_base_name=currymod
 

diff --git a/src/main/java/wtf/l4j/CurryMod.java b/src/main/java/wtf/l4j/CurryMod.java
@@ -13,18 +13,14 @@
 public class CurryMod {
 
 	@Getter private final Logger logger = LoggerFactory.getLogger("currymod");
+	@Getter private final DiscordRP discordRP = new DiscordRP();
 	@Getter private Managers managers;
 	private static CurryMod instance;
 
-	private final DiscordRP discordRP = new DiscordRP();
-
-
 	public void startup(){
-		this.discordRP.start();
 		managers = new Managers();
 		Config.load();
 		Runtime.getRuntime().addShutdownHook(new Config());
-
 	}
 
 	public void shutdown(){

diff --git a/src/main/java/wtf/l4j/DiscordRP.java b/src/main/java/wtf/l4j/DiscordRP.java
@@ -3,8 +3,9 @@
 import club.minnced.discord.rpc.DiscordEventHandlers;
 import club.minnced.discord.rpc.DiscordRPC;
 import club.minnced.discord.rpc.DiscordRichPresence;
+import wtf.l4j.api.utils.MinecraftInterface;
 
-public class DiscordRP {
+public class DiscordRP implements MinecraftInterface {
 
     public DiscordRichPresence discordRichPresence = new DiscordRichPresence();
 
@@ -16,7 +17,7 @@ public void start(){
         discordRichPresence.details = "Straight out of Mumbai India";
         discordRichPresence.largeImageKey = "edpcurrymodlarge";
         discordRichPresence.smallImageKey = "edpcurrymodsmall";
-        discordRichPresence.largeImageText = "slappin nn's";
+        discordRichPresence.largeImageText = "slappin nn's" + (!mc.isInSingleplayer() ? "on " + mc.player.getServer().getServerIp() : "in singleplayer");
         discordRichPresence.state = null;
         DiscordRPC.INSTANCE.Discord_UpdatePresence(discordRichPresence);
     }

diff --git a/src/main/java/wtf/l4j/api/graphics/clickgui/ClickGuiScreen.java b/src/main/java/wtf/l4j/api/graphics/clickgui/ClickGuiScreen.java
@@ -1,7 +1,16 @@
 package wtf.l4j.api.graphics.clickgui;
 
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Mouse;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
+import net.minecraft.client.gui.screen.option.MouseOptionsScreen;
+import net.minecraft.client.gui.screen.option.OptionsScreen;
+import net.minecraft.client.gui.screen.world.WorldListWidget;
+import net.minecraft.client.gui.widget.EntryListWidget;
+import net.minecraft.client.gui.widget.ScrollableWidget;
+import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import wtf.l4j.CurryMod;
 import wtf.l4j.api.graphics.Constants;
@@ -71,4 +80,20 @@ public void close() {
     public boolean shouldPause() {
         return false;
     }
+
+
+    @Override
+    public boolean mouseScrolled(double mouseX, double mouseY, double horizontalAmount, double verticalAmount) {
+        if (verticalAmount < 0) {
+            for (Window window : windows) {
+                window.setY(window.getY() - 8);
+            }
+        }
+        else if (verticalAmount > 0) {
+            for (Window window : windows) {
+                window.setY(window.getY() + 8);
+            }
+        }
+        return super.mouseScrolled(mouseX, mouseY, horizontalAmount, verticalAmount);
+    }
 }
diff --git a/src/main/java/wtf/l4j/api/graphics/clickgui/Window.java b/src/main/java/wtf/l4j/api/graphics/clickgui/Window.java
@@ -1,6 +1,7 @@
 package wtf.l4j.api.graphics.clickgui;
 
 import lombok.Getter;
+import lombok.Setter;
 import net.minecraft.client.gui.DrawContext;
 import wtf.l4j.CurryMod;
 import wtf.l4j.api.graphics.Constants;
@@ -20,7 +21,9 @@ public class Window implements MinecraftInterface {
 
     private List<ModuleButton> modules;
     private Category category;
-    private int x,y,dragX,dragY;
+    private int x;
+    @Setter private int y;
+    private int dragX, dragY;
     private boolean visible, dragging;
 
     public Window(Category category, int x, int y){

diff --git a/src/main/java/wtf/l4j/api/manager/managers/ModuleManager.java b/src/main/java/wtf/l4j/api/manager/managers/ModuleManager.java
@@ -15,6 +15,7 @@
 import wtf.l4j.impl.modules.visual.*;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -25,7 +26,8 @@ public class ModuleManager {
     private List<Module> modules;
 
     public void init() {
-        modules = new ArrayList<>();
+        modules = new LinkedList<>();
+
         modules.add(new ClickGui());
         modules.add(new Colors());
         modules.add(new HudEditor());
@@ -72,6 +74,8 @@ public void init() {
         modules.add(new FreeCam());
         modules.add(new HighJump());
         modules.add(new InventoryMove());
+        modules.add(new DiscordRPC());
+        modules.add(new NameProtect());
     }
 
     public Module getModule(Class<?> module) {

diff --git a/src/main/java/wtf/l4j/api/utils/ClientInfoInterface.java b/src/main/java/wtf/l4j/api/utils/ClientInfoInterface.java
@@ -3,6 +3,6 @@
 public interface ClientInfoInterface {
 
     String clientName = "CurryMod";
-    String version = "0.1.2";
+    String version = "0.1.3";
 
 }
diff --git a/src/main/java/wtf/l4j/api/utils/ItemUtils.java b/src/main/java/wtf/l4j/api/utils/ItemUtils.java
@@ -11,18 +11,6 @@
 @UtilityClass
 public class ItemUtils implements MinecraftInterface {
 
-    public int getSlot(Item item) {
-        int slot = -1;
-        for (int i = 0; i < 9; i++) {
-            Item it = mc.player.getInventory().getStack(i).getItem();
-            if (it == item) {
-                slot = i;
-                break;
-            }
-        }
-        return slot;
-    }
-
     public int getBestAvailableToolSlot(BlockPos p) {
         BlockState blockState = mc.world.getBlockState(p);
         int bestSlot = mc.player.getInventory().selectedSlot;

diff --git a/src/main/java/wtf/l4j/api/utils/PlayerUtils.java b/src/main/java/wtf/l4j/api/utils/PlayerUtils.java
@@ -31,17 +31,6 @@ public String getUUIDFromName(String name) {
         return null;
     }
 
-    public static String getRandomOnline() {
-        List<String> validNames = mc.getNetworkHandler().getPlayerList().stream()
-                .map(entry -> entry.getProfile().getName())
-                .filter(name -> !Objects.equals(name, mc.player.getName().getString()))
-                .collect(Collectors.toList());
-
-        int randomIndex = new Random().nextInt(validNames.size());
-
-        return validNames.get(randomIndex);
-    }
-
     public float[] getRotationToEntity(Entity target) {
         double deltaX = target.getX() - mc.player.getX();
         double deltaZ = target.getZ() - mc.player.getZ();

diff --git a/src/main/java/wtf/l4j/impl/modules/client/DiscordRPC.java b/src/main/java/wtf/l4j/impl/modules/client/DiscordRPC.java
@@ -0,0 +1,22 @@
+package wtf.l4j.impl.modules.client;
+
+import wtf.l4j.CurryMod;
+import wtf.l4j.api.module.Category;
+import wtf.l4j.api.module.Module;
+import wtf.l4j.api.module.ModuleInfo;
+
+@ModuleInfo(name = "DiscordRPC", desc = "discord rpc", category = Category.CLIENT)
+public class DiscordRPC extends Module {
+
+    @Override
+    public void onEnable() {
+        CurryMod.getInstance().getDiscordRP().start();
+        super.onEnable();
+    }
+
+    @Override
+    public void onDisable() {
+        CurryMod.getInstance().getDiscordRP().stop();
+        super.onDisable();
+    }
+}
diff --git a/src/main/java/wtf/l4j/impl/modules/combat/TotemPopCounter.java b/src/main/java/wtf/l4j/impl/modules/combat/TotemPopCounter.java
@@ -28,7 +28,7 @@ public class TotemPopCounter extends Module implements PacketListener, DeathList
     public TotemPopCounter() {
         addOptions(mode);
     }
-    private final Map<String, Integer> Mappings = new HashMap<>();
+    private final Map<String, Integer> mappings = new HashMap<>();
 
     @Override
     public void onEnable() {
@@ -49,35 +49,35 @@ public void onDisable() {
 
     @Override
     public void onPacket(PacketListener.PacketEvent packetEvent) {
-        if(mc.player != null && packetEvent.getPacket() instanceof EntityStatusS2CPacket status) {
-            if(status.getStatus() == 35) {
-                Entity entity = status.getEntity(mc.world);
+        if(!nullCheck() && packetEvent.getPacket() instanceof EntityStatusS2CPacket packet) {
+            if(packet.getStatus() == 35) {
+                Entity entity = packet.getEntity(mc.world);
                 if(!(entity instanceof PlayerEntity) || entity == mc.player) return;
 
-                int amount = Mappings.getOrDefault(entity.getName().getString(), 0) + 1;
-                Mappings.put(entity.getName().getString(), amount);
+                int amount = mappings.getOrDefault(entity.getName().getString(), 0) + 1;
+                mappings.put(entity.getName().getString(), amount);
 
-                ChatHelper.basicMessage(GRAY + "[" + YELLOW + mode.getMode() + GRAY + "] " + WHITE + entity.getName().getString() + " has popped");
+                ChatHelper.basicMessage(GRAY + "[" + YELLOW + mode.getMode() + GRAY + "] " + WHITE + entity.getName().getString() + " has popped %s totems".formatted(amount));
             }
         }
     }
 
     @Override
     public void onDeath(DeathListener.LivingDeathEvent deathEvent) {
-        if(Mappings.containsKey(deathEvent.getEntity().getName().getString())) Mappings.put(deathEvent.getEntity().getName().getString(), 0);
+        if(mappings.containsKey(deathEvent.getEntity().getName().getString())) mappings.put(deathEvent.getEntity().getName().getString(), 0);
     }
 
     @Override
     public void onGameTick() {
         assert mc.player != null;
         if(mc.player.age % 10 != 0) return;
 
-        Mappings.keySet().forEach(entity -> {
+        mappings.keySet().forEach(entity -> {
             assert mc.world != null;
             Optional<AbstractClientPlayerEntity> optionalPlayerEntity = mc.world.getPlayers().stream().filter(playerEntity -> playerEntity.getName().getString().equals(entity)).findFirst();
             if(optionalPlayerEntity.isPresent()) {
                 PlayerEntity player = optionalPlayerEntity.get();
-                if(player.isDead() || player.getHealth() <= 0) Mappings.put(entity, 0);
+                if(player.isDead() || player.getHealth() <= 0) mappings.put(entity, 0);
             }
         });
     }

diff --git a/src/main/java/wtf/l4j/impl/modules/combat/Velocity.java b/src/main/java/wtf/l4j/impl/modules/combat/Velocity.java
@@ -2,6 +2,7 @@
 
 import de.florianmichael.dietrichevents2.DietrichEvents2;
 
+import net.minecraft.network.packet.s2c.common.CommonPingS2CPacket;
 import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
 import net.minecraft.network.packet.s2c.play.ExplosionS2CPacket;
 
@@ -18,6 +19,7 @@ public class Velocity extends Module implements PacketListener {
 
     public static OptionBoolean push = new OptionBoolean("NoPush", true);
 
+
     public Velocity(){
         addOptions(push);
     }
@@ -36,6 +38,7 @@ public void onDisable() {
 
     @Override
     public void onPacket(PacketEvent packetEvent) {
+        if(nullCheck()){return;}
         if(packetEvent.getType() ==  Type.INCOMING) {
             if (packetEvent.getPacket() instanceof EntityVelocityUpdateS2CPacket packet) {
                 if (packet.getId() == mc.player.getId()) {