Skip to content
This repository was archived by the owner on Mar 5, 2023. It is now read-only.

Commit 75a424f

Browse files
3arthqu4ke3arthqu4ke
authored
Merge pull request #198 from 3arthqu4ke/v1.8.2
[1.8.2] SwordGapOverride, Shader fix, CustomShader for Chams, AutoCrystal Extrapolation improvements
2 parents 7a7f14d + b8f3ca7 commit 75a424f

20 files changed

Lines changed: 369 additions & 173 deletions

‎src/main/java/me/earth/earthhack/impl/event/events/render/ModelRenderEvent.java‎

Lines changed: 49 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,28 @@ public class ModelRenderEvent extends Event
1010
private final RenderLivingBase<?> renderLiving;
1111
private final EntityLivingBase entity;
1212
private final ModelBase model;
13+
private final float limbSwing;
14+
private final float limbSwingAmount;
15+
private final float ageInTicks;
16+
private final float netHeadYaw;
17+
private final float headPitch;
18+
private final float scale;
1319

1420
private ModelRenderEvent(RenderLivingBase<?> renderLiving,
1521
EntityLivingBase entity,
16-
ModelBase model)
22+
ModelBase model, float limbSwing,
23+
float limbSwingAmount, float ageInTicks,
24+
float netHeadYaw, float headPitch, float scale)
1725
{
1826
this.renderLiving = renderLiving;
1927
this.entity = entity;
2028
this.model = model;
29+
this.limbSwing = limbSwing;
30+
this.limbSwingAmount = limbSwingAmount;
31+
this.ageInTicks = ageInTicks;
32+
this.netHeadYaw = netHeadYaw;
33+
this.headPitch = headPitch;
34+
this.scale = scale;
2135
}
2236

2337
public RenderLivingBase<?> getRenderLiving()
@@ -35,15 +49,38 @@ public ModelBase getModel()
3549
return model;
3650
}
3751

38-
public static class Pre extends ModelRenderEvent
52+
public float getLimbSwing()
53+
{
54+
return limbSwing;
55+
}
56+
57+
public float getLimbSwingAmount()
58+
{
59+
return limbSwingAmount;
60+
}
61+
62+
public float getAgeInTicks()
63+
{
64+
return ageInTicks;
65+
}
66+
67+
public float getNetHeadYaw()
68+
{
69+
return netHeadYaw;
70+
}
71+
72+
public float getHeadPitch()
73+
{
74+
return headPitch;
75+
}
76+
77+
public float getScale()
3978
{
40-
private final float limbSwing;
41-
private final float limbSwingAmount;
42-
private final float ageInTicks;
43-
private final float netHeadYaw;
44-
private final float headPitch;
45-
private final float scale;
79+
return scale;
80+
}
4681

