Skip to content

Commit b9ee5d7

Browse files
committed
MaceDMG Improved
1 parent ac03fc5 commit b9ee5d7

5 files changed

Lines changed: 49 additions & 24 deletions

File tree

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,6 +1081,11 @@ Examples:
10811081
- Added safety/compat guards: null player check, skip while flying, and skip in water/lava.
10821082
- Speed is showin blocks per second (like Flight) in the HackList.
10831083

1084+
### MaceDMG Improved
1085+
- Now has a height slider which goes from 1.7 to 50, the default being 22.23
1086+
- In testing this made the Mace go from ~148 damage to ~295
1087+
- Can be used to reduce damage to be less suspicious or bypass anti-cheats
1088+
10841089
### Slider Override
10851090
- When running ```.setslider``` commands you can now exceed the limit of sliders in all hacks.
10861091
- Should only be used experimentally, will likely break the game or cause rubberbanding in a lot of hacks.

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ public final class ChestSearchHack extends Hack
6565
new CheckboxSetting("Chat notifications",
6666
"Show a chat notification when ChestSearch records a container.",
6767
false);
68+
private final CheckboxSetting lootMismatchNotifications =
69+
new CheckboxSetting("Loot mismatch notifications",
70+
"Show a chat notification when a chest does not match the loot table.",
71+
false);
6872
private final SliderSetting textScale = new SliderSetting("Text scale", 1.0,
6973
0.5, 1.25, 0.05, ValueDisplay.DECIMAL);
7074

@@ -91,6 +95,7 @@ public ChestSearchHack()
9195
addSetting(hideOpenedChestTracers);
9296
addSetting(markXColor);
9397
addSetting(recordedChestNotifications);
98+
addSetting(lootMismatchNotifications);
9499
}
95100

96101
public int getMarkXColorARGB()
@@ -125,6 +130,11 @@ public boolean isRecordNotificationEnabled()
125130
return recordedChestNotifications.isChecked();
126131
}
127132

133+
public boolean isLootMismatchNotificationEnabled()
134+
{
135+
return lootMismatchNotifications.isChecked();
136+
}
137+
128138
public int getCleanerGraceTicks()
129139
{
130140
return (int)(gracePeriodSec.getValueI() * 20);

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,24 @@
1515
import net.wurstclient.SearchTags;
1616
import net.wurstclient.events.PlayerAttacksEntityListener;
1717
import net.wurstclient.hack.Hack;
18+
import net.wurstclient.settings.SliderSetting;
19+
import net.wurstclient.settings.SliderSetting.ValueDisplay;
1820

1921
@SearchTags({"mace dmg", "MaceDamage", "mace damage"})
2022
public final class MaceDmgHack extends Hack
2123
implements PlayerAttacksEntityListener
2224
{
25+
private static final double DEFAULT_HEIGHT = Math.sqrt(500);
26+
27+
private final SliderSetting height = new SliderSetting("Height",
28+
"How high to fake before slamming. Height determines the damage boost.",
29+
DEFAULT_HEIGHT, 1.6, 50, 0.1, ValueDisplay.DECIMAL);
30+
2331
public MaceDmgHack()
2432
{
2533
super("MaceDMG");
2634
setCategory(Category.COMBAT);
35+
addSetting(height);
2736
}
2837

2938
@Override
@@ -53,7 +62,7 @@ public void onPlayerAttacksEntity(Entity target)
5362
// Also, let me know if you find a way to bypass that check.
5463
for(int i = 0; i < 4; i++)
5564
sendFakeY(0);
56-
sendFakeY(Math.sqrt(500));
65+
sendFakeY(height.getValue());
5766
sendFakeY(0);
5867
}
5968

src/main/java/net/wurstclient/mixin/GenericContainerScreenMixin.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import net.wurstclient.hacks.AutoStealHack;
4545
import net.wurstclient.hacks.ChestSearchHack;
4646
import net.wurstclient.hacks.QuickShulkerHack;
47+
import net.wurstclient.util.ChatUtils;
4748

4849
@Mixin(ContainerScreen.class)
4950
public abstract class GenericContainerScreenMixin
@@ -1333,18 +1334,18 @@ public void removed()
13331334
+ " match=" + match);
13341335
}catch(Throwable ignored)
13351336
{}
1336-
if(!match && net.wurstclient.WurstClient.MC != null)
1337+
ChestSearchHack csh = wurst$getChestSearchHack();
1338+
boolean allowMismatchNotification = csh == null
1339+
|| csh.isLootMismatchNotificationEnabled();
1340+
if(!match && allowMismatchNotification
1341+
&& net.wurstclient.WurstClient.MC != null)
13371342
{
13381343
net.wurstclient.WurstClient.MC.execute(() -> {
13391344
try
13401345
{
13411346
if(net.wurstclient.WurstClient.MC.player != null)
1342-
net.wurstclient.WurstClient.MC.player
1343-
.displayClientMessage(
1344-
net.minecraft.network.chat.Component
1345-
.literal(
1346-
"[wurst] Chest does not match loot table."),
1347-
false);
1347+
ChatUtils.message(
1348+
"Chest does not match loot table.");
13481349
}catch(Throwable ignored)
13491350
{}
13501351
});

src/main/java/net/wurstclient/other_features/ForceAllowChatsOtf.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
* License, version 3. If a copy of the GPL was not distributed with this
66
* file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
77
*/
8-
package net.wurstclient.other_features;
9-
10-
import net.wurstclient.Category;
11-
import net.wurstclient.other_feature.OtherFeature;
12-
import net.wurstclient.settings.CheckboxSetting;
8+
package net.wurstclient.other_features;
9+
10+
import net.wurstclient.Category;
11+
import net.wurstclient.other_feature.OtherFeature;
12+
import net.wurstclient.settings.CheckboxSetting;
1313

1414
public final class ForceAllowChatsOtf extends OtherFeature
1515
{
@@ -28,14 +28,14 @@ public CheckboxSetting getForceAllowChatsSetting()
2828
return forceAllowChats;
2929
}
3030

31-
public boolean isForceAllowChatsEnabled()
32-
{
33-
return forceAllowChats.isChecked();
34-
}
35-
36-
@Override
37-
public Category getCategory()
38-
{
39-
return Category.CHAT;
40-
}
41-
}
31+
public boolean isForceAllowChatsEnabled()
32+
{
33+
return forceAllowChats.isChecked();
34+
}
35+
36+
@Override
37+
public Category getCategory()
38+
{
39+
return Category.CHAT;
40+
}
41+
}

0 commit comments

Comments
 (0)