Skip to content

Commit f0e8e50

Browse files
committed
Added XPGUI, Added Flashing Tracers, Fixed NewerNewChunks, Other Fixes.
1 parent 7654c75 commit f0e8e50

18 files changed

Lines changed: 5491 additions & 144 deletions

src/main/java/net/wurstclient/altgui/AltGuiScreen.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import net.wurstclient.hacks.ClickGuiHack;
4545
import net.wurstclient.hacks.NavigatorHack;
4646
import net.wurstclient.hacks.TooManyHaxHack;
47+
import net.wurstclient.hacks.XpGuiHack;
4748
import net.wurstclient.keybinds.Keybind;
4849
import net.wurstclient.keybinds.PossibleKeybind;
4950
import net.wurstclient.other_feature.OtherFeature;
@@ -2054,7 +2055,7 @@ private List<Feature> getFilteredFeatures()
20542055
for(Hack hack : WurstClient.INSTANCE.getHax().getAllHax())
20552056
{
20562057
if(hack instanceof ClickGuiHack || hack instanceof NavigatorHack
2057-
|| hack instanceof AltGuiHack)
2058+
|| hack instanceof AltGuiHack || hack instanceof XpGuiHack)
20582059
continue;
20592060
if(hack == WurstClient.INSTANCE.getHax().globalToggleHack)
20602061
continue;
@@ -2230,7 +2231,7 @@ private List<DisplayEntry> getEnabledCategoryEntries()
22302231
for(Hack hack : WurstClient.INSTANCE.getHax().getAllHax())
22312232
{
22322233
if(hack instanceof ClickGuiHack || hack instanceof NavigatorHack
2233-
|| hack instanceof AltGuiHack)
2234+
|| hack instanceof AltGuiHack || hack instanceof XpGuiHack)
22342235
continue;
22352236
if(isHiddenByTooManyHax(hack))
22362237
continue;
@@ -2288,6 +2289,7 @@ private List<Feature> getClientSettingsFeatures()
22882289
features.add(WurstClient.INSTANCE.getHax().navigatorHack);
22892290
features.add(WurstClient.INSTANCE.getHax().clickGuiHack);
22902291
features.add(WurstClient.INSTANCE.getHax().altGuiHack);
2292+
features.add(WurstClient.INSTANCE.getHax().xpGuiHack);
22912293
return features;
22922294
}
22932295

@@ -2636,7 +2638,8 @@ private boolean featureHasStatePill(Feature feature)
26362638
if(isMenuOnlyFeature(feature))
26372639
return false;
26382640

2639-
if(feature instanceof ClickGuiHack || feature instanceof AltGuiHack)
2641+
if(feature instanceof ClickGuiHack || feature instanceof AltGuiHack
2642+
|| feature instanceof XpGuiHack)
26402643
return false;
26412644

26422645
String action = feature.getPrimaryAction();
@@ -2662,7 +2665,8 @@ private boolean isMenuOnlyFeature(Feature feature)
26622665
|| name.equalsIgnoreCase("WurstOptions")
26632666
|| name.equalsIgnoreCase("WurstLogo")
26642667
|| name.equalsIgnoreCase("ClickGUI")
2665-
|| name.equalsIgnoreCase("AltGUI"));
2668+
|| name.equalsIgnoreCase("AltGUI")
2669+
|| name.equalsIgnoreCase("XPGUI"));
26662670
}
26672671

26682672
private boolean isHiddenByTooManyHax(Feature feature)

src/main/java/net/wurstclient/hack/Hack.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import net.wurstclient.hacks.ClickGuiHack;
1616
import net.wurstclient.hacks.NavigatorHack;
1717
import net.wurstclient.hacks.TooManyHaxHack;
18+
import net.wurstclient.hacks.XpGuiHack;
1819
import net.wurstclient.util.HackToggleFeedback;
1920

2021
public abstract class Hack extends Feature
@@ -149,7 +150,8 @@ public final void setEnabled(boolean enabled)
149150
this.enabled = enabled;
150151

