Skip to content

beholder fixes #1756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ImpulsiveLass wants to merge 1 commit into
base: main
Choose a base branch
from
Open

beholder fixes #1756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions src/main/java/com/github/alexmodguy/alexscaves/client/event/ClientEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.screens.advancements.AdvancementsScreen;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.client.renderer.FogRenderer;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.client.renderer.MultiBufferSource;
Expand Down Expand Up @@ -240,6 +241,8 @@ public void postRenderStage(RenderLevelStageEvent event) {
}
}

private static final RandomSource CAMERA_RNG = RandomSource.create();

@SubscribeEvent
public void computeCameraAngles(ViewportEvent.ComputeCameraAngles event) {
Entity player = Minecraft.getInstance().getCameraEntity();
Expand All @@ -264,10 +267,9 @@ public void computeCameraAngles(ViewportEvent.ComputeCameraAngles event) {
}
if (tremorAmount > 0) {
if (ClientProxy.lastTremorTick != player.tickCount) {
RandomSource rng = player.level().random;
ClientProxy.randomTremorOffsets[0] = rng.nextFloat();
ClientProxy.randomTremorOffsets[1] = rng.nextFloat();
ClientProxy.randomTremorOffsets[2] = rng.nextFloat();
ClientProxy.randomTremorOffsets[0] = CAMERA_RNG.nextFloat();
ClientProxy.randomTremorOffsets[1] = CAMERA_RNG.nextFloat();
ClientProxy.randomTremorOffsets[2] = CAMERA_RNG.nextFloat();
ClientProxy.lastTremorTick = player.tickCount;
}
double intensity = tremorAmount * Minecraft.getInstance().options.screenEffectScale().get();
Expand Down Expand Up @@ -1020,11 +1022,21 @@ public void onClientTick(TickEvent.ClientTickEvent event) {
}
}
if (watcherEntity instanceof BeholderEyeEntity beholderEye) {
LocalPlayer player = Minecraft.getInstance().player;

beholderEye.setOldRots();
beholderEye.setEyeYRot(Minecraft.getInstance().player.getYHeadRot());
beholderEye.setEyeXRot(Minecraft.getInstance().player.getXRot());
beholderEye.setEyeYRot(player.getYHeadRot());
beholderEye.setEyeXRot(player.getXRot());

player.input.leftImpulse = 0.0F;
player.input.forwardImpulse = 0.0F;
player.input.jumping = false;

player.setDeltaMovement(Vec3.ZERO);
player.fallDistance = 0.0F;

if (AlexsCaves.PROXY.isKeyDown(4)) {
AlexsCaves.PROXY.resetRenderViewEntity(Minecraft.getInstance().player);
AlexsCaves.PROXY.resetRenderViewEntity(player);
}
}
} else if (ClientProxy.possessionStrengthAmount > 0F) {
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/com/github/alexmodguy/alexscaves/mixin/client/MinecraftMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,15 @@ private void ac_getSituationalMusic(CallbackInfoReturnable<Music> cir) {
}
}
}

@Inject(
method = "handleKeybinds",
at = @At("HEAD"),
cancellable = true
)
private void ac_handleKeybinds(CallbackInfo ci) {
if (getCameraEntity() instanceof PossessesCamera) {
ci.cancel();
}
}
}
Loading