Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.github.epsilon.mixins;

import com.github.epsilon.modules.impl.render.NoRender;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import net.minecraft.client.renderer.blockentity.AbstractSignRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(AbstractSignRenderer.class)
public class MixinAbstractSignRenderer {
public abstract class MixinAbstractSignRenderer {

@ModifyExpressionValue(method = "submitSignText", at = @At(value = "CONSTANT", args = {"intValue=4", "ordinal=1"}))
private int loopTextLengthProxy(int i) {
if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getSignText()) return 0;
return i;
@Inject(method = "submitSignText", at = @At("HEAD"), cancellable = true)
private void epsilon$hideSignText(CallbackInfo ci) {
if (NoRender.INSTANCE.noSignText()) ci.cancel();
}

}
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
package com.github.epsilon.mixins;

import com.github.epsilon.modules.impl.render.NoRender;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.model.object.banner.BannerFlagModel;
import net.minecraft.client.model.object.banner.BannerModel;
import net.minecraft.client.renderer.Sheets;
import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.blockentity.BannerRenderer;
import net.minecraft.client.renderer.blockentity.state.BannerRenderState;
import net.minecraft.client.renderer.state.level.CameraRenderState;
import net.minecraft.client.renderer.feature.ModelFeatureRenderer;
import net.minecraft.client.resources.model.sprite.SpriteGetter;
import net.minecraft.util.Unit;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.block.entity.BannerPatternLayers;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
Expand All @@ -15,8 +23,17 @@
public abstract class MixinBannerRenderer {

@Inject(method = "submit(Lnet/minecraft/client/renderer/blockentity/state/BannerRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/CameraRenderState;)V", at = @At("HEAD"), cancellable = true)
private void onRenderBanner(BannerRenderState state, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CameraRenderState camera, CallbackInfo ci) {
if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getBannerRender()) ci.cancel();
private void epsilon$hideBanner(CallbackInfo ci) {
if (NoRender.INSTANCE.getBannerRenderMode() == NoRender.BannerRenderMode.None) ci.cancel();
}

@WrapOperation(method = "submit(Lnet/minecraft/client/renderer/blockentity/state/BannerRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/CameraRenderState;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/blockentity/BannerRenderer;submitBanner(Lnet/minecraft/client/resources/model/sprite/SpriteGetter;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;IILnet/minecraft/client/model/object/banner/BannerModel;Lnet/minecraft/client/model/object/banner/BannerFlagModel;FLnet/minecraft/world/item/DyeColor;Lnet/minecraft/world/level/block/entity/BannerPatternLayers;Lnet/minecraft/client/renderer/feature/ModelFeatureRenderer$CrumblingOverlay;I)V"))
private void epsilon$renderBannerPillar(SpriteGetter sprites, PoseStack poseStack, SubmitNodeCollector collector, int lightCoords, int overlayCoords, BannerModel model, BannerFlagModel flagModel, float phase, DyeColor baseColor, BannerPatternLayers patterns, ModelFeatureRenderer.CrumblingOverlay breakProgress, int outlineColor, Operation<Void> original) {
if (NoRender.INSTANCE.getBannerRenderMode() == NoRender.BannerRenderMode.Pillar) {
collector.submitModel(model, Unit.INSTANCE, poseStack, lightCoords, overlayCoords, -1, Sheets.BANNER_BASE, sprites, outlineColor);
} else {
original.call(sprites, poseStack, collector, lightCoords, overlayCoords, model, flagModel, phase, baseColor, patterns, breakProgress, outlineColor);
}
}

}
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package com.github.epsilon.mixins;