82+
public static class Pre extends ModelRenderEvent
83+
{
4784
public Pre(RenderLivingBase<?> renderLiving,
4885
EntityLivingBase entity,
4986
ModelBase model,
@@ -54,55 +91,13 @@ public Pre(RenderLivingBase<?> renderLiving,
5491
float headPitch,
5592
float scale)
5693
{
57-
super(renderLiving, entity, model);
58-
this.limbSwing = limbSwing;
59-
this.limbSwingAmount = limbSwingAmount;
60-
this.ageInTicks = ageInTicks;
61-
this.netHeadYaw = netHeadYaw;
62-
this.headPitch = headPitch;
63-
this.scale = scale;
64-
}
65-
66-
public float getLimbSwing()
67-
{
68-
return limbSwing;
69-
}
70-
71-
public float getLimbSwingAmount()
72-
{
73-
return limbSwingAmount;
74-
}
75-
76-
public float getAgeInTicks()
77-
{
78-
return ageInTicks;
79-
}
80-
81-
public float getNetHeadYaw()
82-
{
83-
return netHeadYaw;
84-
}
85-
86-
public float getHeadPitch()
87-
{
88-
return headPitch;
89-
}
90-
91-
public float getScale()
92-
{
93-
return scale;
94+
super(renderLiving, entity, model, limbSwing, limbSwingAmount,
95+
ageInTicks, netHeadYaw, headPitch, scale);
9496
}
9597
}
9698

9799
public static class Post extends ModelRenderEvent
98100
{
99-
private final float limbSwing;
100-
private final float limbSwingAmount;
101-
private final float ageInTicks;
102-
private final float netHeadYaw;
103-
private final float headPitch;
104-
private final float scale;
105-
106101
public Post(RenderLivingBase<?> renderLiving,
107102
EntityLivingBase entity,
108103
ModelBase model,
@@ -113,43 +108,8 @@ public Post(RenderLivingBase<?> renderLiving,
113108
float headPitch,
114109
float scale)
115110
{
116-
super(renderLiving, entity, model);
117-
this.limbSwing = limbSwing;
118-
this.limbSwingAmount = limbSwingAmount;
119-
this.ageInTicks = ageInTicks;
120-
this.netHeadYaw = netHeadYaw;
121-
this.headPitch = headPitch;
122-
this.scale = scale;
123-
}
124-
125-
public float getLimbSwing()
126-
{
127-
return limbSwing;
128-
}
129-
130-
public float getLimbSwingAmount()
131-
{
132-
return limbSwingAmount;
133-
}
134-
135-
public float getAgeInTicks()
136-
{
137-
return ageInTicks;
138-
}
139-
140-
public float getNetHeadYaw()
141-
{
142-
return netHeadYaw;
143-
}
144-
145-
public float getHeadPitch()
146-
{
147-
return headPitch;
148-
}
149-
150-
public float getScale()
151-
{
152-
return scale;
111+
super(renderLiving, entity, model, limbSwing, limbSwingAmount,
112+
ageInTicks, netHeadYaw, headPitch, scale);
153113
}
154114
}
155115

‎src/main/java/me/earth/earthhack/impl/modules/combat/autocrystal/AutoCrystal.java‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import me.earth.earthhack.impl.util.math.MathUtil;
2929
import me.earth.earthhack.impl.util.math.StopWatch;
3030
import me.earth.earthhack.impl.util.minecraft.CooldownBypass;
31-
import me.earth.earthhack.impl.util.minecraft.PushMode;
3231
import me.earth.earthhack.impl.util.minecraft.blocks.BlockUtil;
3332
import me.earth.earthhack.impl.util.minecraft.entity.EntityUtil;
3433
import me.earth.earthhack.impl.util.misc.collections.CollectionUtil;
@@ -727,17 +726,9 @@ public class AutoCrystal extends Module
727726
public final Setting<Double> breakNormalWeight =
728727
register(new NumberSetting<>("B-Norm-Weight", 1.0, 0.0, 5.0))
729728
.setComplexity(Complexity.Medium);
730-
731-
732-
public final Setting<PushMode> pushOutOfBlocks =
733-
register(new EnumSetting<>("PushOutOfBlocks", PushMode.None))
734-
.setComplexity(Complexity.Expert);
735-
public final Setting<Boolean> shrinkPush =
736-
register(new BooleanSetting("ShrinkPush", false))
737-
.setComplexity(Complexity.Expert);
738-
public final Setting<Boolean> noPushOnNoMove =
739-
register(new BooleanSetting("NoPushOnNoMove", false))
740-
.setComplexity(Complexity.Expert);
729+
public final Setting<Boolean> gravityExtrapolation =
730+
register(new BooleanSetting("Extra-Gravity", true))
731+
.setComplexity(Complexity.Expert);
741732
public final Setting<Boolean> selfExtrapolation =
742733
register(new BooleanSetting("SelfExtrapolation", false))
743734
.setComplexity(Complexity.Medium);
@@ -786,6 +777,9 @@ public class AutoCrystal extends Module
786777
protected final Setting<Boolean> smartPost =
787778
register(new BooleanSetting("Smart-Post", true))
788779
.setComplexity(Complexity.Medium);
780+
protected final Setting<Boolean> mainThreadThreads =
781+
register(new BooleanSetting("MainThreadThreads", false))
782+
.setComplexity(Complexity.Medium);
789783
protected final Setting<RotationThread> rotationThread =
790784
register(new EnumSetting<>("RotationThread", RotationThread.Predict))
791785
.setComplexity(Complexity.Expert);
@@ -885,6 +879,9 @@ public class AutoCrystal extends Module
885879
protected final Setting<Boolean> debugAntiPlaceFail =
886880
register(new BooleanSetting("DebugAntiPlaceFail", false))
887881
.setComplexity(Complexity.Expert);
882+
protected final Setting<Boolean> alwaysBomb =
883+
register(new BooleanSetting("Always-Bomb", false))
884+
.setComplexity(Complexity.Expert);
888885
protected final Setting<Integer> removeTime =
889886
register(new NumberSetting<>("Remove-Time", 1000, 0, 2500))
890887
.setComplexity(Complexity.Expert);
@@ -918,6 +915,7 @@ public class AutoCrystal extends Module
918915
protected final Queue<Runnable> post = new ConcurrentLinkedQueue<>();
919916
protected volatile RotationFunction rotation;
920917
private BlockPos bypassPos;
918+
public BlockPos bombPos;
921919
protected EntityPlayer target;
922920
protected Entity crystal;
923921
protected Entity focus;

‎src/main/java/me/earth/earthhack/impl/modules/combat/autocrystal/ListenerBlockChange.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public ListenerBlockChange(AutoCrystal module)
1919
@Override
2020
public void invoke(PacketEvent.Receive<SPacketBlockChange> event)
2121
{
22-
if (module.multiThread.getValue()
22+
if ((module.multiThread.getValue() || module.mainThreadThreads.getValue())
2323
&& module.blockChangeThread.getValue())
2424
{
2525
SPacketBlockChange packet = event.getPacket();
@@ -29,6 +29,7 @@ public void invoke(PacketEvent.Receive<SPacketBlockChange> event)
2929
event.addPostEvent(() ->
3030
{
3131
if (mc.world != null
32+
&& mc.player != null
3233
&& HelperUtil.validChange(packet.getBlockPosition(),
3334
mc.world.playerEntities))
3435
{

‎src/main/java/me/earth/earthhack/impl/modules/combat/autocrystal/ListenerBlockMulti.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,17 @@ public ListenerBlockMulti(AutoCrystal module)
1919
@Override
2020
public void invoke(PacketEvent.Receive<SPacketMultiBlockChange> event)
2121
{
22-
if (module.multiThread.getValue()
22+
if ((module.multiThread.getValue() || module.mainThreadThreads.getValue())
2323
&& module.blockChangeThread.getValue())
2424
{
2525
SPacketMultiBlockChange packet = event.getPacket();
2626
event.addPostEvent(() ->
2727
{
28+
if (mc.world == null || mc.player == null)
29+
{
30+
return;
31+
}
32+
2833
for (SPacketMultiBlockChange.BlockUpdateData data :
2934
packet.getChangedBlocks())
3035
{

‎src/main/java/me/earth/earthhack/impl/modules/combat/autocrystal/ListenerSpawnObject.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,23 @@ private void onEvent(PacketEvent.Receive<SPacketSpawnObject> event)
114114
entity.setEntityId(packet.getEntityID());
115115
entity.setUniqueId(packet.getUniqueId());
116116

117-
if (!module.alwaysCalc.getValue()
117+
if ((!module.alwaysCalc.getValue()
118+
|| pos.equals(module.bombPos)
119+
&& module.alwaysBomb.getValue())
118120
&& stamp != null
119121
&& stamp.isValid()
120122
&& (stamp.getDamage() > module.slowBreakDamage.getValue()
121123
|| stamp.isShield()
122124
|| module.breakTimer.passed(module.slowBreakDelay.getValue())
123125
|| pos.down().equals(module.antiTotemHelper.getTargetPos())))
124126
{
127+
if (pos.equals(module.bombPos))
128+
{
129+
// should probably set the block underneath
130+
// to air when calcing self damage...
131+
module.bombPos = null;
132+
}
133+
125134
float damage = checkPos(entity);
126135
if (damage <= -1000.0f)
127136
{

‎src/main/java/me/earth/earthhack/impl/modules/combat/autocrystal/helpers/ExtrapolationHelper.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import me.earth.earthhack.impl.modules.combat.autocrystal.AutoCrystal;
99
import me.earth.earthhack.impl.util.math.rotation.RotationUtil;
1010
import me.earth.earthhack.impl.util.minecraft.MotionTracker;
11-
import me.earth.earthhack.impl.util.minecraft.PushMode;
1211
import me.earth.earthhack.impl.util.minecraft.entity.EntityUtil;
1312
import net.minecraft.entity.Entity;
1413
import net.minecraft.entity.player.EntityPlayer;
@@ -70,17 +69,9 @@ private void updateTracker(MotionTracker tracker, int ticks) {
7069
}
7170

7271
tracker.active = false;
73-
tracker.shouldPushOutOfBlocks =
74-
(!module.noPushOnNoMove.getValue()
75-
|| tracker.tracked.motionX != 0.0
76-
|| tracker.tracked.motionY != 0.0
77-
|| tracker.tracked.motionZ != 0.0)
78-
? module.pushOutOfBlocks.getValue()
79-
: PushMode.None;
80-
tracker.shrinkPush = module.shrinkPush.getValue();
8172
tracker.copyLocationAndAnglesFrom(tracker.tracked);
82-
tracker.detectWasPhasing();
83-
for (int i = 0; i < ticks; i++) {
73+
tracker.gravity = module.gravityExtrapolation.getValue();
74+
for (tracker.ticks = 0; tracker.ticks < ticks; tracker.ticks++) {
8475
tracker.updateFromTrackedEntity();
8576
}
8677

0 commit comments

Comments
 (0)