Skip to content

Commit

Permalink
Release 8
Browse files Browse the repository at this point in the history 
additions
- added AutoRequeue, clicks on "play again" messages
- added Sky Wars (Strength indicators)
- added Modern & Edit position to targethud
- added Spoof item to autoswap & autotool

fixes, improvements, misc
- improved scaffold
  - added Cancel knockback & fading to block text
  - fixed speed potions ghosting
- improved invmanager (reworked settings)
- improved antiknockback (added Cancel burning/while falling)
- improved autotool (added Only while crouching, fixed sometimes not swapping back)
- improved bhop (more options)
- improved chams (added Render self, fixed depth issue)
- improved invmove (added new Blink mode)
- improved tower (added Low, added Disable in liquid)
- made trajectory green when target is top block
- made pit spawn in antibot a slider
- fixed autowho with foreign languages
- fixed chestesp not rendering accurate box
- fixed various modules jumping in water
- more changes & fixes to script wrappers
  • Loading branch information
@Strangerrrs
Strangerrrs committed Aug 27, 2024
1 parent c0c5a6b commit 7c32515
Show file tree
Hide file tree
Showing 105 changed files with 2,550 additions and 1,009 deletions.
10 changes: 9 additions & 1 deletion src/main/java/keystrokesmod/Raven.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,28 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;

