From ad8603e24d7fa8d305029dbf98673c7109428fcd Mon Sep 17 00:00:00 2001 From: Yozupi Date: Sat, 14 Nov 2026 21:47:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E6=B8=B2?= =?UTF-8?q?=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mixins/MixinAbstractSignRenderer.java | 18 ------ .../epsilon/mixins/MixinBannerRenderer.java | 22 ------- .../epsilon/mixins/MixinBeaconRenderer.java | 21 ------- .../mixins/MixinBossHealthOverlay.java | 18 ------ .../github/epsilon/mixins/MixinCamera.java | 9 --- .../epsilon/mixins/MixinClientLevel.java | 11 ---- .../mixins/MixinClientPacketListener.java | 42 ------------- .../mixins/MixinEnchantTableRenderer.java | 22 ------- .../epsilon/mixins/MixinEntityRenderer.java | 24 +------ .../MixinFireworksSparkParticleSub.java | 20 ------ .../epsilon/mixins/MixinFogRenderer.java | 11 +--- .../com/github/epsilon/mixins/MixinFont.java | 8 --- .../com/github/epsilon/mixins/MixinHud.java | 50 +-------------- .../mixins/MixinHumanoidArmorLayer.java | 25 -------- .../mixins/MixinItemFeatureRenderer.java | 22 ------- .../epsilon/mixins/MixinLevelExtractor.java | 52 --------------- .../epsilon/mixins/MixinLevelRenderer.java | 22 ++----- .../epsilon/mixins/MixinLivingEntity.java | 10 --- .../epsilon/mixins/MixinMapRenderer.java | 31 --------- .../epsilon/mixins/MixinParticleManager.java | 40 ------------ .../mixins/MixinScreenEffectRenderer.java | 27 -------- .../epsilon/mixins/MixinSpawnerRenderer.java | 23 ------- .../epsilon/modules/impl/render/NoRender.kt | 63 ------------------- common/src/main/resources/epsilon.mixins.json | 12 ---- 24 files changed, 7 insertions(+), 596 deletions(-) delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinAbstractSignRenderer.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinBannerRenderer.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinBeaconRenderer.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinBossHealthOverlay.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinEnchantTableRenderer.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinFireworksSparkParticleSub.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinHumanoidArmorLayer.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinItemFeatureRenderer.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinLevelExtractor.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinMapRenderer.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinParticleManager.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinSpawnerRenderer.java diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinAbstractSignRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinAbstractSignRenderer.java deleted file mode 100644 index 17b6792dd..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinAbstractSignRenderer.java +++ /dev/null @@ -1,18 +0,0 @@ -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; - -@Mixin(AbstractSignRenderer.class) -public 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; - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinBannerRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinBannerRenderer.java deleted file mode 100644 index e4bf1bd81..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinBannerRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -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.BannerRenderer; -import net.minecraft.client.renderer.blockentity.state.BannerRenderState; -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(BannerRenderer.class) -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(); - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinBeaconRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinBeaconRenderer.java deleted file mode 100644 index 7471ffb58..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinBeaconRenderer.java +++ /dev/null @@ -1,21 +0,0 @@ -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; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(BeaconRenderer.class) -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(); - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinBossHealthOverlay.java b/common/src/main/java/com/github/epsilon/mixins/MixinBossHealthOverlay.java deleted file mode 100644 index 11dba5e58..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinBossHealthOverlay.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.github.epsilon.mixins; - -import com.github.epsilon.modules.impl.render.NoRender; -import net.minecraft.client.gui.components.BossHealthOverlay; -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(BossHealthOverlay.class) -public abstract class MixinBossHealthOverlay { - - @Inject(method = "extractRenderState", at = @At("HEAD"), cancellable = true) - private void onExtractRenderState(CallbackInfo ci) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getBossBar()) ci.cancel(); - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinCamera.java b/common/src/main/java/com/github/epsilon/mixins/MixinCamera.java index f18954e56..00b15ed4c 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinCamera.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinCamera.java @@ -2,14 +2,12 @@ import com.github.epsilon.modules.impl.render.CameraClip; 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.sugar.Local; import net.minecraft.client.Camera; import net.minecraft.client.CameraType; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Pose; -import net.minecraft.world.level.material.FogType; import net.minecraft.world.phys.Vec3; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -53,13 +51,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 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 cir) { if (FreeCamera.INSTANCE.isEnabled()) { diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinClientLevel.java b/common/src/main/java/com/github/epsilon/mixins/MixinClientLevel.java index 43ed16e13..32c1a2771 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinClientLevel.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinClientLevel.java @@ -2,17 +2,13 @@ import com.github.epsilon.Constants; import com.github.epsilon.events.impl.ClientEntityEvent; -import com.github.epsilon.modules.impl.render.NoRender; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.world.entity.Entity; -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.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; @@ -37,13 +33,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) { diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinClientPacketListener.java b/common/src/main/java/com/github/epsilon/mixins/MixinClientPacketListener.java index 69b4e733e..29df807bc 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinClientPacketListener.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinClientPacketListener.java @@ -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; @@ -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 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 blockParticles, Operation original) { - if (shouldHideExplosion()) { - return; - } - original.call(level, center, radius, blockCount, blockParticles); - } - - private static boolean shouldHideExplosion() { - return NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getExplosions(); - } - } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinEnchantTableRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinEnchantTableRenderer.java deleted file mode 100644 index 247fd0f8b..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinEnchantTableRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.github.epsilon.mixins; - -import com.github.epsilon.modules.impl.render.NoRender; -import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; -import net.minecraft.client.model.Model; -import net.minecraft.client.renderer.SubmitNodeCollector; -import net.minecraft.client.renderer.blockentity.EnchantTableRenderer; -import net.minecraft.client.resources.model.sprite.SpriteGetter; -import net.minecraft.client.resources.model.sprite.SpriteId; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; - -@Mixin(EnchantTableRenderer.class) -public abstract class MixinEnchantTableRenderer { - - @WrapWithCondition(method = "submit(Lnet/minecraft/client/renderer/blockentity/state/EnchantTableRenderState;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/SubmitNodeCollector;submitModel(Lnet/minecraft/client/model/Model;Ljava/lang/Object;Lcom/mojang/blaze3d/vertex/PoseStack;IIILnet/minecraft/client/resources/model/sprite/SpriteId;Lnet/minecraft/client/resources/model/sprite/SpriteGetter;I)V")) - private boolean onRenderBook(SubmitNodeCollector instance, Model model, Object state, com.mojang.blaze3d.vertex.PoseStack poseStack, int lightCoords, int overlayCoords, int tintedColor, SpriteId spriteId, SpriteGetter spriteGetter, int outlineColor) { - return !(NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getEnchTableBook()); - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderer.java index b3e773d32..9bd4143c8 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderer.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderer.java @@ -2,15 +2,12 @@ import com.github.epsilon.modules.impl.render.CrystalChams; import com.github.epsilon.modules.impl.render.NameTags; -import com.github.epsilon.modules.impl.render.NoRender; import com.github.epsilon.modules.impl.render.Shaders; import net.minecraft.client.renderer.culling.Frustum; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.state.EntityRenderState; -import net.minecraft.client.renderer.entity.state.LivingEntityRenderState; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.boss.enderdragon.EndCrystal; -import net.minecraft.world.entity.item.FallingBlockEntity; import net.minecraft.world.entity.player.Player; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -33,31 +30,12 @@ private void onExtractRenderStateReturn(T entity, S state, float partialTicks, C private void hookShouldRender(T entity, Frustum culler, double camX, double camY, double camZ, float partialTicks, CallbackInfoReturnable cir) { if (CrystalChams.INSTANCE.isEnabled() && entity instanceof EndCrystal) { cir.setReturnValue(false); - return; - } - - NoRender noRender = NoRender.INSTANCE; - if (noRender.isEnabled() && (noRender.noEntity(entity.getType()) || (noRender.getFallingBlocks() && entity instanceof FallingBlockEntity))) { - cir.setReturnValue(false); } } @Inject(method = "extractNameTags(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/client/renderer/entity/state/EntityRenderState;FDD)V", at = @At("HEAD"), cancellable = true) private void hookExtractNameTags(T entity, S state, float partialTicks, double nameTagDistance, double belowNameDistance, CallbackInfo ci) { - boolean hideGlobalNametags = NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getNoNametags(); - boolean hidePlayerNametags = NameTags.INSTANCE.isEnabled() && entity instanceof Player; - if (hideGlobalNametags || hidePlayerNametags) { - ci.cancel(); - } - } - - @Inject(method = "finalizeRenderState(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/client/renderer/entity/state/EntityRenderState;)V", at = @At("HEAD"), cancellable = true) - private void onFinalizeRenderState(T entity, S state, CallbackInfo ci) { - if ( - NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getNoDeadEntities() - && state instanceof LivingEntityRenderState livingState - && livingState.deathTime > 0 - ) { + if (NameTags.INSTANCE.isEnabled() && entity instanceof Player) { ci.cancel(); } } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinFireworksSparkParticleSub.java b/common/src/main/java/com/github/epsilon/mixins/MixinFireworksSparkParticleSub.java deleted file mode 100644 index 7dba81812..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinFireworksSparkParticleSub.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.github.epsilon.mixins; - -import com.github.epsilon.modules.impl.render.NoRender; -import net.minecraft.client.Camera; -import net.minecraft.client.particle.FireworkParticles; -import net.minecraft.client.renderer.state.level.QuadParticleRenderState; -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(value = {FireworkParticles.SparkParticle.class, FireworkParticles.OverlayParticle.class}) -public class MixinFireworksSparkParticleSub { - - @Inject(method = "extract", at = @At("HEAD"), cancellable = true) - private void buildExplosionGeometry(QuadParticleRenderState particleTypeRenderState, Camera camera, float partialTickTime, CallbackInfo ci) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getFireworkExplosions()) ci.cancel(); - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinFogRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinFogRenderer.java index deae41bf4..53e17c4aa 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinFogRenderer.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinFogRenderer.java @@ -1,25 +1,16 @@ package com.github.epsilon.mixins; -import com.github.epsilon.modules.impl.render.NoRender; import com.github.epsilon.modules.impl.render.WorldTweaks; -import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.client.renderer.fog.FogData; import net.minecraft.client.renderer.fog.FogRenderer; -import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import java.awt.*; @Mixin(FogRenderer.class) -public abstract class MixinFogRenderer { - - @ModifyExpressionValue(method = "getBuffer", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/fog/FogRenderer;fogEnabled:Z", opcode = Opcodes.GETSTATIC)) - private boolean modifyFogEnabled(boolean original) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getFog()) return false; - return original; - } +public class MixinFogRenderer { @ModifyReturnValue(method = "setupFog", at = @At("RETURN")) private FogData modifyFog(FogData fog) { diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinFont.java b/common/src/main/java/com/github/epsilon/mixins/MixinFont.java index dc70d77fc..efb5601ae 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinFont.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinFont.java @@ -3,8 +3,6 @@ import com.github.epsilon.graphics.text.minecraft.EpsilonFontGlyph; import com.github.epsilon.graphics.text.minecraft.EpsilonFontMetrics; import com.github.epsilon.modules.impl.ClientSetting; -import com.github.epsilon.modules.impl.render.NoRender; -import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.font.glyphs.BakedGlyph; import net.minecraft.network.chat.FormattedText; @@ -59,10 +57,4 @@ private void onWidthFormattedText(FormattedText text, CallbackInfoReturnable, A extends HumanoidModel> { - - @Inject(method = "submit(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;ILnet/minecraft/client/renderer/entity/state/HumanoidRenderState;FF)V", at = @At("HEAD"), cancellable = true) - private void onRender(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int lightCoords, S state, float yRot, float xRot, CallbackInfo ci) { - if (state instanceof AvatarRenderState && NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getNoArmor()) { - ci.cancel(); - } - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinItemFeatureRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinItemFeatureRenderer.java deleted file mode 100644 index 38c4a28ef..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinItemFeatureRenderer.java +++ /dev/null @@ -1,22 +0,0 @@ -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 net.minecraft.client.renderer.feature.ItemFeatureRenderer; -import net.minecraft.client.renderer.item.ItemStackRenderState; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; - -@Mixin(ItemFeatureRenderer.class) -public abstract class MixinItemFeatureRenderer { - - @WrapOperation(method = "prepareMainSubmit", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/feature/ItemFeatureRenderer$Submit;foilType()Lnet/minecraft/client/renderer/item/ItemStackRenderState$FoilType;")) - private ItemStackRenderState.FoilType cancelEnchantGlint(ItemFeatureRenderer.Submit submit, Operation original) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getEnchantGlint()) { - return ItemStackRenderState.FoilType.NONE; - } - return original.call(submit); - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinLevelExtractor.java b/common/src/main/java/com/github/epsilon/mixins/MixinLevelExtractor.java deleted file mode 100644 index 271aefa26..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinLevelExtractor.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.github.epsilon.mixins; - -import com.github.epsilon.modules.impl.render.NoRender; -import com.llamalad7.mixinextras.injector.v2.WrapWithCondition; -import net.minecraft.client.Camera; -import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.client.renderer.WeatherEffectRenderer; -import net.minecraft.client.renderer.WorldBorderRenderer; -import net.minecraft.client.renderer.extract.LevelExtractor; -import net.minecraft.client.renderer.state.level.LevelRenderState; -import net.minecraft.client.renderer.state.level.WeatherRenderState; -import net.minecraft.client.renderer.state.level.WorldBorderRenderState; -import net.minecraft.world.level.border.WorldBorder; -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.CallbackInfo; - -@Mixin(LevelExtractor.class) -public class MixinLevelExtractor { - - @WrapWithCondition( - method = "extract", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/WeatherEffectRenderer;extractRenderState(Lnet/minecraft/client/multiplayer/ClientLevel;FLnet/minecraft/world/phys/Vec3;Lnet/minecraft/client/renderer/state/level/WeatherRenderState;)V") - ) - private boolean extract$noWeather(WeatherEffectRenderer instance, ClientLevel level, float partialTicks, Vec3 cameraPos, WeatherRenderState renderState) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getWeather()) { - renderState.intensity = 0; - return false; - } - return true; - } - - @WrapWithCondition( - method = "extract", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/WorldBorderRenderer;extract(Lnet/minecraft/world/level/border/WorldBorder;FLnet/minecraft/world/phys/Vec3;DLnet/minecraft/client/renderer/state/level/WorldBorderRenderState;)V") - ) - private boolean extract$noWorldBorder(WorldBorderRenderer instance, WorldBorder border, float deltaPartialTick, Vec3 cameraPos, double renderDistance, WorldBorderRenderState state) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getWorldBorder()) { - state.alpha = 0; - return false; - } - return true; - } - - @Inject(method = "extractBlockDestroyAnimation", at = @At("HEAD"), cancellable = true) - private void onExtractBlockDestroyAnimation(Camera camera, LevelRenderState levelRenderState, CallbackInfo ci) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getBlockBreakOverlay()) ci.cancel(); - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinLevelRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinLevelRenderer.java index 5af173974..e95136187 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinLevelRenderer.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinLevelRenderer.java @@ -4,8 +4,10 @@ import com.github.epsilon.events.impl.Render3DEvent; import com.github.epsilon.graphics.shaders.CustomSkyShader; import com.github.epsilon.managers.ShaderManager; -import com.github.epsilon.modules.impl.render.*; -import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import com.github.epsilon.modules.impl.render.Chams; +import com.github.epsilon.modules.impl.render.CustomSky; +import com.github.epsilon.modules.impl.render.MotionBlur; +import com.github.epsilon.modules.impl.render.Shaders; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; @@ -22,7 +24,6 @@ import net.minecraft.client.renderer.state.level.CameraRenderState; import org.joml.Matrix4fc; import org.joml.Vector4f; -import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -89,21 +90,6 @@ private void addCustomSkyPassNeoForge(FrameGraphBuilder frame, CameraRenderState } } - @ModifyExpressionValue( - method = { - "addSkyPass(Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/client/renderer/state/level/CameraRenderState;Lcom/mojang/renderpearl/api/buffers/GpuBufferSlice;)V", - "addSkyPass(Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/client/renderer/state/level/CameraRenderState;Lcom/mojang/renderpearl/api/buffers/GpuBufferSlice;Lorg/joml/Matrix4fc;)V" // For NeoForge - }, - at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/state/level/CameraEntityRenderState;doesMobEffectBlockSky:Z", opcode = Opcodes.GETFIELD), - require = 0 - ) - private boolean modifyMobEffectBlocksSky(boolean original) { - if (NoRender.INSTANCE.isEnabled() && (NoRender.INSTANCE.getBlindness() || NoRender.INSTANCE.getDarkness())) { - return false; - } - return original; - } - @WrapOperation(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/PostChain;addToFrame(Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;IILnet/minecraft/client/renderer/PostChain$TargetBundle;)V", ordinal = 0)) private void replaceEntityOutlineShader(PostChain instance, FrameGraphBuilder frame, int screenWidth, int screenHeight, PostChain.TargetBundle providedTargets, Operation original) { if (!Shaders.INSTANCE.isEnabled()) original.call(instance, frame, screenWidth, screenHeight, providedTargets); diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinLivingEntity.java b/common/src/main/java/com/github/epsilon/mixins/MixinLivingEntity.java index 6746f8ab0..a069c744f 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinLivingEntity.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinLivingEntity.java @@ -4,7 +4,6 @@ import com.github.epsilon.modules.impl.player.InvManager; import com.github.epsilon.modules.impl.player.JumpCooldown; import com.github.epsilon.modules.impl.render.HandView; -import com.github.epsilon.modules.impl.render.NoRender; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; @@ -12,7 +11,6 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.component.SwingAnimation; import net.minecraft.world.phys.Vec3; import org.objectweb.asm.Opcodes; @@ -115,12 +113,4 @@ private void onSwing(InteractionHand hand, SwingAnimation animation, boolean sen } } - @Inject(method = "spawnItemParticles", at = @At("HEAD"), cancellable = true) - private void onSpawnItemParticles(ItemStack itemStack, int count, CallbackInfo ci) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getEatParticles() - && itemStack.getComponents().has(net.minecraft.core.component.DataComponents.FOOD)) { - ci.cancel(); - } - } - } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinMapRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinMapRenderer.java deleted file mode 100644 index 0d490bac5..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinMapRenderer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.epsilon.mixins; - -import com.github.epsilon.modules.impl.render.NoRender; -import com.llamalad7.mixinextras.injector.ModifyExpressionValue; -import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.client.renderer.MapRenderer; -import net.minecraft.client.renderer.SubmitNodeCollector; -import net.minecraft.client.renderer.state.MapRenderState; -import net.minecraft.world.level.saveddata.maps.MapDecoration; -import org.objectweb.asm.Opcodes; -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; - -import java.util.List; - -@Mixin(MapRenderer.class) -public abstract class MixinMapRenderer { - - @ModifyExpressionValue(method = "render", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/state/MapRenderState;decorations:Ljava/util/List;", opcode = Opcodes.GETFIELD)) - private List getDecorationsProxy(List original) { - return (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getMapMarkers()) ? List.of() : original; - } - - @Inject(method = "render", at = @At("HEAD"), cancellable = true) - private void onRender(MapRenderState mapRenderState, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, boolean showOnlyFrame, int lightCoords, CallbackInfo ci) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getMapContents()) ci.cancel(); - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinParticleManager.java b/common/src/main/java/com/github/epsilon/mixins/MixinParticleManager.java deleted file mode 100644 index ecb67b863..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinParticleManager.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.github.epsilon.mixins; - -import com.github.epsilon.modules.impl.render.NoRender; -import net.minecraft.client.particle.Particle; -import net.minecraft.client.particle.ParticleEngine; -import net.minecraft.core.particles.ParticleOptions; -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.world.entity.Entity; -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; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(ParticleEngine.class) -public class MixinParticleManager { - - @Inject(method = "createParticle", at = @At("HEAD"), cancellable = true, require = 0) - private void onCreateParticle(ParticleOptions options, double x, double y, double z, double xa, double ya, double za, CallbackInfoReturnable cir) { - if (shouldCancel(options)) cir.setReturnValue(null); - } - - @Inject(method = "createTrackingEmitter(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/particles/ParticleOptions;I)V", at = @At("HEAD"), cancellable = true, require = 0) - private void onCreateTrackingEmitter(Entity entity, ParticleOptions particle, int lifeTime, CallbackInfo ci) { - if (shouldCancel(particle)) ci.cancel(); - } - - private boolean shouldCancel(ParticleOptions particleOptions) { - if (particleOptions == null) return false; - var type = particleOptions.getType(); - if (type == ParticleTypes.FLAME) return true; // LoyisaIsImposter - if (type == ParticleTypes.TOTEM_OF_UNDYING) return true; - if (NoRender.INSTANCE.isEnabled()) { - if (NoRender.INSTANCE.getWeather() && type == ParticleTypes.RAIN) return true; - return NoRender.INSTANCE.getFireworkExplosions() && type == ParticleTypes.FIREWORK; - } - return false; - } - -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinScreenEffectRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinScreenEffectRenderer.java index be732c590..7892c3555 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinScreenEffectRenderer.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinScreenEffectRenderer.java @@ -1,13 +1,10 @@ package com.github.epsilon.mixins; -import com.github.epsilon.modules.impl.render.NoRender; import com.github.epsilon.modules.impl.render.TotemAnimation; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.ScreenEffectRenderer; import net.minecraft.client.renderer.SubmitNodeCollector; import net.minecraft.client.renderer.state.level.PlayerRenderState; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -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; @@ -16,35 +13,11 @@ @Mixin(ScreenEffectRenderer.class) public class MixinScreenEffectRenderer { - // 26.3 的屏幕效果提交改为直接传图集位置与 UV,参数列表随之变化。 - @Inject(method = "submitBlockSprite", at = @At("HEAD"), cancellable = true) - private static void onRenderBlockOverlay(Identifier atlasLocation, float u0, float v0, float u1, float v1, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int color, CallbackInfo ci) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getBlockOverlay()) { - ci.cancel(); - } - } - - @Inject(method = "submitWater", at = @At("HEAD"), cancellable = true) - private static void onRenderWater(PlayerRenderState.WaterOverlay waterOverlay, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, CallbackInfo ci) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getLiquidOverlay()) { - ci.cancel(); - } - } - - @Inject(method = "submitFire", at = @At("HEAD"), cancellable = true) - private static void onRenderFire(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, TextureAtlasSprite texture, CallbackInfo ci) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getFireOverlay()) { - ci.cancel(); - } - } - @Inject(method = "renderItemActivationAnimation", at = @At("HEAD"), cancellable = true) private void onRenderItemActivationAnimation(PlayerRenderState playerState, PoseStack poseStack, float partialTicks, SubmitNodeCollector submitNodeCollector, CallbackInfo ci) { if (TotemAnimation.INSTANCE.isEnabled()) { TotemAnimation.INSTANCE.renderFloatingItem(partialTicks, poseStack, submitNodeCollector); ci.cancel(); - } else if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getTotemAnimation()) { - ci.cancel(); } } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinSpawnerRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinSpawnerRenderer.java deleted file mode 100644 index d856b516d..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinSpawnerRenderer.java +++ /dev/null @@ -1,23 +0,0 @@ -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.SpawnerRenderer; -import net.minecraft.client.renderer.entity.EntityRenderDispatcher; -import net.minecraft.client.renderer.entity.state.EntityRenderState; -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(SpawnerRenderer.class) -public abstract class MixinSpawnerRenderer { - - @Inject(method = "submitEntityInSpawner", at = @At("HEAD"), cancellable = true) - private static void onRenderDisplayEntity(PoseStack poseStack, SubmitNodeCollector submitNodeCollector, EntityRenderState displayEntity, EntityRenderDispatcher entityRenderer, float spin, float scale, CameraRenderState camera, CallbackInfo ci) { - if (NoRender.INSTANCE.isEnabled() && NoRender.INSTANCE.getNoMobInSpawner()) ci.cancel(); - } - -} diff --git a/common/src/main/kotlin/com/github/epsilon/modules/impl/render/NoRender.kt b/common/src/main/kotlin/com/github/epsilon/modules/impl/render/NoRender.kt index 74093e986..59c1f799c 100644 --- a/common/src/main/kotlin/com/github/epsilon/modules/impl/render/NoRender.kt +++ b/common/src/main/kotlin/com/github/epsilon/modules/impl/render/NoRender.kt @@ -2,70 +2,7 @@ package com.github.epsilon.modules.impl.render import com.github.epsilon.modules.Category import com.github.epsilon.modules.Module -import net.minecraft.world.entity.EntityType object NoRender : Module("No Render", Category.RENDER) { - // Overlay - val portalOverlay by boolSetting("Portal Overlay", false) - val spyglassOverlay by boolSetting("Spyglass Overlay", false) - val nausea by boolSetting("Nausea", false) - val fireOverlay by boolSetting("Fire Overlay", false) - val liquidOverlay by boolSetting("Liquid Overlay", false) - val blockOverlay by boolSetting("Block Overlay", true) - val vignette by boolSetting("Vignette", false) - val totemAnimation by boolSetting("Totem Animation", false) - val eatParticles by boolSetting("Eat Particles", false) - val enchantGlint by boolSetting("Enchant Glint", false) - - // HUD - val bossBar by boolSetting("Boss Bar", false) - val scoreboard by boolSetting("Scoreboard", false) - val chat by boolSetting("Chat", false) - val crosshair by boolSetting("Crosshair", false) - val title by boolSetting("Title", false) - val heldItemName by boolSetting("Held Item Name", false) - val obfuscation by boolSetting("Obfuscation", false) - val potionIcons by boolSetting("Potion Icons", false) - - // World - val weather by boolSetting("Weather", false) - val worldBorder by boolSetting("World Border", false) - val blindness by boolSetting("Blindness", false) - val darkness by boolSetting("Darkness", false) - val fog by boolSetting("Fog", false) - val enchTableBook by boolSetting("Ench Table Book", false) - val signText by boolSetting("Sign Text", false) - val blockBreakOverlay by boolSetting("Block Break Overlay", false) - val beaconBeams by boolSetting("Beacon Beams", false) - val fallingBlocks by boolSetting("Falling Blocks", false) - val caveCulling by boolSetting("Cave Culling", false, onChanged = { _ -> mc.levelExtractor.allChanged() }) - val mapMarkers by boolSetting("Map Markers", false) - val mapContents by boolSetting("Map Contents", false) - val bannerRender by boolSetting("Banners", false) - val explosions by boolSetting("Explosions", false) - val fireworkExplosions by boolSetting("Firework Explosions", false) - val barrierInvis by boolSetting("Barrier Invisibility", false) - val textureRotations by boolSetting("Texture Rotations", false, onChanged = { _ -> mc.levelExtractor.allChanged() }) - - // Entity - val entities by entityTypeListSetting("Entities", listOf>()) - val dropSpawnPacket by boolSetting("Drop Spawn Packet", false) - val noArmor by boolSetting("No Armor", false) - val noMobInSpawner by boolSetting("No Mob In Spawner", false) - val noDeadEntities by boolSetting("No Dead Entities", false) - val noNametags by boolSetting("No Nametags", false) - - init { - onEnable { - if (caveCulling || textureRotations) mc.levelExtractor.allChanged() - } - - onDisable { - if (caveCulling || textureRotations) mc.levelExtractor.allChanged() - } - } - - fun noEntity(entityType: EntityType<*>): Boolean = isEnabled && entities.contains(entityType) - } diff --git a/common/src/main/resources/epsilon.mixins.json b/common/src/main/resources/epsilon.mixins.json index 38c5b9353..eb4758c72 100644 --- a/common/src/main/resources/epsilon.mixins.json +++ b/common/src/main/resources/epsilon.mixins.json @@ -3,16 +3,12 @@ "package": "com.github.epsilon.mixins", "compatibilityLevel": "JAVA_25", "client": [ - "MixinAbstractSignRenderer", "MixinAddressCheck", "MixinAvatar", "MixinAvatarRenderer", - "MixinBannerRenderer", - "MixinBeaconRenderer", "MixinBlock", "MixinBlockCollisions", "MixinBlockItem", - "MixinBossHealthOverlay", "MixinCamera", "MixinChatComponent", "MixinChatComponentHash", @@ -29,14 +25,12 @@ "MixinDataComponentInitializerEntry", "MixinDeltaTrackerTimer", "MixinDynamicUniforms", - "MixinEnchantTableRenderer", "MixinEntity", "MixinEntityRenderDispatcher", "MixinEntityRenderer", "MixinEntityRenderState", "MixinFireworkParticlesStarter", "MixinFireworkRocketEntity", - "MixinFireworksSparkParticleSub", "MixinFirstPersonHandsAndItems", "MixinFlowingFluid", "MixinFogRenderer", @@ -48,32 +42,26 @@ "MixinGuiGraphicsExtractor", "MixinGuiRenderer", "MixinHud", - "MixinHumanoidArmorLayer", "MixinHumanoidMobRenderer", "MixinInventoryScreen", "MixinItem", "MixinItemEntityRenderer", - "MixinItemFeatureRenderer", "MixinItemInHandRenderer", "MixinKeyboardHandler", "MixinKeyboardInput", - "MixinLevelExtractor", "MixinLevelRenderer", "MixinLightmap", "MixinLivingEntity", "MixinLivingEntityRenderer", "MixinLocalPlayer", - "MixinMapRenderer", "MixinMinecraft", "MixinMouseHandler", "MixinMultiPlayerGameMode", "MixinOptions", - "MixinParticleManager", "MixinPlayer", "MixinProjection", "MixinScreen", "MixinScreenEffectRenderer", - "MixinSpawnerRenderer", "MixinSubmitNodeCollection", "MixinTitleScreen", "MixinVisGraph", From 81fd590ea3dfef64f0eb333744644eb8d284e998 Mon Sep 17 00:00:00 2001 From: Yozupi Date: Sat, 14 Nov 2026 21:47:54 +0800 Subject: [PATCH 2/3] del i18n --- .../resources/assets/epsilon/i18n/en_us.json | 46 +------------------ .../resources/assets/epsilon/i18n/zh_cn.json | 46 +------------------ 2 files changed, 2 insertions(+), 90 deletions(-) diff --git a/common/src/main/resources/assets/epsilon/i18n/en_us.json b/common/src/main/resources/assets/epsilon/i18n/en_us.json index 37cd4a9f5..e60ca5b78 100644 --- a/common/src/main/resources/assets/epsilon/i18n/en_us.json +++ b/common/src/main/resources/assets/epsilon/i18n/en_us.json @@ -2208,51 +2208,7 @@ "shadow blur": "Shadow Blur", "shadow color": "Shadow Color" }, - "no render": { - "_value": "No Render", - "portal overlay": "Portal Overlay", - "spyglass overlay": "Spyglass Overlay", - "nausea": "Nausea", - "fire overlay": "Fire Overlay", - "liquid overlay": "Liquid Overlay", - "block overlay": "Block Overlay", - "vignette": "Vignette", - "totem animation": "Totem Animation", - "eat particles": "Eat Particles", - "enchant glint": "Enchant Glint", - "boss bar": "Boss Bar", - "scoreboard": "Scoreboard", - "chat": "Chat", - "crosshair": "Crosshair", - "title": "Title", - "held item name": "Held Item Name", - "obfuscation": "Obfuscation", - "potion icons": "Potion Icons", - "weather": "Weather", - "world border": "World Border", - "blindness": "Blindness", - "darkness": "Darkness", - "fog": "Fog", - "ench table book": "Ench Table Book", - "sign text": "Sign Text", - "block break overlay": "Block Break Overlay", - "beacon beams": "Beacon Beams", - "falling blocks": "Falling Blocks", - "cave culling": "Cave Culling", - "map markers": "Map Markers", - "map contents": "Map Contents", - "banners": "Banners", - "explosions": "Explosions", - "firework explosions": "Firework Explosions", - "barrier invisibility": "Barrier Invisibility", - "texture rotations": "Texture Rotations", - "entities": "Entities", - "drop spawn packet": "Drop Spawn Packet", - "no armor": "No Armor", - "no mob in spawner": "No Mob In Spawner", - "no dead entities": "No Dead Entities", - "no nametags": "No Nametags" - }, + "no render": "No Render", "particles": { "_value": "Particles", "mode": { diff --git a/common/src/main/resources/assets/epsilon/i18n/zh_cn.json b/common/src/main/resources/assets/epsilon/i18n/zh_cn.json index b1096297f..81b216430 100644 --- a/common/src/main/resources/assets/epsilon/i18n/zh_cn.json +++ b/common/src/main/resources/assets/epsilon/i18n/zh_cn.json @@ -2208,51 +2208,7 @@ "shadow blur": "阴影模糊", "shadow color": "阴影颜色" }, - "no render": { - "_value": "移除渲染", - "portal overlay": "传送门遮罩", - "spyglass overlay": "望远镜遮罩", - "nausea": "反胃", - "fire overlay": "火焰遮罩", - "liquid overlay": "液体遮罩", - "block overlay": "方块遮罩", - "vignette": "暗角", - "totem animation": "图腾动画", - "eat particles": "进食粒子", - "enchant glint": "附魔光效", - "boss bar": "Boss 血条", - "scoreboard": "计分板", - "chat": "聊天栏", - "crosshair": "准星", - "title": "标题", - "held item name": "手持物品名称", - "obfuscation": "混淆文字", - "potion icons": "药水图标", - "weather": "天气", - "world border": "世界边界", - "blindness": "失明", - "darkness": "黑暗", - "fog": "迷雾", - "ench table book": "附魔台书本", - "sign text": "告示牌文字", - "block break overlay": "方块破坏遮罩", - "beacon beams": "信标光束", - "falling blocks": "下落方块", - "cave culling": "洞穴剔除", - "map markers": "地图标记", - "map contents": "地图内容", - "banners": "旗帜", - "explosions": "爆炸粒子", - "firework explosions": "烟花爆炸", - "barrier invisibility": "屏障隐形效果", - "texture rotations": "纹理旋转", - "entities": "实体", - "drop spawn packet": "丢弃生成数据包", - "no armor": "无盔甲", - "no mob in spawner": "刷怪笼内无生物", - "no dead entities": "无死亡实体", - "no nametags": "无名称标签" - }, + "no render": "移除渲染", "particles": { "_value": "环境粒子", "mode": { From 27628276b9b1621c6e69cd1af60b08bd71a6b18c Mon Sep 17 00:00:00 2001 From: Yozupi Date: Sat, 14 Nov 2026 22:30:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=88=91=E7=9A=84?= =?UTF-8?q?=E4=B8=96=E7=95=8C=E4=B8=8D=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mixins/MixinAbstractSignRenderer.java | 18 ++ .../epsilon/mixins/MixinBannerRenderer.java | 39 ++++ .../epsilon/mixins/MixinBeaconRenderer.java | 18 ++ .../epsilon/mixins/MixinBlockBehaviour.java | 18 ++ .../MixinBlockEntityRenderDispatcher.java | 22 ++ .../epsilon/mixins/MixinBlockState.java | 19 ++ .../github/epsilon/mixins/MixinCamera.java | 20 ++ .../epsilon/mixins/MixinChatLineConsumer.java | 17 ++ .../epsilon/mixins/MixinClientLevel.java | 15 ++ .../MixinClientboundEntityEventPacket.java | 14 -- .../epsilon/mixins/MixinCustomHeadLayer.java | 22 ++ .../mixins/MixinEnchantTableRenderer.java | 18 ++ .../github/epsilon/mixins/MixinEntity.java | 13 ++ .../mixins/MixinEntityRenderDispatcher.java | 17 ++ .../epsilon/mixins/MixinEntityRenderer.java | 3 +- .../mixins/MixinFireworkParticles.java | 18 ++ .../epsilon/mixins/MixinFogRenderer.java | 7 + .../com/github/epsilon/mixins/MixinFont.java | 7 + .../epsilon/mixins/MixinGameRenderer.java | 7 + .../com/github/epsilon/mixins/MixinHud.java | 69 +++++- .../mixins/MixinHumanoidArmorLayer.java | 22 ++ .../mixins/MixinItemFeatureRenderer.java | 18 ++ .../epsilon/mixins/MixinLevelExtractor.java | 32 +++ .../MixinLightmapRenderStateExtractor.java | 17 ++ .../epsilon/mixins/MixinLivingEntity.java | 8 + .../epsilon/mixins/MixinLocalPlayer.java | 6 +- .../epsilon/mixins/MixinMapRenderer.java | 27 +++ .../mixins/MixinMobEffectFogEnvironment.java | 26 +++ .../epsilon/mixins/MixinParticleEngine.java | 20 ++ .../github/epsilon/mixins/MixinScreen.java | 8 +- .../mixins/MixinScreenEffectRenderer.java | 20 +- .../mixins/MixinSodiumFogParameters.java | 21 ++ .../mixins/MixinSodiumWorldRenderer.java | 18 ++ .../epsilon/mixins/MixinSpawnerRenderer.java | 18 ++ .../assets/i18n/EpsilonTranslations.kt | 2 + .../panel/popup/RegistryListSelectPopup.kt | 15 ++ .../epsilon/gui/utils/RegistryListUi.kt | 1 + .../ClientboundEntityEventPacketAccessor.kt | 7 - .../epsilon/modules/impl/combat/SpearAura.kt | 5 +- .../elytra_combat/combat/CombatHitTracker.kt | 3 +- .../epsilon/modules/impl/render/NoRender.kt | 203 ++++++++++++++++++ .../github/epsilon/settings/SettingHost.kt | 12 +- .../settings/impl/RegistryListSetting.kt | 4 + .../resources/META-INF/accesstransformer.cfg | 4 +- .../resources/assets/epsilon/i18n/en_us.json | 64 +++++- .../resources/assets/epsilon/i18n/zh_cn.json | 64 +++++- .../src/main/resources/epsilon.accesswidener | 4 +- common/src/main/resources/epsilon.mixins.json | 21 +- 48 files changed, 1011 insertions(+), 40 deletions(-) create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinAbstractSignRenderer.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinBannerRenderer.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinBeaconRenderer.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinBlockBehaviour.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinBlockEntityRenderDispatcher.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinBlockState.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinChatLineConsumer.java delete mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinClientboundEntityEventPacket.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinCustomHeadLayer.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinEnchantTableRenderer.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinFireworkParticles.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinHumanoidArmorLayer.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinItemFeatureRenderer.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinLevelExtractor.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinLightmapRenderStateExtractor.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinMapRenderer.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinMobEffectFogEnvironment.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinParticleEngine.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinSodiumFogParameters.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinSodiumWorldRenderer.java create mode 100644 common/src/main/java/com/github/epsilon/mixins/MixinSpawnerRenderer.java delete mode 100644 common/src/main/kotlin/com/github/epsilon/interfaces/ClientboundEntityEventPacketAccessor.kt diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinAbstractSignRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinAbstractSignRenderer.java new file mode 100644 index 000000000..ae6a7bc57 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinAbstractSignRenderer.java @@ -0,0 +1,18 @@ +package com.github.epsilon.mixins; + +import com.github.epsilon.modules.impl.render.NoRender; +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 abstract class MixinAbstractSignRenderer { + + @Inject(method = "submitSignText", at = @At("HEAD"), cancellable = true) + private void epsilon$hideSignText(CallbackInfo ci) { + if (NoRender.INSTANCE.noSignText()) ci.cancel(); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinBannerRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinBannerRenderer.java new file mode 100644 index 000000000..2621aa062 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinBannerRenderer.java @@ -0,0 +1,39 @@ +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.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; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(BannerRenderer.class) +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 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 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); + } + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinBeaconRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinBeaconRenderer.java new file mode 100644 index 000000000..d52ed0013 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinBeaconRenderer.java @@ -0,0 +1,18 @@ +package com.github.epsilon.mixins; + +import com.github.epsilon.modules.impl.render.NoRender; +import net.minecraft.client.renderer.blockentity.BeaconRenderer; +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(BeaconRenderer.class) +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 epsilon$hideBeaconBeam(CallbackInfo ci) { + if (NoRender.INSTANCE.noBeaconBeams()) ci.cancel(); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinBlockBehaviour.java b/common/src/main/java/com/github/epsilon/mixins/MixinBlockBehaviour.java new file mode 100644 index 000000000..951a7cbc6 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinBlockBehaviour.java @@ -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 cir) { + if (NoRender.INSTANCE.noTextureRotations()) cir.setReturnValue(0L); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinBlockEntityRenderDispatcher.java b/common/src/main/java/com/github/epsilon/mixins/MixinBlockEntityRenderDispatcher.java new file mode 100644 index 000000000..0a6378e75 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinBlockEntityRenderDispatcher.java @@ -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(); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinBlockState.java b/common/src/main/java/com/github/epsilon/mixins/MixinBlockState.java new file mode 100644 index 000000000..f7e195423 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinBlockState.java @@ -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 cir) { + if (NoRender.INSTANCE.noTextureRotations()) cir.setReturnValue(Vec3.ZERO); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinCamera.java b/common/src/main/java/com/github/epsilon/mixins/MixinCamera.java index 00b15ed4c..d1b225547 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinCamera.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinCamera.java @@ -2,12 +2,20 @@ import com.github.epsilon.modules.impl.render.CameraClip; 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; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -141,4 +149,16 @@ private float hookSneakTweakCameraSpeed(float modifier) { return modifier; } + @Inject(method = "getFluidInCamera", at = @At("HEAD"), cancellable = true) + private void epsilon$hideLiquidOverlay(CallbackInfoReturnable 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 effect, Operation original) { + if (effect == MobEffects.BLINDNESS && NoRender.INSTANCE.noBlindness()) return false; + if (effect == MobEffects.DARKNESS && NoRender.INSTANCE.noDarkness()) return false; + return original.call(entity, effect); + } + } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinChatLineConsumer.java b/common/src/main/java/com/github/epsilon/mixins/MixinChatLineConsumer.java new file mode 100644 index 000000000..210be6eb1 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinChatLineConsumer.java @@ -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; + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinClientLevel.java b/common/src/main/java/com/github/epsilon/mixins/MixinClientLevel.java index 32c1a2771..baf86068b 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinClientLevel.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinClientLevel.java @@ -2,11 +2,16 @@ import com.github.epsilon.Constants; 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.ModifyArg; import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -42,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; + } + } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinClientboundEntityEventPacket.java b/common/src/main/java/com/github/epsilon/mixins/MixinClientboundEntityEventPacket.java deleted file mode 100644 index e8da08179..000000000 --- a/common/src/main/java/com/github/epsilon/mixins/MixinClientboundEntityEventPacket.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.epsilon.mixins; - -import com.github.epsilon.interfaces.ClientboundEntityEventPacketAccessor; -import net.minecraft.network.protocol.game.ClientboundEntityEventPacket; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(ClientboundEntityEventPacket.class) -public abstract class MixinClientboundEntityEventPacket implements ClientboundEntityEventPacketAccessor { - - @Override - @Accessor("entityId") - public abstract int epsilon$getEntityId(); -} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinCustomHeadLayer.java b/common/src/main/java/com/github/epsilon/mixins/MixinCustomHeadLayer.java new file mode 100644 index 000000000..93e9b43e1 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinCustomHeadLayer.java @@ -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.entity.layers.CustomHeadLayer; +import net.minecraft.client.renderer.entity.state.AvatarRenderState; +import net.minecraft.client.renderer.entity.state.LivingEntityRenderState; +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(CustomHeadLayer.class) +public abstract class MixinCustomHeadLayer { + + @Inject(method = "submit(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;ILnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;FF)V", at = @At("HEAD"), cancellable = true) + private void epsilon$hideArmor(PoseStack poseStack, SubmitNodeCollector collector, int lightCoords, LivingEntityRenderState state, float yRot, float xRot, CallbackInfo ci) { + if (state instanceof AvatarRenderState && NoRender.INSTANCE.noArmor()) ci.cancel(); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinEnchantTableRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinEnchantTableRenderer.java new file mode 100644 index 000000000..c644bc7a8 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinEnchantTableRenderer.java @@ -0,0 +1,18 @@ +package com.github.epsilon.mixins; + +import com.github.epsilon.modules.impl.render.NoRender; +import net.minecraft.client.renderer.blockentity.EnchantTableRenderer; +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(EnchantTableRenderer.class) +public abstract class MixinEnchantTableRenderer { + + @Inject(method = "submit(Lnet/minecraft/client/renderer/blockentity/state/EnchantTableRenderState;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 epsilon$hideBook(CallbackInfo ci) { + if (NoRender.INSTANCE.noEnchTableBook()) ci.cancel(); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinEntity.java b/common/src/main/java/com/github/epsilon/mixins/MixinEntity.java index 5c8dd7402..555516d3d 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinEntity.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinEntity.java @@ -4,6 +4,7 @@ import com.github.epsilon.events.impl.StrafeEvent; import com.github.epsilon.modules.impl.movement.Velocity; import com.github.epsilon.modules.impl.render.FreeCamera; +import com.github.epsilon.modules.impl.render.NoRender; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.minecraft.world.entity.Entity; @@ -13,6 +14,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyArgs; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.invoke.arg.Args; import static com.github.epsilon.kernel.MinecraftWrapper.mc; @@ -62,4 +64,15 @@ private void pushAwayFromHook(Args args) { } } + @Inject(method = "isInvisibleTo", at = @At("HEAD"), cancellable = true) + private void epsilon$showInvisibleEntity(CallbackInfoReturnable cir) { + if (((Entity) (Object) this).level().isClientSide() && NoRender.INSTANCE.noInvisibility()) + cir.setReturnValue(false); + } + + @Inject(method = "isCurrentlyGlowing", at = @At("HEAD"), cancellable = true) + private void epsilon$hideGlowing(CallbackInfoReturnable cir) { + if (((Entity) (Object) this).level().isClientSide() && NoRender.INSTANCE.noGlowing()) cir.setReturnValue(false); + } + } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderDispatcher.java b/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderDispatcher.java index 70f1e960c..21e9bd05a 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderDispatcher.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderDispatcher.java @@ -2,18 +2,24 @@ import com.github.epsilon.interfaces.EntityRenderStateAccessor; import com.github.epsilon.modules.impl.render.Chams; +import com.github.epsilon.modules.impl.render.NoRender; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.SubmitNodeCollector; +import net.minecraft.client.renderer.culling.Frustum; import net.minecraft.client.renderer.entity.EntityRenderDispatcher; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.state.EntityRenderState; import net.minecraft.client.renderer.state.level.CameraRenderState; import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; 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; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(EntityRenderDispatcher.class) public class MixinEntityRenderDispatcher { @@ -38,4 +44,15 @@ private EntityRenderState onExtractEntity(EntityRenderState s return state; } + @Inject(method = "shouldRender", at = @At("HEAD"), cancellable = true) + private void epsilon$hideEntity(Entity entity, Frustum culler, double camX, double camY, double camZ, float partialTicks, CallbackInfoReturnable cir) { + if (NoRender.INSTANCE.noEntity(entity)) cir.setReturnValue(false); + } + + @Inject(method = "submit", at = @At("HEAD"), cancellable = true) + private void epsilon$hideDeadEntity(EntityRenderState state, CameraRenderState camera, double x, double y, double z, PoseStack poseStack, SubmitNodeCollector collector, CallbackInfo ci) { + if (NoRender.INSTANCE.noDeadEntities() && state instanceof EntityRenderStateAccessor accessor + && accessor.epsilon$getEntity() instanceof LivingEntity entity && entity.isDeadOrDying()) ci.cancel(); + } + } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderer.java index 9bd4143c8..6d349bc68 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderer.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinEntityRenderer.java @@ -2,6 +2,7 @@ import com.github.epsilon.modules.impl.render.CrystalChams; import com.github.epsilon.modules.impl.render.NameTags; +import com.github.epsilon.modules.impl.render.NoRender; import com.github.epsilon.modules.impl.render.Shaders; import net.minecraft.client.renderer.culling.Frustum; import net.minecraft.client.renderer.entity.EntityRenderer; @@ -35,7 +36,7 @@ private void hookShouldRender(T entity, Frustum culler, double camX, double camY @Inject(method = "extractNameTags(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/client/renderer/entity/state/EntityRenderState;FDD)V", at = @At("HEAD"), cancellable = true) private void hookExtractNameTags(T entity, S state, float partialTicks, double nameTagDistance, double belowNameDistance, CallbackInfo ci) { - if (NameTags.INSTANCE.isEnabled() && entity instanceof Player) { + if (NoRender.INSTANCE.noNametags() || NameTags.INSTANCE.isEnabled() && entity instanceof Player) { ci.cancel(); } } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinFireworkParticles.java b/common/src/main/java/com/github/epsilon/mixins/MixinFireworkParticles.java new file mode 100644 index 000000000..e2c20925a --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinFireworkParticles.java @@ -0,0 +1,18 @@ +package com.github.epsilon.mixins; + +import com.github.epsilon.modules.impl.render.NoRender; +import net.minecraft.client.particle.FireworkParticles; +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({FireworkParticles.SparkParticle.class, FireworkParticles.OverlayParticle.class}) +public abstract class MixinFireworkParticles { + + @Inject(method = "extract", at = @At("HEAD"), cancellable = true) + private void epsilon$hideExplosion(CallbackInfo ci) { + if (NoRender.INSTANCE.noFireworkExplosions()) ci.cancel(); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinFogRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinFogRenderer.java index 53e17c4aa..bb6019246 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinFogRenderer.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinFogRenderer.java @@ -1,6 +1,8 @@ package com.github.epsilon.mixins; +import com.github.epsilon.modules.impl.render.NoRender; import com.github.epsilon.modules.impl.render.WorldTweaks; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.ModifyReturnValue; import net.minecraft.client.renderer.fog.FogData; import net.minecraft.client.renderer.fog.FogRenderer; @@ -25,4 +27,9 @@ private FogData modifyFog(FogData fog) { return fog; } + @ModifyExpressionValue(method = "getBuffer", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/fog/FogRenderer;fogEnabled:Z")) + private boolean epsilon$hideFog(boolean original) { + return original && !NoRender.INSTANCE.noFog(); + } + } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinFont.java b/common/src/main/java/com/github/epsilon/mixins/MixinFont.java index efb5601ae..6f9d2e8ee 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinFont.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinFont.java @@ -3,6 +3,8 @@ import com.github.epsilon.graphics.text.minecraft.EpsilonFontGlyph; import com.github.epsilon.graphics.text.minecraft.EpsilonFontMetrics; import com.github.epsilon.modules.impl.ClientSetting; +import com.github.epsilon.modules.impl.render.NoRender; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.font.glyphs.BakedGlyph; import net.minecraft.network.chat.FormattedText; @@ -57,4 +59,9 @@ private void onWidthFormattedText(FormattedText text, CallbackInfoReturnable epsilon$hideMapMarkers(List original) { + return NoRender.INSTANCE.noMapMarkers() ? List.of() : original; + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinMobEffectFogEnvironment.java b/common/src/main/java/com/github/epsilon/mixins/MixinMobEffectFogEnvironment.java new file mode 100644 index 000000000..82b21f5d3 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinMobEffectFogEnvironment.java @@ -0,0 +1,26 @@ +package com.github.epsilon.mixins; + +import com.github.epsilon.modules.impl.render.NoRender; +import com.llamalad7.mixinextras.injector.ModifyReturnValue; +import net.minecraft.client.renderer.fog.environment.MobEffectFogEnvironment; +import net.minecraft.core.Holder; +import net.minecraft.world.effect.MobEffect; +import net.minecraft.world.effect.MobEffects; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; + +@Mixin(MobEffectFogEnvironment.class) +public abstract class MixinMobEffectFogEnvironment { + + @Shadow + public abstract Holder getMobEffect(); + + @ModifyReturnValue(method = "isApplicable", at = @At("RETURN")) + private boolean epsilon$hideEffectFog(boolean original) { + if (getMobEffect() == MobEffects.BLINDNESS && NoRender.INSTANCE.noBlindness()) return false; + if (getMobEffect() == MobEffects.DARKNESS && NoRender.INSTANCE.noDarkness()) return false; + return original; + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinParticleEngine.java b/common/src/main/java/com/github/epsilon/mixins/MixinParticleEngine.java new file mode 100644 index 000000000..589cab173 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinParticleEngine.java @@ -0,0 +1,20 @@ +package com.github.epsilon.mixins; + +import com.github.epsilon.modules.impl.render.NoRender; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleEngine; +import net.minecraft.core.particles.ParticleOptions; +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(ParticleEngine.class) +public abstract class MixinParticleEngine { + + @Inject(method = "createParticle", at = @At("HEAD"), cancellable = true) + private void epsilon$hideParticle(ParticleOptions options, double x, double y, double z, double xa, double ya, double za, CallbackInfoReturnable cir) { + if (NoRender.INSTANCE.noParticle(options.getType())) cir.setReturnValue(null); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinScreen.java b/common/src/main/java/com/github/epsilon/mixins/MixinScreen.java index b7859bb22..d78419250 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinScreen.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinScreen.java @@ -1,8 +1,10 @@ package com.github.epsilon.mixins; import com.github.epsilon.modules.impl.render.GameAnimation; +import com.github.epsilon.modules.impl.render.NoRender; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphicsExtractor; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; @@ -46,8 +48,12 @@ private void popInventoryAnimation(GuiGraphicsExtractor graphics, int mouseX, in epsilon$inventoryTransform = false; } - @Inject(method = "extractTransparentBackground", at = @At("HEAD")) + @Inject(method = "extractTransparentBackground", at = @At("HEAD"), cancellable = true) private void neutralizeBackgroundScale(GuiGraphicsExtractor graphics, CallbackInfo ci) { + if (Minecraft.getInstance().level != null && NoRender.INSTANCE.noGuiBackground()) { + ci.cancel(); + return; + } if (!epsilon$inventoryTransform) return; epsilon$scaleAroundCenter(graphics, 1.0f / epsilon$inventoryScale); diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinScreenEffectRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinScreenEffectRenderer.java index 7892c3555..3fc87bf59 100644 --- a/common/src/main/java/com/github/epsilon/mixins/MixinScreenEffectRenderer.java +++ b/common/src/main/java/com/github/epsilon/mixins/MixinScreenEffectRenderer.java @@ -1,5 +1,6 @@ package com.github.epsilon.mixins; +import com.github.epsilon.modules.impl.render.NoRender; import com.github.epsilon.modules.impl.render.TotemAnimation; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.renderer.ScreenEffectRenderer; @@ -15,10 +16,27 @@ public class MixinScreenEffectRenderer { @Inject(method = "renderItemActivationAnimation", at = @At("HEAD"), cancellable = true) private void onRenderItemActivationAnimation(PlayerRenderState playerState, PoseStack poseStack, float partialTicks, SubmitNodeCollector submitNodeCollector, CallbackInfo ci) { - if (TotemAnimation.INSTANCE.isEnabled()) { + if (NoRender.INSTANCE.noTotemAnimation()) { + ci.cancel(); + } else if (TotemAnimation.INSTANCE.isEnabled()) { TotemAnimation.INSTANCE.renderFloatingItem(partialTicks, poseStack, submitNodeCollector); ci.cancel(); } } + @Inject(method = "submitFire", at = @At("HEAD"), cancellable = true) + private static void epsilon$submitFire(CallbackInfo ci) { + if (NoRender.INSTANCE.noFireOverlay()) ci.cancel(); + } + + @Inject(method = "submitWater", at = @At("HEAD"), cancellable = true) + private static void epsilon$submitWater(CallbackInfo ci) { + if (NoRender.INSTANCE.noLiquidOverlay()) ci.cancel(); + } + + @Inject(method = "submitBlockSprite", at = @At("HEAD"), cancellable = true) + private static void epsilon$submitBlockSprite(CallbackInfo ci) { + if (NoRender.INSTANCE.noInWallOverlay()) ci.cancel(); + } + } diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinSodiumFogParameters.java b/common/src/main/java/com/github/epsilon/mixins/MixinSodiumFogParameters.java new file mode 100644 index 000000000..0a2ecb389 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinSodiumFogParameters.java @@ -0,0 +1,21 @@ +package com.github.epsilon.mixins; + +import com.github.epsilon.modules.impl.render.NoRender; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Pseudo; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArgs; +import org.spongepowered.asm.mixin.injection.invoke.arg.Args; + +@Pseudo +@Mixin(targets = "net.caffeinemc.mods.sodium.client.util.FogParameters", remap = false) +public abstract class MixinSodiumFogParameters { + + @ModifyArgs(method = "(FFFFFFFF)V", at = @At(value = "INVOKE", target = "Lnet/caffeinemc/mods/sodium/client/util/FogParameters;(FFFFFFFFF)V")) + private static void epsilon$hideFog(Args args) { + if (NoRender.INSTANCE.noFog()) { + for (int index = 4; index <= 8; index++) args.set(index, Float.MAX_VALUE); + } + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinSodiumWorldRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinSodiumWorldRenderer.java new file mode 100644 index 000000000..97143d21d --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinSodiumWorldRenderer.java @@ -0,0 +1,18 @@ +package com.github.epsilon.mixins; + +import com.github.epsilon.modules.impl.render.NoRender; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Pseudo; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyVariable; + +@Pseudo +@Mixin(targets = "net.caffeinemc.mods.sodium.client.render.SodiumWorldRenderer", remap = false) +public abstract class MixinSodiumWorldRenderer { + + @ModifyVariable(method = "setupTerrain", at = @At("HEAD"), argsOnly = true, ordinal = 0) + private boolean epsilon$disableCaveCulling(boolean original) { + return original && !NoRender.INSTANCE.noCaveCulling(); + } + +} diff --git a/common/src/main/java/com/github/epsilon/mixins/MixinSpawnerRenderer.java b/common/src/main/java/com/github/epsilon/mixins/MixinSpawnerRenderer.java new file mode 100644 index 000000000..cf5e718d9 --- /dev/null +++ b/common/src/main/java/com/github/epsilon/mixins/MixinSpawnerRenderer.java @@ -0,0 +1,18 @@ +package com.github.epsilon.mixins; + +import com.github.epsilon.modules.impl.render.NoRender; +import net.minecraft.client.renderer.blockentity.SpawnerRenderer; +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(SpawnerRenderer.class) +public abstract class MixinSpawnerRenderer { + + @Inject(method = "submitEntityInSpawner", at = @At("HEAD"), cancellable = true) + private static void epsilon$hideSpawnerEntity(CallbackInfo ci) { + if (NoRender.INSTANCE.noMobInSpawner()) ci.cancel(); + } + +} diff --git a/common/src/main/kotlin/com/github/epsilon/assets/i18n/EpsilonTranslations.kt b/common/src/main/kotlin/com/github/epsilon/assets/i18n/EpsilonTranslations.kt index fe6f7a957..aa6671c58 100644 --- a/common/src/main/kotlin/com/github/epsilon/assets/i18n/EpsilonTranslations.kt +++ b/common/src/main/kotlin/com/github/epsilon/assets/i18n/EpsilonTranslations.kt @@ -103,6 +103,7 @@ object EpsilonTranslations { Gui.LIST_ITEMS, Gui.LIST_ENTITIES, Gui.LIST_SOUNDS, + Gui.LIST_PARTICLES, Gui.LIST_ENCHANTMENTS, Gui.LIST_SELECTED, Gui.LIST_TYPE_TO_ADD, @@ -313,6 +314,7 @@ object EpsilonTranslations { val LIST_ITEMS: TranslateComponent = create("gui", "list.items") val LIST_ENTITIES: TranslateComponent = create("gui", "list.entities") val LIST_SOUNDS: TranslateComponent = create("gui", "list.sounds") + val LIST_PARTICLES: TranslateComponent = create("gui", "list.particles") val LIST_ENCHANTMENTS: TranslateComponent = create("gui", "list.enchantments") val LIST_SELECTED: TranslateComponent = create("gui", "list.selected") val LIST_TYPE_TO_ADD: TranslateComponent = create("gui", "list.type_to_add") diff --git a/common/src/main/kotlin/com/github/epsilon/gui/panel/popup/RegistryListSelectPopup.kt b/common/src/main/kotlin/com/github/epsilon/gui/panel/popup/RegistryListSelectPopup.kt index d492f6d05..0c2d40c22 100644 --- a/common/src/main/kotlin/com/github/epsilon/gui/panel/popup/RegistryListSelectPopup.kt +++ b/common/src/main/kotlin/com/github/epsilon/gui/panel/popup/RegistryListSelectPopup.kt @@ -26,6 +26,7 @@ import net.minecraft.client.input.CharacterEvent import net.minecraft.client.input.KeyEvent import net.minecraft.client.input.MouseButtonEvent import net.minecraft.core.Registry +import net.minecraft.core.particles.ParticleType import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.core.registries.Registries import net.minecraft.resources.Identifier @@ -630,6 +631,9 @@ class RegistryListSelectPopup private constructor( RegistryListSetting.Type.SOUND_EVENT -> soundEventPopup(bounds, setting as RegistryListSetting) + RegistryListSetting.Type.PARTICLE_TYPE -> + particleTypePopup(bounds, setting as RegistryListSetting>) + RegistryListSetting.Type.ENCHANTMENT -> enchantmentPopup(bounds, setting as RegistryListSetting) } @@ -678,6 +682,17 @@ class RegistryListSelectPopup private constructor( ) } + private fun particleTypePopup( + bounds: UiRect, + setting: RegistryListSetting> + ): RegistryListSelectPopup> { + return RegistryListSelectPopup( + bounds, setting, BuiltInRegistries.PARTICLE_TYPE, + { particle -> formatPath(BuiltInRegistries.PARTICLE_TYPE.getKey(particle)?.path ?: "") }, + { value -> setting.add(value) }, { value -> setting.remove(value) } + ) + } + private fun ofEntries( bounds: UiRect, setting: Setting>, entries: List, displayNameFn: (T) -> String, iconProvider: ((T) -> ItemStack)?, diff --git a/common/src/main/kotlin/com/github/epsilon/gui/utils/RegistryListUi.kt b/common/src/main/kotlin/com/github/epsilon/gui/utils/RegistryListUi.kt index 54f4bdbb5..adef29b8d 100644 --- a/common/src/main/kotlin/com/github/epsilon/gui/utils/RegistryListUi.kt +++ b/common/src/main/kotlin/com/github/epsilon/gui/utils/RegistryListUi.kt @@ -11,6 +11,7 @@ object RegistryListUi { RegistryListSetting.Type.ITEM -> EpsilonTranslations.Gui.LIST_ITEMS.getTranslatedName() RegistryListSetting.Type.ENTITY_TYPE -> EpsilonTranslations.Gui.LIST_ENTITIES.getTranslatedName() RegistryListSetting.Type.SOUND_EVENT -> EpsilonTranslations.Gui.LIST_SOUNDS.getTranslatedName() + RegistryListSetting.Type.PARTICLE_TYPE -> EpsilonTranslations.Gui.LIST_PARTICLES.getTranslatedName() RegistryListSetting.Type.ENCHANTMENT -> EpsilonTranslations.Gui.LIST_ENCHANTMENTS.getTranslatedName() } } diff --git a/common/src/main/kotlin/com/github/epsilon/interfaces/ClientboundEntityEventPacketAccessor.kt b/common/src/main/kotlin/com/github/epsilon/interfaces/ClientboundEntityEventPacketAccessor.kt deleted file mode 100644 index 421a21482..000000000 --- a/common/src/main/kotlin/com/github/epsilon/interfaces/ClientboundEntityEventPacketAccessor.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.github.epsilon.interfaces - -interface ClientboundEntityEventPacketAccessor { - - fun `epsilon$getEntityId`(): Int - -} diff --git a/common/src/main/kotlin/com/github/epsilon/modules/impl/combat/SpearAura.kt b/common/src/main/kotlin/com/github/epsilon/modules/impl/combat/SpearAura.kt index 2d2a6fcc6..d593957b2 100644 --- a/common/src/main/kotlin/com/github/epsilon/modules/impl/combat/SpearAura.kt +++ b/common/src/main/kotlin/com/github/epsilon/modules/impl/combat/SpearAura.kt @@ -4,7 +4,6 @@ import com.github.epsilon.events.api.EventPriority import com.github.epsilon.events.api.handler import com.github.epsilon.events.api.safeEventHandler import com.github.epsilon.events.impl.* -import com.github.epsilon.interfaces.ClientboundEntityEventPacketAccessor import com.github.epsilon.kernel.gameplay.inventory.FindItemResult import com.github.epsilon.kernel.gameplay.inventory.InvUtils.find import com.github.epsilon.kernel.gameplay.inventory.InvUtils.invSwap @@ -369,9 +368,7 @@ object SpearAura : Module("Spear Aura", Category.COMBAT) { if (!isEnabled) return@handler val packet = event.packet as? ClientboundEntityEventPacket ?: return@handler if (packet.eventId != EntityEvent.KINETIC_HIT) return@handler - if (packet is ClientboundEntityEventPacketAccessor && - packet.`epsilon$getEntityId`() == localPlayerId - ) { + if (packet.entityId == localPlayerId) { spearHitPending = true } } diff --git a/common/src/main/kotlin/com/github/epsilon/modules/impl/combat/elytra_combat/combat/CombatHitTracker.kt b/common/src/main/kotlin/com/github/epsilon/modules/impl/combat/elytra_combat/combat/CombatHitTracker.kt index 651138208..8db477a91 100644 --- a/common/src/main/kotlin/com/github/epsilon/modules/impl/combat/elytra_combat/combat/CombatHitTracker.kt +++ b/common/src/main/kotlin/com/github/epsilon/modules/impl/combat/elytra_combat/combat/CombatHitTracker.kt @@ -1,6 +1,5 @@ package com.github.epsilon.modules.impl.combat.elytra_combat.combat -import com.github.epsilon.interfaces.ClientboundEntityEventPacketAccessor import net.minecraft.network.protocol.game.ClientboundDamageEventPacket import net.minecraft.network.protocol.game.ClientboundEntityEventPacket import net.minecraft.world.damagesource.DamageTypes @@ -66,7 +65,7 @@ class CombatHitTracker { if (packet.eventId != EntityEvent.KINETIC_HIT) { return } - if (packet is ClientboundEntityEventPacketAccessor && packet.`epsilon$getEntityId`() == this.localPlayerId) { + if (packet.entityId == this.localPlayerId) { this.pendingHits.offer(HitType.SPEAR) } } diff --git a/common/src/main/kotlin/com/github/epsilon/modules/impl/render/NoRender.kt b/common/src/main/kotlin/com/github/epsilon/modules/impl/render/NoRender.kt index 59c1f799c..8a9e1e4ec 100644 --- a/common/src/main/kotlin/com/github/epsilon/modules/impl/render/NoRender.kt +++ b/common/src/main/kotlin/com/github/epsilon/modules/impl/render/NoRender.kt @@ -1,8 +1,211 @@ package com.github.epsilon.modules.impl.render +import com.github.epsilon.events.api.handler +import com.github.epsilon.events.impl.ChunkOcclusionEvent +import com.github.epsilon.events.impl.PacketEvent import com.github.epsilon.modules.Category import com.github.epsilon.modules.Module +import com.github.epsilon.settings.group +import net.minecraft.core.particles.ParticleType +import net.minecraft.core.particles.ParticleTypes +import net.minecraft.network.protocol.game.ClientboundAddEntityPacket +import net.minecraft.world.entity.Entity +import net.minecraft.world.entity.LivingEntity +import net.minecraft.world.entity.item.FallingBlockEntity +import net.minecraft.world.level.block.AbstractBannerBlock +import net.minecraft.world.level.block.Block +import net.minecraft.world.level.block.EntityBlock object NoRender : Module("No Render", Category.RENDER) { + enum class BannerRenderMode { + Everything, + Pillar, + None + } + + private val overlayGroup = settingGroup("Overlay") + private val hudGroup = settingGroup("HUD") + private val worldGroup = settingGroup("World") + private val entityGroup = settingGroup("Entity") + + private val noPortalOverlay by boolSetting("Portal Overlay", false).group(overlayGroup) + private val noSpyglassOverlay by boolSetting("Spyglass Overlay", false).group(overlayGroup) + private val noNausea by boolSetting("Nausea", false).group(overlayGroup) + private val noPumpkinOverlay by boolSetting("Pumpkin Overlay", false).group(overlayGroup) + private val noPowderedSnowOverlay by boolSetting("Powdered Snow Overlay", false).group(overlayGroup) + private val noFireOverlay by boolSetting("Fire Overlay", false).group(overlayGroup) + private val noLiquidOverlay by boolSetting("Liquid Overlay", false).group(overlayGroup) + private val noInWallOverlay by boolSetting("In Wall Overlay", false).group(overlayGroup) + private val noVignette by boolSetting("Vignette", false).group(overlayGroup) + private val noGuiBackground by boolSetting("GUI Background", false).group(overlayGroup) + private val noTotemAnimation by boolSetting("Totem Animation", false).group(overlayGroup) + private val noEatParticles by boolSetting("Eating Particles", false).group(overlayGroup) + private val noEnchantGlint by boolSetting("Enchantment Glint", false).group(overlayGroup) + + private val noBossBar by boolSetting("Boss Bar", false).group(hudGroup) + private val noScoreboard by boolSetting("Scoreboard", false).group(hudGroup) + private val noCrosshair by boolSetting("Crosshair", false).group(hudGroup) + private val noTitle by boolSetting("Title", false).group(hudGroup) + private val noHeldItemName by boolSetting("Held Item Name", false).group(hudGroup) + private val noObfuscation by boolSetting("Obfuscation", false).group(hudGroup) + private val noPotionIcons by boolSetting("Potion Icons", false).group(hudGroup) + private val noMessageSignatureIndicator by boolSetting("Message Signature Indicator", false).group(hudGroup) + + private val noWeather by boolSetting("Weather", false).group(worldGroup) + private val noWorldBorder by boolSetting("World Border", false).group(worldGroup) + private val noBlindness by boolSetting("Blindness", false).group(worldGroup) + private val noDarkness by boolSetting("Darkness", false).group(worldGroup) + private val noFog by boolSetting("Fog", false).group(worldGroup) + private val noEnchTableBook by boolSetting("Enchantment Table Book", false).group(worldGroup) + private val noSignText by boolSetting("Sign Text", false).group(worldGroup) + private val noBlockBreakOverlay by boolSetting("Block Break Overlay", false).group(worldGroup) + private val noBeaconBeams by boolSetting("Beacon Beams", false).group(worldGroup) + private val noFallingBlocks by boolSetting("Falling Blocks", false).group(worldGroup) + private val noCaveCulling by boolSetting( + "Cave Culling", + false, + onChanged = { mc.levelExtractor.allChanged() }).group(worldGroup) + private val noMapMarkers by boolSetting("Map Markers", false).group(worldGroup) + private val noMapContents by boolSetting("Map Contents", false).group(worldGroup) + private val bannerRender by enumSetting("Banners", BannerRenderMode.Everything).group(worldGroup) + private val noFireworkExplosions by boolSetting("Firework Explosions", false).group(worldGroup) + private val particles by particleTypeListSetting("Particles", emptyList()).group(worldGroup) + private val noBarrierInvis by boolSetting("Barrier Invisibility", false).group(worldGroup) + private val noTextureRotations by boolSetting( + "Texture Rotations", + false, + onChanged = { mc.levelExtractor.allChanged() }).group(worldGroup) + private val blockEntities by blockListSetting( + "Block Entities", + emptyList(), + filter = { it is EntityBlock && it !is AbstractBannerBlock }).group(worldGroup) + + private val entities by entityTypeListSetting("Entities", emptyList()).group(entityGroup) + private val dropSpawnPacket by boolSetting("Drop Spawn Packets", false).group(entityGroup) + private val noArmor by boolSetting("Armor", false).group(entityGroup) + private val noInvisibility by boolSetting("Invisibility", false).group(entityGroup) + private val noGlowing by boolSetting("Glowing", false).group(entityGroup) + private val noMobInSpawner by boolSetting("Spawner Entities", false).group(entityGroup) + private val noDeadEntities by boolSetting("Dead Entities", false).group(entityGroup) + private val noNametags by boolSetting("Nametags", false).group(entityGroup) + + init { + onEnable { + if (noCaveCulling || noTextureRotations) mc.levelExtractor.allChanged() + } + + onDisable { + if (noCaveCulling || noTextureRotations) mc.levelExtractor.allChanged() + } + + handler { + if (noCaveCulling) it.cancel() + } + + handler { + val packet = it.packet + if (dropSpawnPacket && packet is ClientboundAddEntityPacket && packet.type in entities) it.cancel() + } + } + + fun noPortalOverlay(): Boolean = isEnabled && noPortalOverlay + + fun noSpyglassOverlay(): Boolean = isEnabled && noSpyglassOverlay + + fun noNausea(): Boolean = isEnabled && noNausea + + fun noPumpkinOverlay(): Boolean = isEnabled && noPumpkinOverlay + + fun noPowderedSnowOverlay(): Boolean = isEnabled && noPowderedSnowOverlay + + fun noFireOverlay(): Boolean = isEnabled && noFireOverlay + + fun noLiquidOverlay(): Boolean = isEnabled && noLiquidOverlay + + fun noInWallOverlay(): Boolean = isEnabled && noInWallOverlay + + fun noVignette(): Boolean = isEnabled && noVignette + + fun noGuiBackground(): Boolean = isEnabled && noGuiBackground + + fun noTotemAnimation(): Boolean = isEnabled && noTotemAnimation + + fun noEatParticles(): Boolean = isEnabled && noEatParticles + + fun noEnchantGlint(): Boolean = isEnabled && noEnchantGlint + + fun noBossBar(): Boolean = isEnabled && noBossBar + + fun noScoreboard(): Boolean = isEnabled && noScoreboard + + fun noCrosshair(): Boolean = isEnabled && noCrosshair + + fun noTitle(): Boolean = isEnabled && noTitle + + fun noHeldItemName(): Boolean = isEnabled && noHeldItemName + + fun noObfuscation(): Boolean = isEnabled && noObfuscation + + fun noPotionIcons(): Boolean = isEnabled && noPotionIcons + + fun noMessageSignatureIndicator(): Boolean = isEnabled && noMessageSignatureIndicator + + fun noWeather(): Boolean = isEnabled && noWeather + + fun noWorldBorder(): Boolean = isEnabled && noWorldBorder + + fun noBlindness(): Boolean = isEnabled && noBlindness + + fun noDarkness(): Boolean = isEnabled && noDarkness + + fun noFog(): Boolean = isEnabled && noFog + + fun noEnchTableBook(): Boolean = isEnabled && noEnchTableBook + + fun noSignText(): Boolean = isEnabled && noSignText + + fun noBlockBreakOverlay(): Boolean = isEnabled && noBlockBreakOverlay + + fun noBeaconBeams(): Boolean = isEnabled && noBeaconBeams + + fun noFallingBlocks(): Boolean = isEnabled && noFallingBlocks + + fun noCaveCulling(): Boolean = isEnabled && noCaveCulling + + fun noMapMarkers(): Boolean = isEnabled && noMapMarkers + + fun noMapContents(): Boolean = isEnabled && noMapContents + + fun noFireworkExplosions(): Boolean = isEnabled && noFireworkExplosions + + fun noBarrierInvis(): Boolean = isEnabled && noBarrierInvis + + fun noTextureRotations(): Boolean = isEnabled && noTextureRotations + + fun noArmor(): Boolean = isEnabled && noArmor + + fun noInvisibility(): Boolean = isEnabled && noInvisibility + + fun noGlowing(): Boolean = isEnabled && noGlowing + + fun noMobInSpawner(): Boolean = isEnabled && noMobInSpawner + + fun noDeadEntities(): Boolean = isEnabled && noDeadEntities + + fun noNametags(): Boolean = isEnabled && noNametags + + fun getBannerRenderMode(): BannerRenderMode = if (isEnabled) bannerRender else BannerRenderMode.Everything + + fun noParticle(type: ParticleType<*>): Boolean = + isEnabled && (type in particles || noWeather && type == ParticleTypes.RAIN || + noFireworkExplosions && type == ParticleTypes.FIREWORK) + + fun noBlockEntity(block: Block): Boolean = isEnabled && block in blockEntities + + fun noEntity(entity: Entity): Boolean = isEnabled && ( + entity.type in entities || noFallingBlocks && entity is FallingBlockEntity || + noDeadEntities && entity is LivingEntity && entity.isDeadOrDying + ) + } diff --git a/common/src/main/kotlin/com/github/epsilon/settings/SettingHost.kt b/common/src/main/kotlin/com/github/epsilon/settings/SettingHost.kt index ed5ec8e85..01fdf7479 100644 --- a/common/src/main/kotlin/com/github/epsilon/settings/SettingHost.kt +++ b/common/src/main/kotlin/com/github/epsilon/settings/SettingHost.kt @@ -1,11 +1,13 @@ package com.github.epsilon.settings import com.github.epsilon.settings.impl.* +import net.minecraft.core.particles.ParticleType import net.minecraft.sounds.SoundEvent import net.minecraft.world.entity.EntityType import net.minecraft.world.item.Item import net.minecraft.world.level.block.Block import java.awt.Color +import java.util.function.Predicate /** * 设置宿主:模块/HUD 通过这里声明的 DSL 创建并注册设置。 @@ -82,8 +84,9 @@ interface SettingHost { name: String, defaultValue: Collection, visible: Setting.Visibility? = null, + filter: Predicate? = null, ): RegistryListSetting = - addSetting(RegistryListSetting(name, defaultValue, RegistryListSetting.Type.BLOCK, null, visible)) + addSetting(RegistryListSetting(name, defaultValue, RegistryListSetting.Type.BLOCK, filter, visible)) fun itemListSetting( name: String, @@ -140,6 +143,13 @@ interface SettingHost { visible: Setting.Visibility? = null, ): StringListSetting = addSetting(StringListSetting(name, defaultValue, visible)) + fun particleTypeListSetting( + name: String, + defaultValue: Collection>, + visible: Setting.Visibility? = null, + ): RegistryListSetting> = + addSetting(RegistryListSetting(name, defaultValue, RegistryListSetting.Type.PARTICLE_TYPE, null, visible)) + fun soundEventListSetting( name: String, defaultValue: Collection, diff --git a/common/src/main/kotlin/com/github/epsilon/settings/impl/RegistryListSetting.kt b/common/src/main/kotlin/com/github/epsilon/settings/impl/RegistryListSetting.kt index f28b589b2..e8132e680 100644 --- a/common/src/main/kotlin/com/github/epsilon/settings/impl/RegistryListSetting.kt +++ b/common/src/main/kotlin/com/github/epsilon/settings/impl/RegistryListSetting.kt @@ -3,6 +3,7 @@ package com.github.epsilon.settings.impl import com.github.epsilon.kernel.gameplay.world.BlockRegistryUtils import com.github.epsilon.settings.Setting import net.minecraft.core.Registry +import net.minecraft.core.particles.ParticleType import net.minecraft.core.registries.BuiltInRegistries import net.minecraft.resources.Identifier import net.minecraft.sounds.SoundEvent @@ -26,6 +27,7 @@ class RegistryListSetting( ITEM, ENTITY_TYPE, SOUND_EVENT, + PARTICLE_TYPE, ENCHANTMENT; @Suppress("UNCHECKED_CAST") @@ -34,6 +36,7 @@ class RegistryListSetting( ITEM -> BuiltInRegistries.ITEM ENTITY_TYPE -> BuiltInRegistries.ENTITY_TYPE SOUND_EVENT -> BuiltInRegistries.SOUND_EVENT + PARTICLE_TYPE -> BuiltInRegistries.PARTICLE_TYPE ENCHANTMENT -> null } as Registry? @@ -43,6 +46,7 @@ class RegistryListSetting( ITEM -> Predicate { item -> item !== Items.AIR } as Predicate ENTITY_TYPE -> Predicate> { entityType -> entityType != null } as Predicate SOUND_EVENT -> Predicate { sound -> sound != null } as Predicate + PARTICLE_TYPE -> Predicate> { particle -> particle != null } as Predicate ENCHANTMENT -> Predicate { id -> id != null && Identifier.tryParse(id) != null } as Predicate } diff --git a/common/src/main/resources/META-INF/accesstransformer.cfg b/common/src/main/resources/META-INF/accesstransformer.cfg index 26ec42011..6d01f34bd 100644 --- a/common/src/main/resources/META-INF/accesstransformer.cfg +++ b/common/src/main/resources/META-INF/accesstransformer.cfg @@ -170,4 +170,6 @@ public-f net.minecraft.world.phys.Vec3 x D public-f net.minecraft.world.phys.Vec3 y D public-f net.minecraft.world.phys.Vec3 z D public net.minecraft.world.entity.LivingEntity swingState -public net.minecraft.world.entity.LivingEntity getModifiedSwingDuration(Lnet/minecraft/world/item/component/SwingAnimation;)I \ No newline at end of file +public net.minecraft.world.entity.LivingEntity getModifiedSwingDuration(Lnet/minecraft/world/item/component/SwingAnimation;)I +public net.minecraft.client.renderer.blockentity.state.BlockEntityRenderState blockState +public net.minecraft.network.protocol.game.ClientboundEntityEventPacket entityId diff --git a/common/src/main/resources/assets/epsilon/i18n/en_us.json b/common/src/main/resources/assets/epsilon/i18n/en_us.json index e60ca5b78..ebeb22c73 100644 --- a/common/src/main/resources/assets/epsilon/i18n/en_us.json +++ b/common/src/main/resources/assets/epsilon/i18n/en_us.json @@ -163,7 +163,8 @@ "search": "Search...", "all": "All", "available": "Available", - "selected_header": "Selected" + "selected_header": "Selected", + "particles": " particles" }, "troll": { "client": "Client", @@ -2208,7 +2209,66 @@ "shadow blur": "Shadow Blur", "shadow color": "Shadow Color" }, - "no render": "No Render", + "no render": { + "_value": "No Render", + "overlay": "Overlay", + "portal overlay": "Portal Overlay", + "spyglass overlay": "Spyglass Overlay", + "nausea": "Nausea", + "pumpkin overlay": "Pumpkin Overlay", + "powdered snow overlay": "Powdered Snow Overlay", + "fire overlay": "Fire Overlay", + "liquid overlay": "Liquid Overlay", + "in wall overlay": "In Wall Overlay", + "vignette": "Vignette", + "gui background": "GUI Background", + "totem animation": "Totem Animation", + "eating particles": "Eating Particles", + "enchantment glint": "Enchantment Glint", + "hud": "HUD", + "boss bar": "Boss Bar", + "scoreboard": "Scoreboard", + "crosshair": "Crosshair", + "title": "Title", + "held item name": "Held Item Name", + "obfuscation": "Obfuscation", + "potion icons": "Potion Icons", + "message signature indicator": "Message Signature Indicator", + "world": "World", + "weather": "Weather", + "world border": "World Border", + "blindness": "Blindness", + "darkness": "Darkness", + "fog": "Fog", + "enchantment table book": "Enchantment Table Book", + "sign text": "Sign Text", + "block break overlay": "Block Break Overlay", + "beacon beams": "Beacon Beams", + "falling blocks": "Falling Blocks", + "cave culling": "Cave Culling", + "map markers": "Map Markers", + "map contents": "Map Contents", + "banners": { + "_value": "Banners", + "everything": "Everything", + "pillar": "Pillar", + "none": "None" + }, + "firework explosions": "Firework Explosions", + "particles": "Particles", + "barrier invisibility": "Barrier Invisibility", + "texture rotations": "Texture Rotations", + "block entities": "Block Entities", + "entity": "Entity", + "entities": "Entities", + "drop spawn packets": "Drop Spawn Packets", + "armor": "Armor", + "invisibility": "Invisibility", + "glowing": "Glowing", + "spawner entities": "Spawner Entities", + "dead entities": "Dead Entities", + "nametags": "Nametags" + }, "particles": { "_value": "Particles", "mode": { diff --git a/common/src/main/resources/assets/epsilon/i18n/zh_cn.json b/common/src/main/resources/assets/epsilon/i18n/zh_cn.json index 81b216430..b7ecbe66a 100644 --- a/common/src/main/resources/assets/epsilon/i18n/zh_cn.json +++ b/common/src/main/resources/assets/epsilon/i18n/zh_cn.json @@ -163,7 +163,8 @@ "search": "搜索...", "all": "全部", "available": "可用", - "selected_header": "已选" + "selected_header": "已选", + "particles": " 个粒子" }, "troll": { "client": "客户端", @@ -2208,7 +2209,66 @@ "shadow blur": "阴影模糊", "shadow color": "阴影颜色" }, - "no render": "移除渲染", + "no render": { + "_value": "移除渲染", + "overlay": "屏幕遮罩", + "portal overlay": "传送门遮罩", + "spyglass overlay": "望远镜遮罩", + "nausea": "反胃效果", + "pumpkin overlay": "南瓜头遮罩", + "powdered snow overlay": "细雪遮罩", + "fire overlay": "火焰遮罩", + "liquid overlay": "液体遮罩", + "in wall overlay": "方块内遮罩", + "vignette": "暗角", + "gui background": "GUI 背景", + "totem animation": "图腾动画", + "eating particles": "进食粒子", + "enchantment glint": "附魔光效", + "hud": "HUD", + "boss bar": "Boss 血条", + "scoreboard": "计分板", + "crosshair": "准星", + "title": "标题", + "held item name": "手持物品名称", + "obfuscation": "文字混淆", + "potion icons": "状态效果图标", + "message signature indicator": "消息签名标记", + "world": "世界", + "weather": "天气", + "world border": "世界边界", + "blindness": "失明效果", + "darkness": "黑暗效果", + "fog": "雾", + "enchantment table book": "附魔台书本", + "sign text": "告示牌文字", + "block break overlay": "方块破坏纹理", + "beacon beams": "信标光柱", + "falling blocks": "下落方块", + "cave culling": "洞穴剔除", + "map markers": "地图标记", + "map contents": "地图内容", + "banners": { + "_value": "旗帜", + "everything": "完整显示", + "pillar": "仅立柱", + "none": "隐藏" + }, + "firework explosions": "烟花爆炸", + "particles": "粒子", + "barrier invisibility": "显示屏障", + "texture rotations": "纹理随机旋转", + "block entities": "方块实体", + "entity": "实体", + "entities": "实体列表", + "drop spawn packets": "丢弃实体生成包", + "armor": "盔甲", + "invisibility": "显示隐身实体", + "glowing": "发光效果", + "spawner entities": "刷怪笼实体", + "dead entities": "死亡实体", + "nametags": "实体名称标签" + }, "particles": { "_value": "环境粒子", "mode": { diff --git a/common/src/main/resources/epsilon.accesswidener b/common/src/main/resources/epsilon.accesswidener index 20e8760e0..fded9140e 100644 --- a/common/src/main/resources/epsilon.accesswidener +++ b/common/src/main/resources/epsilon.accesswidener @@ -116,4 +116,6 @@ accessible field net/minecraft/client/gui/components/ImageButton sprites Lnet/mi accessible class net/minecraft/client/gui/screens/debug/GameModeSwitcherScreen$GameModeIcon accessible class net/minecraft/client/gui/Font$PreparedTextBuilder accessible field net/minecraft/world/entity/LivingEntity swingState Lnet/minecraft/world/entity/LivingEntity$SwingState; -accessible method net/minecraft/world/entity/LivingEntity getModifiedSwingDuration (Lnet/minecraft/world/item/component/SwingAnimation;)I \ No newline at end of file +accessible method net/minecraft/world/entity/LivingEntity getModifiedSwingDuration (Lnet/minecraft/world/item/component/SwingAnimation;)I +accessible field net/minecraft/client/renderer/blockentity/state/BlockEntityRenderState blockState Lnet/minecraft/world/level/block/state/BlockState; +accessible field net/minecraft/network/protocol/game/ClientboundEntityEventPacket entityId I diff --git a/common/src/main/resources/epsilon.mixins.json b/common/src/main/resources/epsilon.mixins.json index eb4758c72..6004c688d 100644 --- a/common/src/main/resources/epsilon.mixins.json +++ b/common/src/main/resources/epsilon.mixins.json @@ -3,32 +3,41 @@ "package": "com.github.epsilon.mixins", "compatibilityLevel": "JAVA_25", "client": [ + "MixinAbstractSignRenderer", "MixinAddressCheck", "MixinAvatar", "MixinAvatarRenderer", + "MixinBannerRenderer", + "MixinBeaconRenderer", "MixinBlock", + "MixinBlockBehaviour", "MixinBlockCollisions", + "MixinBlockEntityRenderDispatcher", "MixinBlockItem", + "MixinBlockState", "MixinCamera", "MixinChatComponent", "MixinChatComponentHash", + "MixinChatLineConsumer", "MixinChatScreen", "MixinChestRenderer", "MixinChunkBorderRenderer", - "MixinClientboundEntityEventPacket", "MixinClientBrandRetriever", "MixinClientClockInstance", "MixinClientLevel", "MixinClientPacketListener", "MixinCompassAngleState", "MixinConnection", + "MixinCustomHeadLayer", "MixinDataComponentInitializerEntry", "MixinDeltaTrackerTimer", "MixinDynamicUniforms", + "MixinEnchantTableRenderer", "MixinEntity", "MixinEntityRenderDispatcher", "MixinEntityRenderer", "MixinEntityRenderState", + "MixinFireworkParticles", "MixinFireworkParticlesStarter", "MixinFireworkRocketEntity", "MixinFirstPersonHandsAndItems", @@ -42,26 +51,36 @@ "MixinGuiGraphicsExtractor", "MixinGuiRenderer", "MixinHud", + "MixinHumanoidArmorLayer", "MixinHumanoidMobRenderer", "MixinInventoryScreen", "MixinItem", "MixinItemEntityRenderer", + "MixinItemFeatureRenderer", "MixinItemInHandRenderer", "MixinKeyboardHandler", "MixinKeyboardInput", + "MixinLevelExtractor", "MixinLevelRenderer", "MixinLightmap", + "MixinLightmapRenderStateExtractor", "MixinLivingEntity", "MixinLivingEntityRenderer", "MixinLocalPlayer", + "MixinMapRenderer", "MixinMinecraft", + "MixinMobEffectFogEnvironment", "MixinMouseHandler", "MixinMultiPlayerGameMode", "MixinOptions", + "MixinParticleEngine", "MixinPlayer", "MixinProjection", "MixinScreen", "MixinScreenEffectRenderer", + "MixinSodiumFogParameters", + "MixinSodiumWorldRenderer", + "MixinSpawnerRenderer", "MixinSubmitNodeCollection", "MixinTitleScreen", "MixinVisGraph",