import com.github.epsilon.modules.impl.render.NoRender;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.blockentity.BeaconRenderer;
import net.minecraft.resources.Identifier;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
Expand All @@ -14,8 +11,8 @@
public abstract class MixinBeaconRenderer {

@Inject(method = "submitBeaconBeam(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/resources/Identifier;FFIIIFF)V", at = @At("HEAD"), cancellable = true)
private static void onRenderBeacon(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, Identifier beamLocation, float scale, float animationTime, int beamStart, int height, int color, float solidBeamRadius, float beamGlowRadius, CallbackInfo ci) {
if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getBeaconBeams()) ci.cancel();
private static void epsilon$hideBeaconBeam(CallbackInfo ci) {
if (NoRender.INSTANCE.noBeaconBeams()) ci.cancel();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.github.epsilon.mixins;

import com.github.epsilon.modules.impl.render.NoRender;
import net.minecraft.world.level.block.state.BlockBehaviour;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@Mixin(BlockBehaviour.class)
public abstract class MixinBlockBehaviour {

@Inject(method = "getSeed", at = @At("HEAD"), cancellable = true)
private void epsilon$constantSeed(CallbackInfoReturnable<Long> cir) {
if (NoRender.INSTANCE.noTextureRotations()) cir.setReturnValue(0L);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.github.epsilon.mixins;

import com.github.epsilon.modules.impl.render.NoRender;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.client.renderer.SubmitNodeCollector;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
import net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState;
import net.minecraft.client.renderer.state.level.CameraRenderState;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(BlockEntityRenderDispatcher.class)
public abstract class MixinBlockEntityRenderDispatcher {

@Inject(method = "submit", at = @At("HEAD"), cancellable = true)
private void epsilon$hideBlockEntity(BlockEntityRenderState state, PoseStack poseStack, SubmitNodeCollector collector, CameraRenderState camera, CallbackInfo ci) {
if (NoRender.INSTANCE.noBlockEntity(state.blockState.getBlock())) ci.cancel();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.github.epsilon.mixins;

import com.github.epsilon.modules.impl.render.NoRender;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@Mixin(BlockBehaviour.BlockStateBase.class)
public abstract class MixinBlockState {

@Inject(method = "getOffset", at = @At("HEAD"), cancellable = true)
private void epsilon$constantOffset(CallbackInfoReturnable<Vec3> cir) {
if (NoRender.INSTANCE.noTextureRotations()) cir.setReturnValue(Vec3.ZERO);
}

}

This file was deleted.

25 changes: 18 additions & 7 deletions common/src/main/java/com/github/epsilon/mixins/MixinCamera.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@
import com.github.epsilon.modules.impl.render.FreeCamera;
import com.github.epsilon.modules.impl.render.NoRender;
import com.github.epsilon.modules.impl.render.SneakTweak;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Local;
import net.minecraft.client.Camera;
import net.minecraft.client.CameraType;
import net.minecraft.core.Holder;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.Pose;
import net.minecraft.world.level.material.FogType;
import net.minecraft.world.phys.Vec3;
Expand Down Expand Up @@ -53,13 +59,6 @@ public class MixinCamera {
return lastPoses[1] == Pose.STANDING && lastPoses[0] == Pose.CROUCHING || lastPoses[1] == Pose.CROUCHING && lastPoses[0] == Pose.STANDING;
}

@Inject(method = "getFluidInCamera", at = @At("HEAD"), cancellable = true)
private void onGetFluidInCamera(CallbackInfoReturnable<FogType> cir) {
if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getLiquidOverlay()) {
cir.setReturnValue(FogType.NONE);
}
}

@Inject(method = "getMaxZoom", at = @At("HEAD"), cancellable = true)
private void hookGetMaxZoom(float cameraDist, CallbackInfoReturnable<Float> cir) {
if (FreeCamera.INSTANCE.isEnabled()) {
Expand Down Expand Up @@ -150,4 +149,16 @@ private float hookSneakTweakCameraSpeed(float modifier) {
return modifier;
}

@Inject(method = "getFluidInCamera", at = @At("HEAD"), cancellable = true)
private void epsilon$hideLiquidOverlay(CallbackInfoReturnable<FogType> cir) {
if (NoRender.INSTANCE.noLiquidOverlay()) cir.setReturnValue(FogType.NONE);
}

@WrapOperation(method = "extractRenderState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;hasEffect(Lnet/minecraft/core/Holder;)Z"))
private boolean epsilon$showSky(LivingEntity entity, Holder<MobEffect> effect, Operation<Boolean> original) {
if (effect == MobEffects.BLINDNESS && NoRender.INSTANCE.noBlindness()) return false;
if (effect == MobEffects.DARKNESS && NoRender.INSTANCE.noDarkness()) return false;
return original.call(entity, effect);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.github.epsilon.mixins;

import com.github.epsilon.modules.impl.render.NoRender;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import net.minecraft.client.multiplayer.chat.GuiMessageTag;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;

@Mixin(targets = "net.minecraft.client.gui.components.ChatComponent$1")
public abstract class MixinChatLineConsumer {

@ModifyExpressionValue(method = "accept", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/chat/GuiMessage$Line;tag()Lnet/minecraft/client/multiplayer/chat/GuiMessageTag;"))
private GuiMessageTag epsilon$hideSignatureIndicator(GuiMessageTag original) {
return NoRender.INSTANCE.noMessageSignatureIndicator() ? null : original;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
import com.github.epsilon.events.impl.ClientEntityEvent;
import com.github.epsilon.modules.impl.render.NoRender;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArgs;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.invoke.arg.Args;

import static com.github.epsilon.kernel.MinecraftWrapper.mc;

Expand All @@ -37,13 +38,6 @@ private void onEntityRemoved(int id, Entity.RemovalReason reason, CallbackInfo c
new ClientEntityEvent.Removed((ClientLevel) (Object) this, id).post();
}

@ModifyArgs(method = "animateTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;doAnimateTick(IIIILnet/minecraft/util/RandomSource;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos$MutableBlockPos;)V"))
private void onAnimateTick(Args args) {
if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getBarrierInvis()) {
args.set(5, Blocks.BARRIER);
}
}

@Redirect(method = "tickNonPassenger", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;tick()V"))
public void hookTickNonPassenger(Entity instance) {
if (Constants.skipTicks > 0 && instance == mc.player) {
Expand All @@ -53,4 +47,14 @@ public void hookTickNonPassenger(Entity instance) {
}
}

@Inject(method = {"addDestroyBlockEffect", "addBreakingBlockEffects"}, at = @At("HEAD"), cancellable = true)
private void epsilon$hideBlockParticles(CallbackInfo ci) {
if (NoRender.INSTANCE.noParticle(ParticleTypes.BLOCK)) ci.cancel();
}

@ModifyArg(method = "animateTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;doAnimateTick(IIIILnet/minecraft/util/RandomSource;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos$MutableBlockPos;)V"), index = 5)
private Block epsilon$showBarriers(Block original) {
return NoRender.INSTANCE.noBarrierInvis() ? Blocks.BARRIER : original;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,20 @@
import com.github.epsilon.events.impl.RespawnEvent;
import com.github.epsilon.kernel.jvm.NonNullContext;
import com.github.epsilon.modules.impl.player.NoRotate;
import com.github.epsilon.modules.impl.render.NoRender;
import com.github.epsilon.modules.impl.render.SneakTweak;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.llamalad7.mixinextras.sugar.Share;
import com.llamalad7.mixinextras.sugar.ref.LocalBooleanRef;
import com.llamalad7.mixinextras.sugar.ref.LocalFloatRef;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.client.multiplayer.CommonListenerCookie;
import net.minecraft.core.particles.ExplosionParticleInfo;
import net.minecraft.core.particles.ParticleOptions;
import net.minecraft.network.Connection;
import net.minecraft.network.protocol.PacketUtils;
import net.minecraft.network.protocol.game.*;
import net.minecraft.network.syncher.EntityDataSerializers;
import net.minecraft.network.syncher.SynchedEntityData;
import net.minecraft.util.random.WeightedList;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
Expand Down Expand Up @@ -147,38 +139,4 @@ private void onHandleMovePlayerReturn(ClientboundPlayerPositionPacket packet, Ca
minecraft.player.yBodyRot = savedYaw;
}

@Inject(method = "handleAddEntity", at = @At("HEAD"), cancellable = true)
private void onHandleAddEntity(net.minecraft.network.protocol.game.ClientboundAddEntityPacket packet, CallbackInfo ci) {
if (packet != null && NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.noEntity(packet.getType()) && NoRender.INSTANCE.getDropSpawnPacket()) {
ci.cancel();
}
}

/**
* 客户端所有爆炸粒子(爆炸云与方块碎屑)都由 {@code ClientboundExplodePacket} 触发,
* 拦截这两个调用即可移除全部爆炸粒子,不影响烟花等其它来源的粒子。
*/
@WrapOperation(method = "handleExplosion", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;addParticle(Lnet/minecraft/core/particles/ParticleOptions;DDDDDD)V"))
private void hookExplosionParticle(ClientLevel level, ParticleOptions particle, double x, double y, double z, double xa, double ya, double za, Operation<Void> original) {
if (shouldHideExplosion()) {
return;
}
original.call(level, particle, x, y, z, xa, ya, za);
}

/**
* 拦截爆炸包附带的方块碎屑粒子。
*/
@WrapOperation(method = "handleExplosion", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/ClientLevel;trackExplosionEffects(Lnet/minecraft/world/phys/Vec3;FILnet/minecraft/util/random/WeightedList;)V"))
private void hookExplosionBlockParticles(ClientLevel level, Vec3 center, float radius, int blockCount, WeightedList<ExplosionParticleInfo> blockParticles, Operation<Void> original) {
if (shouldHideExplosion()) {
return;
}
original.call(level, center, radius, blockCount, blockParticles);
}

private static boolean shouldHideExplosion() {
return NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getExplosions();
}

}

This file was deleted.

Loading
Loading