Skip to content

Commit ac59093

Browse files
committed
Fixed NoRender & Velocity
1 parent 11ae8b0 commit ac59093

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/main/java/com/lambda/mixin/network/ClientPlayNetworkHandlerMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private void onScreenHandlerSlotUpdate(ScreenHandlerSlotUpdateS2CPacket packet,
7373
*/
7474
@Redirect(method = "onGameJoin(Lnet/minecraft/network/packet/s2c/play/GameJoinS2CPacket;)V", at = @At(value = "FIELD", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;displayedUnsecureChatWarning:Z", ordinal = 0))
7575
public boolean onServerMetadata(ClientPlayNetworkHandler clientPlayNetworkHandler) {
76-
return NoRender.getNoChatVerificationToast();
76+
return NoRender.getNoChatVerificationToast() && NoRender.INSTANCE.isEnabled();
7777
}
7878

7979
/**
@@ -101,14 +101,14 @@ public boolean onServerMetadata(ClientPlayNetworkHandler clientPlayNetworkHandle
101101
*/
102102
@Inject(method = "onExplosion(Lnet/minecraft/network/packet/s2c/play/ExplosionS2CPacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/ExplosionS2CPacket;playerKnockback()Ljava/util/Optional;"), cancellable = true)
103103
void injectVelocity(ExplosionS2CPacket packet, CallbackInfo ci) {
104-
if (Velocity.getExplosion()) ci.cancel();
104+
if (Velocity.getExplosion() && Velocity.INSTANCE.isEnabled()) ci.cancel();
105105
}
106106

107107
/**
108108
* Cancels the world particle if {@link NoRender#getNoExplosion()} is true
109109
*/
110110
@Inject(method = "onExplosion(Lnet/minecraft/network/packet/s2c/play/ExplosionS2CPacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/world/ClientWorld;addParticleClient(Lnet/minecraft/particle/ParticleEffect;DDDDDD)V"), cancellable = true)
111111
void injectParticles(ExplosionS2CPacket packet, CallbackInfo ci) {
112-
if (NoRender.getNoExplosion()) ci.cancel();
112+
if (NoRender.getNoExplosion() && NoRender.INSTANCE.isEnabled()) ci.cancel();
113113
}
114114
}

src/main/java/com/lambda/mixin/render/LightmapTextureManagerMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ private void updateModify(CallbackInfo ci) {
4848

4949
@Inject(method = "getDarkness", at = @At("HEAD"), cancellable = true)
5050
private void getDarknessFactor(LivingEntity entity, float factor, float tickProgress, CallbackInfoReturnable<Float> cir) {
51-
if (NoRender.getNoDarkness()) cir.setReturnValue(0.0f);
51+
if (NoRender.getNoDarkness() && NoRender.INSTANCE.isEnabled()) cir.setReturnValue(0.0f);
5252
}
5353
}

src/main/kotlin/com/lambda/module/modules/movement/Velocity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ object Velocity : Module(
3030
) {
3131
private val knockback by setting("Knockback", true)
3232

33-
private val explosionSetting by setting("Explosion", true)
34-
@JvmStatic val explosion get() = isEnabled && explosionSetting
33+
@JvmStatic val explosion by setting("Explosion", true)
3534

3635
init {
3736
listen<PacketEvent.Receive.Pre> { event ->

0 commit comments

Comments
 (0)