Compare commits
3 Commits
8808df1cf1
...
ee448ae34d
Author | SHA1 | Date | |
---|---|---|---|
ee448ae34d | |||
69df0e5850 | |||
4988a91e70 |
@ -12,7 +12,7 @@ public class SFKeyBindings {
|
|||||||
|
|
||||||
public static void register() {
|
public static void register() {
|
||||||
ClientTickEvents.END_CLIENT_TICK.register(client -> {
|
ClientTickEvents.END_CLIENT_TICK.register(client -> {
|
||||||
if(client.player != null) {
|
if (client.player != null) {
|
||||||
if (CAMERA_BIND.wasPressed()) {
|
if (CAMERA_BIND.wasPressed()) {
|
||||||
client.player.networkHandler.sendChatCommand("camera");
|
client.player.networkHandler.sendChatCommand("camera");
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,6 @@ import net.minecraft.client.option.KeyBinding;
|
|||||||
import net.minecraft.client.util.InputUtil;
|
import net.minecraft.client.util.InputUtil;
|
||||||
import net.minecraft.text.Text;
|
import net.minecraft.text.Text;
|
||||||
import org.lwjgl.glfw.GLFW;
|
import org.lwjgl.glfw.GLFW;
|
||||||
import wtf.hak.survivalfabric.utils.MathUtils;
|
|
||||||
|
|
||||||
public class Zoom {
|
public class Zoom {
|
||||||
|
|
||||||
@ -20,7 +19,7 @@ public class Zoom {
|
|||||||
|
|
||||||
public static void register() {
|
public static void register() {
|
||||||
ClientTickEvents.END_CLIENT_TICK.register(client -> {
|
ClientTickEvents.END_CLIENT_TICK.register(client -> {
|
||||||
if(ZOOM_BIND.isPressed())
|
if (ZOOM_BIND.isPressed())
|
||||||
SHOULD_ZOOM = true;
|
SHOULD_ZOOM = true;
|
||||||
else {
|
else {
|
||||||
SHOULD_ZOOM = false;
|
SHOULD_ZOOM = false;
|
||||||
@ -43,10 +42,9 @@ public class Zoom {
|
|||||||
// Clamp the zoom level so the FOV stays within [1, 110]
|
// Clamp the zoom level so the FOV stays within [1, 110]
|
||||||
float zoomFov = getZoomFov();
|
float zoomFov = getZoomFov();
|
||||||
if (zoomFov < 1) {
|
if (zoomFov < 1) {
|
||||||
ZOOM_STEP = Math.round((1 - INITIAL_ZOOM) / ZOOM_STEP_VALUE)+1;
|
ZOOM_STEP = Math.round((1 - INITIAL_ZOOM) / ZOOM_STEP_VALUE) + 1;
|
||||||
} else if (zoomFov > 110) {
|
} else if (zoomFov > 110) {
|
||||||
ZOOM_STEP = Math.round((110 - INITIAL_ZOOM) / ZOOM_STEP_VALUE);
|
ZOOM_STEP = Math.round((110 - INITIAL_ZOOM) / ZOOM_STEP_VALUE);
|
||||||
}
|
}
|
||||||
MinecraftClient.getInstance().player.sendMessage(Text.literal(ZOOM_STEP + ""), true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
|||||||
import static wtf.hak.survivalfabric.config.client.ClientConfigManager.getConfig;
|
import static wtf.hak.survivalfabric.config.client.ClientConfigManager.getConfig;
|
||||||
|
|
||||||
@Mixin(value = BackgroundRenderer.class, priority = 910)
|
@Mixin(value = BackgroundRenderer.class, priority = 910)
|
||||||
public abstract class BackgroundRendererMixin {
|
public class BackgroundRendererMixin {
|
||||||
|
|
||||||
@Unique
|
@Unique
|
||||||
private static final Fog EMPTY_FOG = new Fog(-8.0f, 1_000_000.0F, FogShape.CYLINDER, 0, 0, 0, 0);
|
private static final Fog EMPTY_FOG = new Fog(-8.0f, 1_000_000.0F, FogShape.CYLINDER, 0, 0, 0, 0);
|
||||||
|
@ -13,7 +13,7 @@ public interface BlockEntityRendererMixin<T extends BlockEntity> {
|
|||||||
|
|
||||||
@Inject(method = "getRenderDistance", at = @At("HEAD"), cancellable = true)
|
@Inject(method = "getRenderDistance", at = @At("HEAD"), cancellable = true)
|
||||||
private void getRenderDistance(CallbackInfoReturnable<Integer> cir) {
|
private void getRenderDistance(CallbackInfoReturnable<Integer> cir) {
|
||||||
if(ClientConfigManager.getConfig().manipulateBlockEntityDistance)
|
if (ClientConfigManager.getConfig().manipulateBlockEntityDistance)
|
||||||
cir.setReturnValue(ClientConfigManager.getConfig().blockEntityRange);
|
cir.setReturnValue(ClientConfigManager.getConfig().blockEntityRange);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At;
|
|||||||
import wtf.hak.survivalfabric.features.Zoom;
|
import wtf.hak.survivalfabric.features.Zoom;
|
||||||
|
|
||||||
@Mixin(GameRenderer.class)
|
@Mixin(GameRenderer.class)
|
||||||
public abstract class GameRendererMixin {
|
public class GameRendererMixin {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Modify Zoom FOV
|
* Modify Zoom FOV
|
||||||
|
@ -16,9 +16,9 @@ public class MouseMixin {
|
|||||||
*/
|
*/
|
||||||
@Inject(method = "onMouseScroll", at = @At("HEAD"), cancellable = true)
|
@Inject(method = "onMouseScroll", at = @At("HEAD"), cancellable = true)
|
||||||
private void onMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) {
|
private void onMouseScroll(long window, double horizontal, double vertical, CallbackInfo ci) {
|
||||||
if(Zoom.isZooming()) {
|
if (Zoom.isZooming()) {
|
||||||
if(MinecraftClient.getInstance().player != null) {
|
if (MinecraftClient.getInstance().player != null) {
|
||||||
if(vertical>0)
|
if (vertical > 0)
|
||||||
Zoom.modifyStep(-1);
|
Zoom.modifyStep(-1);
|
||||||
else
|
else
|
||||||
Zoom.modifyStep(1);
|
Zoom.modifyStep(1);
|
||||||
|
@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg;
|
|||||||
import wtf.hak.survivalfabric.config.ConfigManager;
|
import wtf.hak.survivalfabric.config.ConfigManager;
|
||||||
|
|
||||||
@Mixin(ServerPlayNetworkHandler.class)
|
@Mixin(ServerPlayNetworkHandler.class)
|
||||||
public abstract class ServerPlayNetworkHandlerMixin {
|
public class ServerPlayNetworkHandlerMixin {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Modify quit message
|
* Modify quit message
|
||||||
|
@ -10,7 +10,7 @@ import wtf.hak.survivalfabric.commands.SpectatorCommand;
|
|||||||
import wtf.hak.survivalfabric.config.ConfigManager;
|
import wtf.hak.survivalfabric.config.ConfigManager;
|
||||||
|
|
||||||
@Mixin(ServerPlayerEntity.class)
|
@Mixin(ServerPlayerEntity.class)
|
||||||
public abstract class ServerPlayerEntityMixin {
|
public class ServerPlayerEntityMixin {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Change player list name if enabled
|
* Change player list name if enabled
|
||||||
|
Reference in New Issue
Block a user