diff --git a/src/main/java/net/shadow/client/feature/command/impl/Taco.java b/src/main/java/net/shadow/client/feature/command/impl/Taco.java index ad38ad4..ca058a1 100644 --- a/src/main/java/net/shadow/client/feature/command/impl/Taco.java +++ b/src/main/java/net/shadow/client/feature/command/impl/Taco.java @@ -31,7 +31,7 @@ import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; public class Taco extends Command { - public static final File storage = new File(ShadowMain.BASE, "taco.sip"); + public static final File storage = new File(ShadowMain.BASE, "taco.shadow"); public static final List frames = new ArrayList<>(); public static final AtomicBoolean init = new AtomicBoolean(false); static final File gifPath = new File(ShadowMain.BASE, "tacoFrames"); diff --git a/src/main/java/net/shadow/client/feature/gui/clickgui/ClickGUI.java b/src/main/java/net/shadow/client/feature/gui/clickgui/ClickGUI.java index 9a4372c..7f9e2e6 100644 --- a/src/main/java/net/shadow/client/feature/gui/clickgui/ClickGUI.java +++ b/src/main/java/net/shadow/client/feature/gui/clickgui/ClickGUI.java @@ -42,7 +42,7 @@ public class ClickGUI extends Screen implements FastTickable { // public static final Theme theme = new SipoverV1(); static final Color tooltipColor = new Color(20, 20, 30, 255); - static final ConfigContainer configContainer = new ConfigContainer(new File(ShadowMain.BASE, "clickGui.sip"), "amongUs"); + static final ConfigContainer configContainer = new ConfigContainer(new File(ShadowMain.BASE, "clickGui.shadow"), "amongUs"); private static ClickGUI instance; final List elements = new ArrayList<>(); final NibletRenderer real = new NibletRenderer(100); diff --git a/src/main/java/net/shadow/client/feature/gui/hud/HudRenderer.java b/src/main/java/net/shadow/client/feature/gui/hud/HudRenderer.java index d81fd7d..9c3d4b3 100644 --- a/src/main/java/net/shadow/client/feature/gui/hud/HudRenderer.java +++ b/src/main/java/net/shadow/client/feature/gui/hud/HudRenderer.java @@ -30,7 +30,7 @@ import java.util.List; public class HudRenderer { - static final File CONFIG = new File(ShadowMain.BASE, "hud.sip"); + static final File CONFIG = new File(ShadowMain.BASE, "hud.shadow"); private static HudRenderer INSTANCE; final List elements = register(); boolean isEditing = false; diff --git a/src/main/java/net/shadow/client/feature/gui/screen/AltManagerScreen.java b/src/main/java/net/shadow/client/feature/gui/screen/AltManagerScreen.java index cf6a1be..e6718ba 100644 --- a/src/main/java/net/shadow/client/feature/gui/screen/AltManagerScreen.java +++ b/src/main/java/net/shadow/client/feature/gui/screen/AltManagerScreen.java @@ -58,7 +58,7 @@ import java.util.stream.Collectors; public class AltManagerScreen extends ClientScreen implements FastTickable { public static final Map texCache = new HashMap<>(); - static final File ALTS_FILE = new File(ShadowMain.BASE, "alts.sip"); + static final File ALTS_FILE = new File(ShadowMain.BASE, "alts.shadow"); static final String TOP_NOTE = """ // DO NOT SHARE THIS FILE // This file contains sensitive information about your accounts diff --git a/src/main/java/net/shadow/client/feature/module/ModuleRegistry.java b/src/main/java/net/shadow/client/feature/module/ModuleRegistry.java index e3f9bb5..b794494 100644 --- a/src/main/java/net/shadow/client/feature/module/ModuleRegistry.java +++ b/src/main/java/net/shadow/client/feature/module/ModuleRegistry.java @@ -264,7 +264,7 @@ public class ModuleRegistry { registerModule(NoFall.class); registerModule(ESP.class); registerModule(Tracers.class); - //registerModule(Hyperspeed.class); + registerModule(Hyperspeed.class); registerModule(AntiAnvil.class); registerModule(Swing.class); registerModule(AimAssist.class); diff --git a/src/main/java/net/shadow/client/feature/module/impl/crash/SwapCrash.java b/src/main/java/net/shadow/client/feature/module/impl/crash/SwapCrash.java index 3c192dd..fe09952 100644 --- a/src/main/java/net/shadow/client/feature/module/impl/crash/SwapCrash.java +++ b/src/main/java/net/shadow/client/feature/module/impl/crash/SwapCrash.java @@ -8,6 +8,8 @@ import java.util.Random; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.entity.Entity; +import net.minecraft.entity.vehicle.BoatEntity; import net.shadow.client.feature.config.DoubleSetting; import net.shadow.client.feature.module.Module; import net.shadow.client.feature.module.ModuleType; @@ -18,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.network.packet.c2s.play.ButtonClickC2SPacket; import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket; +import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.network.packet.c2s.play.SelectMerchantTradeC2SPacket; import net.minecraft.network.packet.c2s.play.UpdateCommandBlockC2SPacket; @@ -29,29 +32,16 @@ public class SwapCrash extends Module { public SwapCrash() { - super("SwapCrash", "funny crash v2", ModuleType.CRASH); + super("AllahCrash", "funny crash v2", ModuleType.CRASH); } @Override public void tick() { - Int2ObjectMap ripbozo = new Int2ObjectArrayMap<>(); - ripbozo.put(0, new ItemStack(Items.ACACIA_BOAT, 1)); - for (int i = 0; i < pwr.getValue(); i++) { - client.player.networkHandler.sendPacket( - new ClickSlotC2SPacket( - client.player.currentScreenHandler.syncId, - 123344, - 36 + 9, - 2859623, - SlotActionType.PICKUP, - new ItemStack(Items.AIR, -1), - ripbozo - ) - ); - } + Entity e = new BoatEntity(client.world, 0, 0, 0); + PlayerInteractEntityC2SPacket packet = PlayerInteractEntityC2SPacket.attack(e, false); + client.player.networkHandler.getConnection().send(packet); } - - @Override + public void enable() { } diff --git a/src/main/java/net/shadow/client/helper/GameTexture.java b/src/main/java/net/shadow/client/helper/GameTexture.java index 50c86f1..f4b52c9 100644 --- a/src/main/java/net/shadow/client/helper/GameTexture.java +++ b/src/main/java/net/shadow/client/helper/GameTexture.java @@ -7,13 +7,13 @@ package net.shadow.client.helper; import lombok.Getter; public enum GameTexture { - TEXTURE_ICON(new Texture("tex/icon"), "https://gitlab.com/0x151/coffee-fs/-/raw/main/icon.png"), + TEXTURE_ICON(new Texture("tex/icon"), "https://github.com/Saturn5Vfive/ShadowClient/blob/main/icon.png?raw=true"), TEXTURE_BACKGROUND(new Texture("tex/background"), "https://gitlab.com/0x151/coffee-fs/-/raw/main/background.jpg?inline=false"), - TEXTURE_LOGO(new Texture("tex/logo"), "https://gitlab.com/0x151/coffee-fs/-/raw/main/shadow_logo.png"), - TEXTURE_ICON_FULL(new Texture("tex/iconFull"), "https://gitlab.com/0x151/coffee-fs/-/raw/main/shadowLogoFull.png?inline=false"), + TEXTURE_LOGO(new Texture("tex/logo"), "https://github.com/Saturn5Vfive/ShadowClient/blob/main/shadow_logo.png?raw=true"), + TEXTURE_ICON_FULL(new Texture("tex/iconFull"), "https://github.com/Saturn5Vfive/ShadowClient/blob/main/shadowLogoFull.png?raw=true"), NOTIF_ERROR(new Texture("notif/error"), "https://gitlab.com/0x151/coffee-fs/-/raw/main/error.png"), - NOTIF_INFO(new Texture("notif/info"), "https://gitlab.com/0x151/coffee-fs/-/raw/main/info.png"), + NOTIF_INFO(new Texture("notif/info"), "https://github.com/Saturn5Vfive/ShadowClient/blob/main/appointment-reminders.png?raw=true"), NOTIF_SUCCESS(new Texture("notif/success"), "https://gitlab.com/0x151/coffee-fs/-/raw/main/success.png"), NOTIF_WARNING(new Texture("notif/warning"), "https://gitlab.com/0x151/coffee-fs/-/raw/main/warning.png"), diff --git a/src/main/java/net/shadow/client/helper/manager/ConfigManager.java b/src/main/java/net/shadow/client/helper/manager/ConfigManager.java index 9069455..e183dfe 100644 --- a/src/main/java/net/shadow/client/helper/manager/ConfigManager.java +++ b/src/main/java/net/shadow/client/helper/manager/ConfigManager.java @@ -34,7 +34,7 @@ public class ConfigManager { public static boolean enabled = false; static { - CONFIG_FILE = new File(ShadowMain.BASE, "config.sip"); + CONFIG_FILE = new File(ShadowMain.BASE, "config.shadow"); } /** diff --git a/src/main/java/net/shadow/client/mixin/Deadmau5FeatureRendererMixin.java b/src/main/java/net/shadow/client/mixin/Deadmau5FeatureRendererMixin.java index 3b9d4dc..71a750d 100644 --- a/src/main/java/net/shadow/client/mixin/Deadmau5FeatureRendererMixin.java +++ b/src/main/java/net/shadow/client/mixin/Deadmau5FeatureRendererMixin.java @@ -15,20 +15,4 @@ import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(Deadmau5FeatureRenderer.class) public class Deadmau5FeatureRendererMixin { - - @Redirect(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/network/AbstractClientPlayerEntity;FFFFFF)V", at = @At(value = "INVOKE", target = "Ljava/lang/String;equals(Ljava/lang/Object;)Z")) - boolean overwriteNameMatcher(String s, Object anObject) { - if (ModuleRegistry.getByClass(MouseEars.class).isEnabled()) { - return true; - } - return s.equals(anObject); - } - - @Redirect(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/network/AbstractClientPlayerEntity;FFFFFF)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;hasSkinTexture()Z")) - boolean overwriteSkinTexture(AbstractClientPlayerEntity abstractClientPlayerEntity) { - if (ModuleRegistry.getByClass(MouseEars.class).isEnabled()) { - return true; - } - return abstractClientPlayerEntity.hasSkinTexture(); - } }