Motschen/MidnightControls
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightControls.git synced 2025-12-14 15:45:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #255, #257 and likely #258

Browse Source
This commit is contained in:
Martin Prokoph
2024-02-03 10:21:37 +01:00
parent 797d1463a6
commit e203e26c3f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/eu/midnightdust/midnightcontrols/client/touch/TouchInput.java
View File

@@ -12,18 +12,18 @@ import net.minecraft.util.hit.EntityHitResult;
import net.minecraft.util.hit.HitResult; import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import static eu.midnightdust.midnightcontrols.client.MidnightControlsConfig.doMixedInput;
public class TouchInput { public class TouchInput {
private static final MinecraftClient client = MinecraftClient.getInstance(); private static final MinecraftClient client = MinecraftClient.getInstance();
public static long clickStartTime; public static long clickStartTime;
public static HitResult firstHitResult = null; public static HitResult firstHitResult = null;
public static void tick() { public static void tick() {
if (client.currentScreen != null && !(client.currentScreen instanceof TouchscreenOverlay)) return; if ((client.currentScreen == null && doMixedInput()) || client.currentScreen instanceof TouchscreenOverlay) {
double scaleFactor = client.getWindow().getScaleFactor(); double scaleFactor = client.getWindow().getScaleFactor();
if (clickStartTime > 0 && System.currentTimeMillis() - clickStartTime >= MidnightControlsConfig.touchBreakDelay) { if (clickStartTime > 0 && System.currentTimeMillis() - clickStartTime >= MidnightControlsConfig.touchBreakDelay) {
mouseHeldDown(client.mouse.getX() / scaleFactor, client.mouse.getY() / scaleFactor); mouseHeldDown(client.mouse.getX() / scaleFactor, client.mouse.getY() / scaleFactor);
} }
else {
if (client.interactionManager != null) client.interactionManager.cancelBlockBreaking();
} }
} }
public static void mouseHeldDown(double mouseX, double mouseY) { public static void mouseHeldDown(double mouseX, double mouseY) {
@@ -95,6 +95,7 @@ public class TouchInput {
if (result instanceof EntityHitResult entityHit) { if (result instanceof EntityHitResult entityHit) {
client.interactionManager.attackEntity(client.player, entityHit.getEntity()); client.interactionManager.attackEntity(client.player, entityHit.getEntity());
client.player.swingHand(Hand.MAIN_HAND); client.player.swingHand(Hand.MAIN_HAND);
return true;
} }
} }
clickStartTime = -1; clickStartTime = -1;