Added new InputEvent.MouseScrollEvent, fixes #5811 (#6037)

This commit is contained in:
Daniël Goossens authored and LexManos committed 2019-08-28 21:13:31 -07:00
1 parent ee1c06085b
commit c83d4d29e4
3 files changed
+71 -3

No files matched your search

@@ -1037,4 +1037,10 @@ public class ForgeHooksClient
{
MinecraftForge.EVENT_BUS.post(new InputEvent.KeyInputEvent(key, scanCode, action, modifiers));
}
public static boolean onMouseScroll(MouseHelper mouseHelper, double scrollDelta)
{
Event event = new InputEvent.MouseScrollEvent(scrollDelta, mouseHelper.isLeftDown(), mouseHelper.isMiddleDown(), mouseHelper.isRightDown(), mouseHelper.getMouseX(), mouseHelper.getMouseY());
return MinecraftForge.EVENT_BUS.post(event);
}
}
@@ -20,6 +20,7 @@
package net.minecraftforge.client.event;
import net.minecraft.client.util.InputMappings;
import net.minecraftforge.eventbus.api.Cancelable;
import net.minecraftforge.eventbus.api.Event;
import org.lwjgl.glfw.GLFW;
@@ -78,6 +79,59 @@ public class InputEvent extends Event
}
}
/**
* This event fires when the mouse scroll wheel is used outside of a gui.
*/
@Cancelable
public static class MouseScrollEvent extends InputEvent
{
private final double scrollDelta;
private final double mouseX;
private final double mouseY;
private final boolean leftDown;
private final boolean middleDown;
private final boolean rightDown;
public MouseScrollEvent(double scrollDelta, boolean leftDown, boolean middleDown, boolean rightDown, double mouseX, double mouseY)
{
this.scrollDelta = scrollDelta;
this.leftDown = leftDown;
this.middleDown = middleDown;
this.rightDown = rightDown;
this.mouseX = mouseX;
this.mouseY = mouseY;
}
public double getScrollDelta()
{
return this.scrollDelta;
}
public boolean isLeftDown()
{
return this.leftDown;
}
public boolean isRightDown()
{
return this.rightDown;
}
public boolean isMiddleDown()
{
return this.middleDown;
}
public double getMouseX()
{
return this.mouseX;
}
public double getMouseY()
{
return this.mouseY;
}
}
/**
* This event fires when a keyboard input is detected.
*/