151152
if(!(this instanceof NavigatorHack || this instanceof ClickGuiHack
152-
|| this instanceof AltGuiHack) && WURST.getHud() != null)
153+
|| this instanceof AltGuiHack || this instanceof XpGuiHack)
154+
&& WURST.getHud() != null)
153155
WURST.getHud().getHackList().updateState(this);
154156

155157
if(enabled)

src/main/java/net/wurstclient/hack/HackList.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public final class HackList implements UpdateListener
115115
public final ClickAuraHack clickAuraHack = new ClickAuraHack();
116116
public final ClickGuiHack clickGuiHack = new ClickGuiHack();
117117
public final AltGuiHack altGuiHack = new AltGuiHack();
118+
public final XpGuiHack xpGuiHack = new XpGuiHack();
118119
public final CrashChestHack crashChestHack = new CrashChestHack();
119120
public final BundleDupeHack bundleDupeHack = new BundleDupeHack();
120121
public final CreativeFlightHack creativeFlightHack =

src/main/java/net/wurstclient/hacks/InvWalkHack.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import net.wurstclient.hack.Hack;
2424
import net.wurstclient.mixinterface.IKeyMapping;
2525
import net.wurstclient.settings.CheckboxSetting;
26+
import net.wurstclient.xpgui.XpGuiScreen;
2627

2728
@SearchTags({"inv walk", "inventory walk", "InvMove", "inv move",
2829
"inventory move", "MenuWalk", "menu walk"})
@@ -102,7 +103,8 @@ private boolean isAllowedScreen(Screen screen)
102103
&& !isCreativeSearchBarOpen(screen))
103104
return true;
104105

105-
if(allowClickGUI.isChecked() && screen instanceof ClickGuiScreen)
106+
if(allowClickGUI.isChecked() && (screen instanceof ClickGuiScreen
107+
|| screen instanceof XpGuiScreen))
106108
return true;
107109

108110
if(allowOther.isChecked() && screen instanceof AbstractContainerScreen

src/main/java/net/wurstclient/hacks/MapaHack.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import net.wurstclient.settings.SliderSetting;
6666
import net.wurstclient.settings.SliderSetting.ValueDisplay;
6767
import net.wurstclient.nicewurst.NiceWurstModule;
68+
import net.wurstclient.xpgui.XpGuiScreen;
6869

6970
@SearchTags({"map", "minimap", "world map", "mapa"})
7071
public final class MapaHack extends Hack
@@ -423,10 +424,16 @@ private void renderNewerNewChunksOverlay(GuiGraphicsExtractor context,
423424
int newColor = rgba(hack.getNewChunksColorI(), 36);
424425
int oldColor = rgba(hack.getOldChunksColorI(), 30);
425426
int blockColor = rgba(hack.getBlockExploitChunksColorI(), 32);
427+
int beingUpdatedColor = rgba(hack.getBeingUpdatedChunksColorI(), 34);
428+
int oldVersionColor = rgba(hack.getOldGenerationChunksColorI(), 32);
426429

427430
renderChunkSet(context, cfg, hack.getOldChunks(), oldColor);
428431
renderChunkSet(context, cfg, hack.getNewChunks(), newColor);
429432
renderChunkSet(context, cfg, hack.getBlockExploitChunks(), blockColor);
433+
renderChunkSet(context, cfg, hack.getBeingUpdatedChunks(),
434+
beingUpdatedColor);
435+
renderChunkSet(context, cfg, hack.getOldGenerationChunks(),
436+
oldVersionColor);
430437
}
431438

432439
private void renderExploredChunksOverlay(GuiGraphicsExtractor context,
@@ -1138,7 +1145,8 @@ private static boolean isEditorScreen(Screen screen)
11381145
{
11391146
return screen instanceof ClickGuiScreen
11401147
|| screen instanceof AltGuiScreen
1141-
|| screen instanceof NavigatorScreen;
1148+
|| screen instanceof NavigatorScreen
1149+
|| screen instanceof XpGuiScreen;
11421150
}
11431151

11441152
private int getMarkerSize(XMapConfig cfg)

0 commit comments

Comments
 (0)