Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Fix ArrayList module overlap bug #834

Merged
merged 47 commits into from
Nov 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
8fdc6b8
Improve HypixelFireball mode of LongJump
xia-mc Oct 1, 2024
91dac33
Fix BedProximityAlert badpacket!
xia-mc Oct 1, 2024
2a20901
Fix Inventory click
xia-mc Oct 2, 2024
60bc236
Improve Hypixel mode of Tower
xia-mc Oct 2, 2024
bb920ca
Fix 'Fix hypixel switch (beta)' of KillAura
xia-mc Oct 2, 2024
9fdca57
Improve LegitScaffold
xia-mc Oct 2, 2024
0744fbb
Improve RageBot
xia-mc Oct 2, 2024
ef00018
Recode rapid fire of RageBot
xia-mc Oct 3, 2024
6376c67
Adds (the rest) of the murder mystery weapon skins (#808)
smugvee Oct 3, 2024
417168d
Fix Store mode of RapidFire of RageBot
xia-mc Oct 3, 2024
fd3cd7b
Merge remote-tracking branch 'origin/dev' into dev
xia-mc Oct 3, 2024
153274a
Fix strafe speed
xia-mc Oct 3, 2024
623e4b5
Add 'Big angle' to AntiAim
xia-mc Oct 4, 2024
1080443
Fix RageBot
xia-mc Oct 4, 2024
541daf3
Try to fix the rotate timing
xia-mc Oct 5, 2024
c459ba9
Add MyauTargetHUD,Improve other TargetHUD (#810)
KgDW Oct 6, 2024
c608340
Add MyauTargetHUD,Improve other TargetHUD
KgDW Oct 5, 2024
6237605
Add MyauTargetHUD,Improve other TargetHUD
KgDW Oct 5, 2024
858b4b8
Add MyauTargetHUD,Improve other TargetHUD
KgDW Oct 5, 2024
2c0e729
Improve TargetHUD
KgDW Oct 6, 2024
76d4aa5
Fixed drawRoundedRectangle issue
KgDW Oct 6, 2024
2e4f69e
Fixed MyauTargetHUD healthBar issue
KgDW Oct 6, 2024
24c910a
Fixed drawRoundedRectangle issue
KgDW Oct 6, 2024
0c68cde
Improve performance
xia-mc Oct 6, 2024
9540a6d
Merge remote-tracking branch 'origin/dev' into dev
xia-mc Oct 6, 2024
a68cea4
Merge branch 'xia-mc:dev' into dev
KgDW Oct 6, 2024
8987793
Improve MyauTargetHUD
KgDW Oct 6, 2024
87e631e
Merge remote-tracking branch 'origin/dev' into dev
KgDW Oct 6, 2024
65b5c62
Fix movefix
xia-mc Oct 16, 2024
e1fbc8a
Fix Phase
xia-mc Oct 17, 2024
020a6cc
Add Motion mode to HypixelFireball mode of LongJump
xia-mc Oct 17, 2024
6b08a91
revert HypixelTower
xia-mc Oct 17, 2024
98a62fb
Add 'Strafe' to Hypixel mode of Speed.
xia-mc Oct 18, 2024
2d129b7
Merge remote-tracking branch 'origin/dev' into dev
KgDW Oct 18, 2024
fd5e99a
Recode BlocksMCSpeed
xia-mc Oct 23, 2024
4f1e1a2
Update to 2.9.1-Beta
xia-mc Oct 23, 2024
a0fd3d0
Add 'Fix simulation watchdog' to RotationHandler
xia-mc Oct 23, 2024
fb7bdd5
Fix Ping
xia-mc Oct 23, 2024
caec37b
Add 'smartblock', 'blockonlywhileswinging', 'blockonlywhilehurt', 'sl…
xia-mc Oct 24, 2024
6a7dcbd
Fix GrimACVelocity doesn't work without KeepSprint
xia-mc Oct 24, 2024
f24de0b
Fix AutoGapple
xia-mc Oct 24, 2024
a4f92a9
Add 'Advanced' mode to Grim mode of Velocity
xia-mc Oct 24, 2024
fdf57bc
Add ArrayList
xia-mc Oct 26, 2024
26eb489
I give up
xia-mc Oct 26, 2024
d319ea0
Merge remote-tracking branch 'origin/dev' into dev
KgDW Oct 26, 2024
047917c
Merge remote-tracking branch 'origin/dev' into dev
KgDW Nov 1, 2024
f0e19e3
Fix ArrayList module overlap bug
KgDW Nov 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ apply plugin: 'java'

group = "keystrokesmod"
archivesBaseName = "raven-XD"
//version = "Dev"
version = "Dev"
KgDW marked this conversation as resolved.
Show resolved Hide resolved

compileJava {
sourceCompatibility = '1.8'
Expand Down
37 changes: 17 additions & 20 deletions src/main/java/keystrokesmod/module/impl/render/ArrayList.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import keystrokesmod.module.Module;
import keystrokesmod.module.ModuleManager;
import keystrokesmod.module.impl.combat.KillAura;
import keystrokesmod.module.impl.render.arraylist.ArrayListModule;
import keystrokesmod.module.setting.impl.*;
import keystrokesmod.utility.Theme;
Expand All @@ -22,7 +21,6 @@

import java.awt.*;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;

public class ArrayList extends Module implements Moveable {
Expand Down Expand Up @@ -88,7 +86,7 @@ public void render() {
final IFont font = FontManager.getFont(FontManager.Fonts.TENACITY, (int) (20 * size.getInput()));
final double height = font.height();

updateArrayList(font);
updateArrayList();

final ScaledResolution sr = new ScaledResolution(mc);
moveX(Utils.limit(minX, 0, sr.getScaledWidth()) - minX);
Expand All @@ -98,7 +96,7 @@ public void render() {
int nextMaxX = minX;
int nextMaxY = minY;

final double shadowExtra = 1 * size.getInput();
final double shadowExtra = size.getInput() * 0.5;
final double lineInterval = shadowExtra * 3;
final int enableX = right.isToggled() ? maxX : minX;
for (ArrayListModule module : mapping.values()) {
Expand Down Expand Up @@ -178,22 +176,23 @@ public void render() {
}
}

private void updateArrayList(IFont font) {
private void updateArrayList() {
final int[] renderingIndex = {0};
ModuleManager.organizedModules.parallelStream()
ModuleManager.organizedModules.stream()
.filter(this::canRender)
.map(module -> {
if (!mapping.containsKey(module)) {
return mapping.put(module, new ArrayListModule(module));
.forEach(module -> {
ArrayListModule arrayListModule = mapping.get(module);
if (module.isEnabled()) {
if (arrayListModule == null) {
mapping.put(module, new ArrayListModule(module));
}
if (arrayListModule != null) {
arrayListModule.onUpdate(renderingIndex[0]);
}
KgDW marked this conversation as resolved.
Show resolved Hide resolved
renderingIndex[0]++;
} else {
mapping.remove(module);
}
return mapping.get(module);
})
.filter(Objects::nonNull)
.sorted((c1, c2) -> Double.compare(font.width(getText(c2)), font.width(getText(c1))))
.forEachOrdered(module -> {
module.onUpdate(renderingIndex[0]);
if (module.getModule().isEnabled())
renderingIndex[0] += 1;
});
}

Expand All @@ -214,9 +213,7 @@ private boolean canRender(@NotNull Module module) {
if (module.moduleCategory() == category.client && !client.isToggled()) return false;
if (module.moduleCategory() == category.scripts && !scripts.isToggled()) return false;
if (module.moduleCategory() == category.exploit && !exploit.isToggled()) return false;
if (module.moduleCategory() == category.experimental && !experimental.isToggled()) return false;

return true;
return module.moduleCategory() != category.experimental || experimental.isToggled();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void onUpdate(int index) {
}

public boolean shouldRender() {
return animeX.getValue() != 0;
return module.isEnabled();
KgDW marked this conversation as resolved.
Show resolved Hide resolved
}

public String getName() {
Expand Down
Loading