import keystrokesmod.event.PostRenderGameOverlay;
import keystrokesmod.event.PostRenderUpdate;
import keystrokesmod.event.PreRenderGameOverlay;
import keystrokesmod.event.PreRenderUpdate;
import keystrokesmod.keystroke.KeySrokeRenderer;
import keystrokesmod.keystroke.KeyStrokeConfigGui;
import keystrokesmod.keystroke.keystrokeCommand;
import keystrokesmod.module.Module;
import keystrokesmod.clickgui.ClickGui;
import keystrokesmod.module.ModuleManager;
import keystrokesmod.module.impl.client.Gui;
import keystrokesmod.module.impl.player.Tower;
import keystrokesmod.script.ScriptManager;
import keystrokesmod.utility.*;
import keystrokesmod.utility.profile.Profile;
import keystrokesmod.utility.profile.ProfileManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraftforge.client.ClientCommandHandler;
import net.minecraftforge.client.event.GuiOpenEvent;
import net.minecraftforge.client.event.GuiScreenEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
Expand All @@ -42,7 +51,6 @@ public class Raven {
public static ScriptManager scriptManager;
public static Profile currentProfile;
public static BadPacketsHandler badPacketsHandler;
private boolean loaded = false;

public Raven() {
moduleManager = new ModuleManager();
Expand Down
29 changes: 27 additions & 2 deletions src/main/java/keystrokesmod/clickgui/ClickGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@
import keystrokesmod.utility.Commands;
import keystrokesmod.utility.Timer;
import keystrokesmod.utility.Utils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.gui.inventory.GuiInventory;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraftforge.client.event.GuiScreenEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.client.config.GuiButtonExt;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
Expand All @@ -39,6 +42,8 @@ public class ClickGui extends GuiScreen {
private GuiButtonExt commandLineSend;
private GuiTextField commandLineInput;
public static ArrayList<CategoryComponent> categories;
public int originalScale;
private int blurBackground = new Color(0, 0, 0, 200).getRGB();

public ClickGui() {
categories = new ArrayList();
Expand Down Expand Up @@ -67,6 +72,7 @@ public void initMain() {
}
}

@Override
public void initGui() {
super.initGui();
this.sr = new ScaledResolution(this.mc);
Expand All @@ -76,9 +82,10 @@ public void initGui() {
}

public void drawScreen(int x, int y, float p) {
drawRect(0, 0, this.width, this.height, (int) (this.aR.getValueFloat(0.0F, 0.7F, 2) * 255.0F) << 24);
if (Gui.darkBackground.isToggled()) {
drawRect(0, 0, this.width, this.height, (int) (this.aR.getValueFloat(0.0F, 0.7F, 2) * 255.0F) << 24);
}
int r;

if (!Gui.removeWatermark.isToggled()) {
int h = this.height / 4;
int wd = this.width / 2;
Expand Down Expand Up @@ -215,6 +222,22 @@ public void handleMouseInput() throws IOException {
}
}

@Override
public void setWorldAndResolution(Minecraft p_setWorldAndResolution_1_, final int p_setWorldAndResolution_2_, final int p_setWorldAndResolution_3_) {
this.mc = p_setWorldAndResolution_1_;
originalScale = this.mc.gameSettings.guiScale;
this.mc.gameSettings.guiScale = (int) Gui.guiScale.getInput() + 1;
this.itemRender = p_setWorldAndResolution_1_.getRenderItem();
this.fontRendererObj = p_setWorldAndResolution_1_.fontRendererObj;
final ScaledResolution scaledresolution = new ScaledResolution(this.mc);
this.width = scaledresolution.getScaledWidth();
this.height = scaledresolution.getScaledHeight();
if (!MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.InitGuiEvent.Pre(this, this.buttonList))) {
this.buttonList.clear();
this.initGui();
}
MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.InitGuiEvent.Post(this, this.buttonList));
}

@Override
public void keyTyped(char t, int k) {
Expand Down Expand Up @@ -250,6 +273,7 @@ public void actionPerformed(GuiButton b) {
}
}

@Override
public void onGuiClosed() {
this.aL = null;
if (this.sf != null) {
Expand All @@ -262,6 +286,7 @@ public void onGuiClosed() {
m.onGuiClosed();
}
}
this.mc.gameSettings.guiScale = originalScale;
}

public boolean doesGuiPauseGame() {
Expand Down
26 changes: 15 additions & 11 deletions src/main/java/keystrokesmod/clickgui/components/impl/CategoryComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ public class CategoryComponent {
private float big;
private float bigSettings;
private final int translucentBackground = new Color(0, 0, 0, 110).getRGB();
private final int background = new Color(0, 0, 0, 255).getRGB();
private final int regularOutline = new Color(81, 99, 149).getRGB();
private final int regularOutline2 = new Color(97, 67, 133).getRGB();
private final int categoryNameColor = new Color(220, 220, 220).getRGB();
private float lastHeight;
public int moduleY;
private int lastModuleY;
private int screenHeight;
private boolean scrolled;

public CategoryComponent(Module.category category) {
this.categoryName = category;
Expand Down Expand Up @@ -150,13 +150,14 @@ public void onScroll(int mouseScrollInput) {
if (!hoveringOverCategory || !this.opened) {
return;
}

int scrollSpeed = (int) Gui.scrollSpeed.getInput();
if (mouseScrollInput > 0) {
this.moduleY += 18;
this.moduleY += scrollSpeed;
}
else if (mouseScrollInput < 0) {
this.moduleY -= 18;
this.moduleY -= scrollSpeed;
}
scrolled = true;

(moduleSmoothTimer = new Timer(200)).start();
}
Expand All @@ -174,14 +175,10 @@ public void render(FontRenderer renderer) {
while (iterator.hasNext()) {
ModuleComponent c = iterator.next();
settingsHeight += c.getHeight();
if (modulesHeight > this.screenHeight - 80) { // max category height
continue;
}
if (this.y + this.titleHeight + c.getHeight() + modulesHeight > this.y + this.titleHeight + (16 * this.modules.size())) {
modulesHeight += c.getHeight();
if (modulesHeight + c.getHeight() > this.screenHeight - 40) { // max category height
continue;
}
modulesHeight += 16;
modulesHeight += c.getHeight();
}
big = modulesHeight;
bigSettings = settingsHeight;
Expand All @@ -206,11 +203,18 @@ else if (diff > 0) {
if (!this.opened) {
namePos = textTimer == null ? xPos : middlePos - textTimer.getValueFloat(0, this.width / 2 - Minecraft.getMinecraft().fontRendererObj.getStringWidth(this.categoryName.name()) / 2 - 12, 1);
}
if (scrolled && lastModuleY != moduleY) {
moduleY = (int) moduleSmoothTimer.getValueFloat(lastModuleY, moduleY, 1);
}
else {
scrolled = false;
lastModuleY = moduleY;
}
lastHeight = extra;
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_SCISSOR_TEST);
RenderUtils.scissor(0, this.y - 2, this.x + this.width + 4, extra - this.y + 4);
RenderUtils.drawRoundedGradientOutlinedRectangle(this.x - 2, this.y, this.x + this.width + 2, extra, 9, Gui.translucentBackground.isToggled() ? translucentBackground : background,
RenderUtils.drawRoundedGradientOutlinedRectangle(this.x - 2, this.y, this.x + this.width + 2, extra, 9, translucentBackground,
((opened || hovering) && Gui.rainBowOutlines.isToggled()) ? RenderUtils.setAlpha(Utils.getChroma(2, 0), 0.5) : regularOutline, ((opened || hovering) && Gui.rainBowOutlines.isToggled()) ? RenderUtils.setAlpha(Utils.getChroma(2, 700), 0.5) : regularOutline2);
renderItemForCategory(this.categoryName, this.x + 1, this.y + 4, opened || hovering);
renderer.drawString(this.n4m ? this.pvp : this.categoryName.name(), namePos, (float) (this.y + 4), categoryNameColor, false);
Expand Down
40 changes: 27 additions & 13 deletions src/main/java/keystrokesmod/clickgui/components/impl/ModuleComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import keystrokesmod.module.setting.impl.DescriptionSetting;
import keystrokesmod.module.setting.impl.SliderSetting;
import keystrokesmod.utility.RenderUtils;
import keystrokesmod.utility.Timer;
import keystrokesmod.utility.Utils;
import keystrokesmod.utility.profile.Manager;
import keystrokesmod.utility.profile.ProfileModule;
import net.minecraft.client.Minecraft;
Expand All @@ -18,8 +20,9 @@
import java.util.Iterator;

public class ModuleComponent extends Component {
private int originalHoverAlpha = 120;
private final int c2 = (new Color(154, 2, 255)).getRGB();
private final int hoverColor = (new Color(0, 0, 0, 110)).getRGB();
private final int hoverColor = (new Color(0, 0, 0, originalHoverAlpha)).getRGB();
private final int unsavedColor = new Color(114, 188, 250).getRGB();
private final int invalidColor = new Color(255, 80, 80).getRGB();
private final int enabledColor = new Color(24, 154, 255).getRGB();
Expand All @@ -30,6 +33,7 @@ public class ModuleComponent extends Component {
public ArrayList<Component> settings;
public boolean isOpened;
private boolean hovering;
private Timer hoverTimer;

public ModuleComponent(Module mod, CategoryComponent p, int o) {
this.mod = mod;
Expand Down Expand Up @@ -102,22 +106,18 @@ public static void f() {
GL11.glEdgeFlag(true);
}

public static void g(int h) {
float a = 0.0F;
float r = 0.0F;
float g = 0.0F;
float b = 0.0F;
GL11.glColor4f(r, g, b, a);
public static void g() {
GL11.glColor4f(0.0F, 0.0F, 0.0F, 0.0F);
}

public static void v(float x, float y, float x1, float y1, int t, int b) {
e();
GL11.glShadeModel(7425);
GL11.glBegin(7);
g(t);
g();
GL11.glVertex2f(x, y1);
GL11.glVertex2f(x1, y1);
g(b);
g();
GL11.glVertex2f(x1, y);
GL11.glVertex2f(x, y);
GL11.glEnd();
Expand All @@ -127,7 +127,12 @@ public static void v(float x, float y, float x1, float y1, int t, int b) {

public void render() {
if (hovering) {
RenderUtils.drawRoundedRectangle(this.categoryComponent.getX(), this.categoryComponent.getY() + o, this.categoryComponent.getX() + this.categoryComponent.getWidth(), this.categoryComponent.getY() + 16 + this.o, 8, hoverColor);
double hoverAlpha = hoverTimer == null ? originalHoverAlpha : originalHoverAlpha - hoverTimer.getValueFloat(0, originalHoverAlpha, 1);
if (hoverAlpha == 0) {
hoverTimer = null;
hovering = false;
}
RenderUtils.drawRoundedRectangle(this.categoryComponent.getX(), this.categoryComponent.getY() + o, this.categoryComponent.getX() + this.categoryComponent.getWidth(), this.categoryComponent.getY() + 16 + this.o, 8, Utils.mergeAlpha(hoverColor, (int) hoverAlpha));
}
v((float) this.categoryComponent.getX(), (float) (this.categoryComponent.getY() + this.o), (float) (this.categoryComponent.getX() + this.categoryComponent.getWidth()), (float) (this.categoryComponent.getY() + 15 + this.o), this.mod.isEnabled() ? this.c2 : -12829381, this.mod.isEnabled() ? this.c2 : -12302777);
GL11.glPushMatrix();
Expand All @@ -150,7 +155,8 @@ public void render() {
public int getHeight() {
if (!this.isOpened) {
return 16;
} else {
}
else {
int h = 16;
Iterator var2 = this.settings.iterator();

Expand All @@ -159,7 +165,8 @@ public int getHeight() {
Component c = (Component) var2.next();
if (c instanceof SliderComponent) {
h += 16;
} else if (c instanceof ButtonComponent || c instanceof BindComponent || c instanceof DescriptionComponent) {
}
else if (c instanceof ButtonComponent || c instanceof BindComponent || c instanceof DescriptionComponent) {
h += 12;
}
}
Expand All @@ -179,7 +186,14 @@ public void drawScreen(int x, int y) {
hovering = true;
}
else {
hovering = false;
if (hovering) {
if (hoverTimer == null) {
(hoverTimer = new Timer(250)).start();
}
}
else {
hovering = false;
}
}
}

Expand Down
46 changes: 28 additions & 18 deletions src/main/java/keystrokesmod/clickgui/components/impl/SliderComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import keystrokesmod.Raven;
import keystrokesmod.clickgui.components.Component;
import keystrokesmod.module.Module;
import keystrokesmod.module.ModuleManager;
import keystrokesmod.module.setting.impl.SliderSetting;
import keystrokesmod.utility.RenderUtils;
Expand Down Expand Up @@ -44,16 +45,23 @@ public void render() {
GL11.glScaled(0.5D, 0.5D, 0.5D);
String value;
double input = this.sliderSetting.getInput();
String info = this.sliderSetting.getInfo();
if (input != 1 && (info.equals(" second") || info.equals(" block"))) {
info += "s";
String suffix = this.sliderSetting.getSuffix();
if (input == -1 && this.sliderSetting.canBeDisabled) {
value = "§cDisabled";
suffix = "";
}
if (this.sliderSetting.isString) {
value = this.sliderSetting.getOptions()[(int) this.sliderSetting.getInput()];
} else {
value = Utils.isWholeNumber(input) ? (int) input + "" : String.valueOf(input);
else {
if (input != 1 && (suffix.equals(" second") || suffix.equals(" block")) && this.moduleComponent.mod.moduleCategory() != Module.category.scripts) {
suffix += "s";
}
if (this.sliderSetting.isString) {
value = this.sliderSetting.getOptions()[(int) this.sliderSetting.getInput()];
}
else {
value = Utils.isWholeNumber(input) ? (int) input + "" : String.valueOf(input);
}
}
Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow(this.sliderSetting.getName() + ": " + (this.sliderSetting.isString ? "§e" : "§b") +value + info, (float) ((int) ((float) (this.moduleComponent.categoryComponent.getX() + 4) * 2.0F)), (float) ((int) ((float) (this.moduleComponent.categoryComponent.getY() + this.o + 3) * 2.0F)), -1);
Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow(this.sliderSetting.getName() + ": " + (this.sliderSetting.isString ? "§e" : "§b") +value + suffix, (float) ((int) ((float) (this.moduleComponent.categoryComponent.getX() + 4) * 2.0F)), (float) ((int) ((float) (this.moduleComponent.categoryComponent.getY() + this.o + 3) * 2.0F)), -1);
GL11.glPopMatrix();
}

Expand All @@ -65,25 +73,27 @@ public void drawScreen(int x, int y) {
this.y = this.moduleComponent.categoryComponent.getModuleY() + this.o;
this.x = this.moduleComponent.categoryComponent.getX();
double d = Math.min(this.moduleComponent.categoryComponent.getWidth() - 8, Math.max(0, x - this.x));
this.w = (double) (this.moduleComponent.categoryComponent.getWidth() - 8) * (this.sliderSetting.getInput() - this.sliderSetting.getMin()) / (this.sliderSetting.getMax() - this.sliderSetting.getMin());

if (this.heldDown) {
if (d == 0.0D) {
if (this.sliderSetting.getInput() != this.sliderSetting.getMin() && ModuleManager.hud != null && ModuleManager.hud.isEnabled() && !ModuleManager.organizedModules.isEmpty()) {
ModuleManager.sort();
}
this.sliderSetting.setValue(this.sliderSetting.getMin());
} else {
this.moduleComponent.mod.onSlide(this.sliderSetting);
if (d == 0.0D && this.sliderSetting.canBeDisabled) {
this.sliderSetting.setValueRaw(-1);
}
else {
double n = roundToInterval(d / (double) (this.moduleComponent.categoryComponent.getWidth() - 8) * (this.sliderSetting.getMax() - this.sliderSetting.getMin()) + this.sliderSetting.getMin(), 4);
if (this.sliderSetting.getInput() != n && ModuleManager.hud != null && ModuleManager.hud.isEnabled() && !ModuleManager.organizedModules.isEmpty()) {
ModuleManager.sort();
}
this.sliderSetting.setValue(n);
}

if (this.sliderSetting.getInput() != this.sliderSetting.getMin() && ModuleManager.hud != null && ModuleManager.hud.isEnabled() && !ModuleManager.organizedModules.isEmpty()) {
ModuleManager.sort();
}

if (Raven.currentProfile != null) {
((ProfileModule) Raven.currentProfile.getModule()).saved = false;
}
}

this.w = this.sliderSetting.getInput() == -1 ? 0 : (double) (this.moduleComponent.categoryComponent.getWidth() - 8) * (this.sliderSetting.getInput() - this.sliderSetting.getMin()) / (this.sliderSetting.getMax() - this.sliderSetting.getMin());
}

private static double roundToInterval(double v, int p) {
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/keystrokesmod/event/PostRenderGameOverlay.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package keystrokesmod.event;

import net.minecraftforge.fml.common.eventhandler.Event;

public class PostRenderGameOverlay extends Event {
}
6 changes: 6 additions & 0 deletions src/main/java/keystrokesmod/event/PostRenderUpdate.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package keystrokesmod.event;

import net.minecraftforge.fml.common.eventhandler.Event;

public class PostRenderUpdate extends Event {
}
6 changes: 6 additions & 0 deletions src/main/java/keystrokesmod/event/PreRenderGameOverlay.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package keystrokesmod.event;

import net.minecraftforge.fml.common.eventhandler.Event;

public class PreRenderGameOverlay extends Event {
}
Loading

0 comments on commit 7c32515

Please sign in to comment.