mirror of
https://github.com/TeamMidnightDust/MidnightControls.git
synced 2025-12-16 08:35:10 +01:00
Compare commits
9 Commits
architectu
...
50103ce4cf
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50103ce4cf | ||
|
|
9e12381471 | ||
|
|
f004f0a32d | ||
|
|
c07f3d94dd | ||
|
|
6007ef315d | ||
|
|
1c26eeed5e | ||
|
|
e35850c5d5 | ||
|
|
78900ac83e | ||
|
|
7d791fac89 |
@@ -39,7 +39,7 @@ dependencies {
|
|||||||
modCompileOnlyApi "org.quiltmc:quilt-json5:1.0.0"
|
modCompileOnlyApi "org.quiltmc:quilt-json5:1.0.0"
|
||||||
modImplementation "maven.modrinth:sodium:${project.sodium_version}-fabric"
|
modImplementation "maven.modrinth:sodium:${project.sodium_version}-fabric"
|
||||||
modCompileOnlyApi "maven.modrinth:emi:${project.emi_version}"
|
modCompileOnlyApi "maven.modrinth:emi:${project.emi_version}"
|
||||||
modCompileOnlyApi "maven.modrinth:emotecraft:${project.emotecraft_version}"
|
modImplementation "maven.modrinth:emotecraft:${project.emotecraft_version}"
|
||||||
modCompileOnlyApi "io.github.kosmx:bendy-lib:${project.bendylib_version}"
|
modCompileOnlyApi "io.github.kosmx:bendy-lib:${project.bendylib_version}"
|
||||||
modCompileOnlyApi "dev.isxander:yet-another-config-lib:${project.yacl_version}"
|
modCompileOnlyApi "dev.isxander:yet-another-config-lib:${project.yacl_version}"
|
||||||
modCompileOnlyApi "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
|
modCompileOnlyApi "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}"
|
||||||
|
|||||||
@@ -86,12 +86,16 @@ public class MidnightControlsClient extends MidnightControls {
|
|||||||
int period = 1; // repeat every 0.001 sec. (1000 times a second)
|
int period = 1; // repeat every 0.001 sec. (1000 times a second)
|
||||||
Timer timer = new Timer();
|
Timer timer = new Timer();
|
||||||
timer.scheduleAtFixedRate(new TimerTask() {
|
timer.scheduleAtFixedRate(new TimerTask() {
|
||||||
public void run() { // TODO: Add a try/catch here after the alpha testing period
|
public void run() {
|
||||||
if (lateInitDone && client.isRunning()) {
|
try {
|
||||||
if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && (client.isWindowFocused() || MidnightControlsConfig.unfocusedInput)) {
|
if (lateInitDone && client.isRunning()) {
|
||||||
input.tickCameraStick();
|
if (MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER && (client.isWindowFocused() || MidnightControlsConfig.unfocusedInput)) {
|
||||||
input.updateCamera();
|
input.tickCameraStick();
|
||||||
|
input.updateCamera();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} catch (Exception | Error e) {
|
||||||
|
MidnightControls.logger.error("Exception encountered in camera loop: ",e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, delay, period);
|
}, delay, period);
|
||||||
@@ -200,6 +204,7 @@ public class MidnightControlsClient extends MidnightControls {
|
|||||||
RainbowColor.tick();
|
RainbowColor.tick();
|
||||||
TouchInput.tick();
|
TouchInput.tick();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when opening a screen.
|
* Called when opening a screen.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,36 +1,51 @@
|
|||||||
package eu.midnightdust.midnightcontrols.client.compat;
|
package eu.midnightdust.midnightcontrols.client.compat;
|
||||||
|
|
||||||
import eu.midnightdust.midnightcontrols.client.controller.InputManager;
|
import eu.midnightdust.midnightcontrols.client.controller.InputManager;
|
||||||
import io.github.kosmx.emotes.arch.gui.EmoteMenuImpl;
|
import eu.midnightdust.midnightcontrols.client.mixin.MouseAccessor;
|
||||||
import io.github.kosmx.emotes.arch.gui.screen.ingame.FastChosseScreen;
|
import io.github.kosmx.emotes.arch.screen.ingame.FastMenuScreen;
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import org.joml.Vector2i;
|
||||||
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
public class EmotecraftCompat {
|
public class EmotecraftCompat {
|
||||||
private static final MinecraftClient client = MinecraftClient.getInstance();
|
private static final MinecraftClient client = MinecraftClient.getInstance();
|
||||||
|
|
||||||
public static void openEmotecraftScreen(Screen parent) {
|
public static void openEmotecraftScreen(Screen parent) {
|
||||||
client.setScreen(new EmoteMenuImpl(parent));
|
client.setScreen(new FastMenuScreen(parent));
|
||||||
}
|
}
|
||||||
public static boolean isEmotecraftScreen(Screen screen) {
|
public static boolean isEmotecraftScreen(Screen screen) {
|
||||||
return screen instanceof FastChosseScreen;
|
return screen instanceof FastMenuScreen;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int prevIndex = -1;
|
||||||
public static void handleEmoteSelector(int index) {
|
public static void handleEmoteSelector(int index) {
|
||||||
if (client.currentScreen instanceof FastChosseScreen) {
|
try {
|
||||||
int x = client.getWindow().getWidth() / 2;
|
if (client.currentScreen instanceof FastMenuScreen) {
|
||||||
int y = client.getWindow().getHeight() / 2;
|
boolean stickReleased = index == -1 && prevIndex != -1;
|
||||||
switch (index) {
|
var pos = calcMousePos(stickReleased ? prevIndex : index);
|
||||||
case 0, 3, 5 -> x -= 200;
|
InputManager.queueMousePosition(pos.x, pos.y);
|
||||||
case 2, 4, 7 -> x += 200;
|
InputManager.INPUT_MANAGER.updateMousePosition(client);
|
||||||
}
|
|
||||||
switch (index) {
|
|
||||||
case 0, 1, 2 -> y -= 200;
|
|
||||||
case 5, 6, 7 -> y += 200;
|
|
||||||
}
|
|
||||||
InputManager.queueMousePosition(x, y);
|
|
||||||
|
|
||||||
InputManager.INPUT_MANAGER.updateMousePosition(client);
|
if (stickReleased) {
|
||||||
|
((MouseAccessor) client.mouse).midnightcontrols$onMouseButton(client.getWindow().getHandle(), GLFW.GLFW_MOUSE_BUTTON_LEFT, GLFW.GLFW_PRESS, 0);
|
||||||
|
prevIndex = -1;
|
||||||
|
}
|
||||||
|
else prevIndex = index;
|
||||||
|
} else prevIndex = -1;
|
||||||
|
} catch (Exception ignored) {}
|
||||||
|
}
|
||||||
|
public static Vector2i calcMousePos(int index) {
|
||||||
|
int x = client.getWindow().getWidth() / 2;
|
||||||
|
int y = client.getWindow().getHeight() / 2;
|
||||||
|
switch (index) {
|
||||||
|
case 0, 3, 5 -> x -= 275;
|
||||||
|
case 2, 4, 7 -> x += 275;
|
||||||
}
|
}
|
||||||
|
switch (index) {
|
||||||
|
case 0, 1, 2 -> y -= 275;
|
||||||
|
case 5, 6, 7 -> y += 275;
|
||||||
|
}
|
||||||
|
return new Vector2i(x, y);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import eu.midnightdust.midnightcontrols.client.util.MathUtil;
|
|||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.network.ClientPlayerEntity;
|
import net.minecraft.client.network.ClientPlayerEntity;
|
||||||
import net.minecraft.entity.attribute.EntityAttributes;
|
import net.minecraft.entity.attribute.EntityAttributes;
|
||||||
|
import net.minecraft.util.PlayerInput;
|
||||||
import net.minecraft.util.math.MathHelper;
|
import net.minecraft.util.math.MathHelper;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
@@ -48,11 +49,8 @@ public final class MovementHandler implements PressAction {
|
|||||||
public void applyMovement(@NotNull ClientPlayerEntity player) {
|
public void applyMovement(@NotNull ClientPlayerEntity player) {
|
||||||
if (!this.shouldOverrideMovement)
|
if (!this.shouldOverrideMovement)
|
||||||
return;
|
return;
|
||||||
// TODO
|
player.input.playerInput = new PlayerInput(this.pressingForward, this.pressingBack, this.pressingLeft, this.pressingRight,
|
||||||
// player.input.playerInput.pressingForward = this.pressingForward;
|
player.input.playerInput.jump(), player.input.playerInput.sneak(), player.input.playerInput.sprint());
|
||||||
// player.input.pressingBack = this.pressingBack;
|
|
||||||
// player.input.pressingLeft = this.pressingLeft;
|
|
||||||
// player.input.pressingRight = this.pressingRight;
|
|
||||||
|
|
||||||
polarUtil.calculate(this.movementSideways, this.movementForward, this.slowdownFactor);
|
polarUtil.calculate(this.movementSideways, this.movementForward, this.slowdownFactor);
|
||||||
player.input.movementForward = polarUtil.polarY;
|
player.input.movementForward = polarUtil.polarY;
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
package eu.midnightdust.midnightcontrols.client.gui;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.DrawContext;
|
||||||
|
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||||
|
import net.minecraft.text.Text;
|
||||||
|
import org.thinkingstudio.obsidianui.Position;
|
||||||
|
import org.thinkingstudio.obsidianui.SpruceTexts;
|
||||||
|
import org.thinkingstudio.obsidianui.screen.SpruceScreen;
|
||||||
|
import org.thinkingstudio.obsidianui.widget.SpruceButtonWidget;
|
||||||
|
import org.thinkingstudio.obsidianui.widget.container.SpruceContainerWidget;
|
||||||
|
|
||||||
|
public class VirtualKeyboardScreen extends SpruceScreen {
|
||||||
|
private SpruceContainerWidget container;
|
||||||
|
private TextFieldWidget bufferDisplay;
|
||||||
|
private final StringBuilder buffer;
|
||||||
|
private final CloseCallback closeCallback;
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface CloseCallback {
|
||||||
|
void onClose(String text);
|
||||||
|
}
|
||||||
|
|
||||||
|
public VirtualKeyboardScreen(String initialText, CloseCallback closeCallback) {
|
||||||
|
super(Text.literal("Virtual Keyboard"));
|
||||||
|
|
||||||
|
this.buffer = new StringBuilder(initialText);
|
||||||
|
this.closeCallback = closeCallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void init() {
|
||||||
|
super.init();
|
||||||
|
|
||||||
|
this.bufferDisplay = new TextFieldWidget(this.textRenderer, this.width / 2 - 100, this.height / 4 - 40, 200, 20, Text.literal(""));
|
||||||
|
this.bufferDisplay.setEditable(false);
|
||||||
|
this.bufferDisplay.setMaxLength(1024);
|
||||||
|
this.bufferDisplay.setText(buffer.toString());
|
||||||
|
this.addDrawableChild(this.bufferDisplay);
|
||||||
|
|
||||||
|
rebuildKeyboard();
|
||||||
|
|
||||||
|
this.addDrawableChild(container);
|
||||||
|
this.addDrawableChild(new SpruceButtonWidget(Position.of(this, this.width / 2 - 50, this.height - 30), 100, 20, SpruceTexts.GUI_DONE, btn -> this.close()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void render(DrawContext drawContext, int mouseX, int mouseY, float delta) {
|
||||||
|
super.render(drawContext, mouseX, mouseY, delta);
|
||||||
|
drawContext.drawCenteredTextWithShadow(this.textRenderer, this.title, this.width / 2, 10, 0xFFFFFF);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void rebuildKeyboard() {
|
||||||
|
this.container = new SpruceContainerWidget(Position.of(0, this.height / 4 - 10), this.width, this.height / 2);
|
||||||
|
|
||||||
|
|
||||||
|
var row1 = new String[]{"q", "w", "e", "r", "t", "y", "u", "i", "o", "p"};
|
||||||
|
var row2 = new String[]{"a", "s", "d", "f", "g", "h", "j", "k", "l"};
|
||||||
|
var row3 = new String[]{"z", "x", "c", "v", "b", "n", "m"};
|
||||||
|
|
||||||
|
addKeyRow(0, row1);
|
||||||
|
addKeyRow(1, row2);
|
||||||
|
addKeyRow(2, row3);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void addKeyRow(int rowOffset, String... keys) {
|
||||||
|
int keyWidth = 20;
|
||||||
|
int spacing = 2;
|
||||||
|
int totalWidth = (keyWidth + spacing) * keys.length - spacing;
|
||||||
|
int startX = (this.width - totalWidth) / 2;
|
||||||
|
int y = this.height / 4 + rowOffset * 24;
|
||||||
|
|
||||||
|
for (int i = 0; i < keys.length; i++) {
|
||||||
|
String key = keys[i];
|
||||||
|
this.container.addChild(new SpruceButtonWidget(Position.of(startX + i * (keyWidth + spacing), y), keyWidth, 20, Text.literal(key), btn -> handleKeyPress(key)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleKeyPress(String key) {
|
||||||
|
if (this.client == null) return;
|
||||||
|
|
||||||
|
// TODO
|
||||||
|
if (key.equals("\b")) {
|
||||||
|
if (!buffer.isEmpty()) {
|
||||||
|
buffer.deleteCharAt(buffer.length() - 1);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
buffer.append(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.bufferDisplay != null) {
|
||||||
|
this.bufferDisplay.setText(buffer.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean shouldPause() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void close() {
|
||||||
|
super.close();
|
||||||
|
if (closeCallback != null) {
|
||||||
|
closeCallback.onClose(buffer.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package eu.midnightdust.midnightcontrols.client.mixin;
|
||||||
|
|
||||||
|
import net.minecraft.block.entity.SignText;
|
||||||
|
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
|
||||||
|
@Mixin(AbstractSignEditScreen.class)
|
||||||
|
public interface AbstractSignEditScreenAccessor {
|
||||||
|
@Accessor("text")
|
||||||
|
SignText midnightcontrols$getText();
|
||||||
|
|
||||||
|
@Accessor("text")
|
||||||
|
void midnightcontrols$setText(SignText text);
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package eu.midnightdust.midnightcontrols.client.mixin;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.screen.ingame.BookEditScreen;
|
||||||
|
import net.minecraft.client.util.SelectionManager;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||||
|
|
||||||
|
@Mixin(BookEditScreen.class)
|
||||||
|
public interface BookEditScreenAccessor {
|
||||||
|
@Accessor("signing")
|
||||||
|
boolean midnightcontrols$isSigning();
|
||||||
|
|
||||||
|
@Accessor("title")
|
||||||
|
String midnightcontrols$getTitle();
|
||||||
|
|
||||||
|
@Accessor("title")
|
||||||
|
void midnightcontrols$setTitle(String title);
|
||||||
|
|
||||||
|
@Accessor("currentPageSelectionManager")
|
||||||
|
SelectionManager midnightcontrols$getCurrentPageSelectionManager();
|
||||||
|
|
||||||
|
@Invoker("getCurrentPageContent")
|
||||||
|
String midnightcontrols$getCurrentPageContent();
|
||||||
|
|
||||||
|
@Invoker("setPageContent")
|
||||||
|
void midnightcontrols$setPageContent(String newContent);
|
||||||
|
}
|
||||||
@@ -77,7 +77,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(ZF)V", shift = At.Shift.AFTER))
|
@Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick()V", shift = At.Shift.AFTER))
|
||||||
public void onInputUpdate(CallbackInfo ci) {
|
public void onInputUpdate(CallbackInfo ci) {
|
||||||
MovementHandler.HANDLER.applyMovement((ClientPlayerEntity) (Object) this);
|
MovementHandler.HANDLER.applyMovement((ClientPlayerEntity) (Object) this);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -58,4 +58,10 @@ public interface CreativeInventoryScreenAccessor {
|
|||||||
*/
|
*/
|
||||||
@Invoker("hasScrollbar")
|
@Invoker("hasScrollbar")
|
||||||
boolean midnightcontrols$hasScrollbar();
|
boolean midnightcontrols$hasScrollbar();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Triggers searching the creative inventory from the current value of the internal {@link net.minecraft.client.gui.widget.TextFieldWidget}
|
||||||
|
*/
|
||||||
|
@Invoker("search")
|
||||||
|
void midnightcontrols$search();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,17 +33,24 @@ import static eu.midnightdust.midnightcontrols.MidnightControls.id;
|
|||||||
@Mixin(GameOptionsScreen.class)
|
@Mixin(GameOptionsScreen.class)
|
||||||
public abstract class GameOptionsScreenMixin extends Screen {
|
public abstract class GameOptionsScreenMixin extends Screen {
|
||||||
@Shadow @Nullable protected OptionListWidget body;
|
@Shadow @Nullable protected OptionListWidget body;
|
||||||
@Unique TextIconButtonWidget midnightcontrols$button = TextIconButtonWidget.builder(Text.translatable("midnightcontrols.menu.title.controller"), (button -> this.client.setScreen(new MidnightControlsSettingsScreen(this, false))), true)
|
@Unique TextIconButtonWidget midnightcontrols$button = TextIconButtonWidget.builder(Text.translatable("midnightcontrols.menu.title.controller"),
|
||||||
|
(button -> this.client.setScreen(new MidnightControlsSettingsScreen(this, false))), true)
|
||||||
.dimension(20,20).texture(id("icon/controller"), 20, 20).build();
|
.dimension(20,20).texture(id("icon/controller"), 20, 20).build();
|
||||||
|
|
||||||
protected GameOptionsScreenMixin(Text title) {
|
protected GameOptionsScreenMixin(Text title) {
|
||||||
super(title);
|
super(title);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "init", at = @At("TAIL"))
|
@Inject(method = "initBody", at = @At("TAIL"))
|
||||||
public void midnightcontrols$addMCButton(CallbackInfo ci) {
|
public void midnightcontrols$addMCButton(CallbackInfo ci) {
|
||||||
if (this.getClass().toString().equals(ControlsOptionsScreen.class.toString())) {
|
if (this.getClass().toString().equals(ControlsOptionsScreen.class.toString())) {
|
||||||
this.midnightcontrols$setButtonPos();
|
this.midnightcontrols$setButtonPos();
|
||||||
|
this.addSelectableChild(midnightcontrols$button);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@Inject(method = "init", at = @At("TAIL"))
|
||||||
|
public void midnightcontrols$drawMCButton(CallbackInfo ci) {
|
||||||
|
if (this.getClass().toString().equals(ControlsOptionsScreen.class.toString())) {
|
||||||
this.addDrawableChild(midnightcontrols$button);
|
this.addDrawableChild(midnightcontrols$button);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
"compatibilityLevel": "JAVA_21",
|
"compatibilityLevel": "JAVA_21",
|
||||||
"client": [
|
"client": [
|
||||||
"AdvancementsScreenAccessor",
|
"AdvancementsScreenAccessor",
|
||||||
|
"BookEditScreenAccessor",
|
||||||
"ChatScreenMixin",
|
"ChatScreenMixin",
|
||||||
"ClickableWidgetAccessor",
|
"ClickableWidgetAccessor",
|
||||||
"ClientPlayerEntityMixin",
|
"ClientPlayerEntityMixin",
|
||||||
@@ -22,6 +23,7 @@
|
|||||||
"RecipeBookScreenAccessor",
|
"RecipeBookScreenAccessor",
|
||||||
"RecipeBookWidgetAccessor",
|
"RecipeBookWidgetAccessor",
|
||||||
"ScreenMixin",
|
"ScreenMixin",
|
||||||
|
"AbstractSignEditScreenAccessor",
|
||||||
"TabNavigationWidgetAccessor",
|
"TabNavigationWidgetAccessor",
|
||||||
"WorldRendererMixin"
|
"WorldRendererMixin"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -92,7 +92,8 @@ unifiedPublishing {
|
|||||||
curseforge {
|
curseforge {
|
||||||
token = CURSEFORGE_TOKEN
|
token = CURSEFORGE_TOKEN
|
||||||
id = rootProject.curseforge_id
|
id = rootProject.curseforge_id
|
||||||
gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
|
gameVersions.addAll "Java 21", project.minecraft_version
|
||||||
|
if (project.supported_versions != "") gameVersions.addAll project.supported_versions
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,7 +103,8 @@ unifiedPublishing {
|
|||||||
token = MODRINTH_TOKEN
|
token = MODRINTH_TOKEN
|
||||||
id = rootProject.modrinth_id
|
id = rootProject.modrinth_id
|
||||||
version = "$project.version-$project.name"
|
version = "$project.version-$project.name"
|
||||||
gameVersions.addAll project.minecraft_version, project.supported_versions
|
gameVersions.addAll project.minecraft_version
|
||||||
|
if (project.supported_versions != "") gameVersions.addAll project.supported_versions
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package eu.midnightdust.midnightcontrols.fabric;
|
|||||||
import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
|
import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
|
||||||
import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
|
import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
|
||||||
import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
|
import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
|
||||||
|
import eu.midnightdust.midnightcontrols.fabric.event.MouseClickListener;
|
||||||
import eu.midnightdust.midnightcontrols.packet.ControlsModePayload;
|
import eu.midnightdust.midnightcontrols.packet.ControlsModePayload;
|
||||||
import eu.midnightdust.midnightcontrols.packet.FeaturePayload;
|
import eu.midnightdust.midnightcontrols.packet.FeaturePayload;
|
||||||
import eu.midnightdust.midnightcontrols.packet.HelloPayload;
|
import eu.midnightdust.midnightcontrols.packet.HelloPayload;
|
||||||
@@ -11,11 +12,12 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
|||||||
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
|
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
|
||||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
|
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
|
||||||
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
|
||||||
|
import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
|
||||||
|
import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
|
||||||
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
|
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
|
||||||
import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
|
import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
import net.fabricmc.loader.api.ModContainer;
|
import net.fabricmc.loader.api.ModContainer;
|
||||||
import org.thinkingstudio.obsidianui.fabric.event.OpenScreenCallback;
|
|
||||||
|
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
@@ -51,6 +53,9 @@ public class MidnightControlsClientFabric implements ClientModInitializer {
|
|||||||
ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> MidnightControlsClient.onLeave());
|
ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> MidnightControlsClient.onLeave());
|
||||||
|
|
||||||
ClientTickEvents.START_CLIENT_TICK.register(MidnightControlsClient::onTick);
|
ClientTickEvents.START_CLIENT_TICK.register(MidnightControlsClient::onTick);
|
||||||
|
ScreenEvents.AFTER_INIT.register((client, screen, scaledWidth, scaledHeight) -> {
|
||||||
|
ScreenMouseEvents.allowMouseClick(screen).register(new MouseClickListener(screen));
|
||||||
|
});
|
||||||
|
|
||||||
FabricLoader.getInstance().getModContainer(MidnightControlsConstants.NAMESPACE).ifPresent(modContainer -> {
|
FabricLoader.getInstance().getModContainer(MidnightControlsConstants.NAMESPACE).ifPresent(modContainer -> {
|
||||||
ResourceManagerHelper.registerBuiltinResourcePack(id("bedrock"), modContainer, ResourcePackActivationType.NORMAL);
|
ResourceManagerHelper.registerBuiltinResourcePack(id("bedrock"), modContainer, ResourcePackActivationType.NORMAL);
|
||||||
|
|||||||
@@ -0,0 +1,218 @@
|
|||||||
|
package eu.midnightdust.midnightcontrols.fabric.event;
|
||||||
|
import eu.midnightdust.midnightcontrols.client.gui.VirtualKeyboardScreen;
|
||||||
|
import eu.midnightdust.midnightcontrols.client.mixin.AbstractSignEditScreenAccessor;
|
||||||
|
import eu.midnightdust.midnightcontrols.client.mixin.BookEditScreenAccessor;
|
||||||
|
import eu.midnightdust.midnightcontrols.client.mixin.CreativeInventoryScreenAccessor;
|
||||||
|
import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
|
||||||
|
import net.minecraft.block.entity.SignText;
|
||||||
|
import net.minecraft.client.gui.Element;
|
||||||
|
import net.minecraft.client.gui.ParentElement;
|
||||||
|
import net.minecraft.client.gui.screen.ChatScreen;
|
||||||
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import net.minecraft.client.gui.screen.ingame.BookEditScreen;
|
||||||
|
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
|
||||||
|
import net.minecraft.client.gui.screen.ingame.SignEditScreen;
|
||||||
|
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||||
|
import org.lwjgl.glfw.GLFW;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import static eu.midnightdust.midnightcontrols.MidnightControls.logger;
|
||||||
|
import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
|
||||||
|
|
||||||
|
record ScreenLink(Screen screen, List<Integer> elementPath) {}
|
||||||
|
|
||||||
|
public class MouseClickListener implements ScreenMouseEvents.AllowMouseClick {
|
||||||
|
private final Screen screen;
|
||||||
|
|
||||||
|
private ScreenLink link;
|
||||||
|
|
||||||
|
public MouseClickListener(Screen screen) {
|
||||||
|
this.screen = screen;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean allowMouseClick(Screen screen, double mouseX, double mouseY, int button) {
|
||||||
|
interceptMouseClick(screen, mouseX, mouseY);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void interceptMouseClick(Screen screen, double mouseX, double mouseY) {
|
||||||
|
logger.info("In scr: {}", screen.getClass());
|
||||||
|
switch(screen) {
|
||||||
|
case BookEditScreen bookEditScreen -> {
|
||||||
|
if(screen.hoveredElement(mouseX, mouseY).isPresent()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
handleBookEditScreenClick(bookEditScreen);
|
||||||
|
}
|
||||||
|
case SignEditScreen signEditScreen -> {
|
||||||
|
if(screen.hoveredElement(mouseX, mouseY).isPresent()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
handleSignEditScreenClick(signEditScreen);
|
||||||
|
}
|
||||||
|
default -> {
|
||||||
|
var textField = findClickedTextField(screen, mouseX, mouseY);
|
||||||
|
if (textField == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
handleTextFieldClick(textField);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add equals and hashCode to prevent duplicate registrations
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object obj) {
|
||||||
|
if (obj instanceof MouseClickListener) {
|
||||||
|
return ((MouseClickListener) obj).screen == this.screen;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return screen.hashCode();
|
||||||
|
}
|
||||||
|
|
||||||
|
// handlers
|
||||||
|
|
||||||
|
private void handleBookEditScreenClick(BookEditScreen bookEditScreen) {
|
||||||
|
var accessor = (BookEditScreenAccessor) screen;
|
||||||
|
|
||||||
|
VirtualKeyboardScreen virtualKeyboardScreen;
|
||||||
|
if(accessor.midnightcontrols$isSigning()) {
|
||||||
|
virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getTitle(), (text) -> {
|
||||||
|
client.setScreen(bookEditScreen);
|
||||||
|
accessor.midnightcontrols$setTitle(text);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
virtualKeyboardScreen = new VirtualKeyboardScreen(accessor.midnightcontrols$getCurrentPageContent(), (text) -> {
|
||||||
|
client.setScreen(bookEditScreen);
|
||||||
|
accessor.midnightcontrols$setPageContent(text);
|
||||||
|
accessor.midnightcontrols$getCurrentPageSelectionManager().putCursorAtEnd();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
client.setScreen(virtualKeyboardScreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleSignEditScreenClick(SignEditScreen signEditScreen) {
|
||||||
|
var accessor = (AbstractSignEditScreenAccessor) signEditScreen;
|
||||||
|
// TODO
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleTextFieldClick(TextFieldWidget textField) {
|
||||||
|
this.link = new ScreenLink(screen, calculatePathToElement(screen, textField));
|
||||||
|
var virtualKeyboardScreen = new VirtualKeyboardScreen(textField.getText(), this::handleKeyboardClose);
|
||||||
|
client.setScreen(virtualKeyboardScreen);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleKeyboardClose(String newText) {
|
||||||
|
if(this.link == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
client.setScreen(this.link.screen());
|
||||||
|
var txtField = findTextFieldByPath(screen, this.link.elementPath());
|
||||||
|
if (txtField == null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
txtField.setText(newText);
|
||||||
|
|
||||||
|
|
||||||
|
switch (this.link.screen()) {
|
||||||
|
case CreativeInventoryScreen creativeInventoryScreen -> {
|
||||||
|
var accessor = (CreativeInventoryScreenAccessor) creativeInventoryScreen;
|
||||||
|
accessor.midnightcontrols$search();
|
||||||
|
}
|
||||||
|
case ChatScreen chatScreen -> {
|
||||||
|
// send the chat message
|
||||||
|
chatScreen.keyPressed(GLFW.GLFW_KEY_ENTER, 0, 0);
|
||||||
|
}
|
||||||
|
default -> {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// utility
|
||||||
|
|
||||||
|
private TextFieldWidget findClickedTextField(Screen screen, double mouseX, double mouseY) {
|
||||||
|
for (Element element : screen.children()) {
|
||||||
|
if (element instanceof TextFieldWidget textField) {
|
||||||
|
if (textField.isMouseOver(mouseX, mouseY) && textField.isFocused()) {
|
||||||
|
return textField;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// not hovering over a text field
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculates the path between a parent and a target in the UI hierarchy
|
||||||
|
*/
|
||||||
|
private List<Integer> calculatePathToElement(Element parent, Element target) {
|
||||||
|
if (parent instanceof ParentElement parentElement) {
|
||||||
|
List<? extends Element> children = parentElement.children();
|
||||||
|
|
||||||
|
// check direct children first
|
||||||
|
for (int i = 0; i < children.size(); i++) {
|
||||||
|
if (children.get(i) == target) {
|
||||||
|
// found it, return the path to this element
|
||||||
|
return Collections.singletonList(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// check each child's children
|
||||||
|
for (int i = 0; i < children.size(); i++) {
|
||||||
|
if (children.get(i) instanceof ParentElement childParent) {
|
||||||
|
List<Integer> subPath = calculatePathToElement(childParent, target);
|
||||||
|
if (subPath != null) {
|
||||||
|
// found in this subtree, prepend current index
|
||||||
|
List<Integer> fullPath = new ArrayList<>();
|
||||||
|
fullPath.add(i);
|
||||||
|
fullPath.addAll(subPath);
|
||||||
|
return fullPath;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not found
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private TextFieldWidget findTextFieldByPath(Element parent, List<Integer> path) {
|
||||||
|
if (path == null || path.isEmpty()) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parent instanceof ParentElement parentElement) {
|
||||||
|
List<? extends Element> children = parentElement.children();
|
||||||
|
int index = path.getFirst();
|
||||||
|
|
||||||
|
if (index >= 0 && index < children.size()) {
|
||||||
|
Element child = children.get(index);
|
||||||
|
|
||||||
|
if (path.size() == 1) {
|
||||||
|
// This should be our target
|
||||||
|
return (child instanceof TextFieldWidget) ? (TextFieldWidget) child : null;
|
||||||
|
} else {
|
||||||
|
// Continue traversing
|
||||||
|
if (child instanceof ParentElement) {
|
||||||
|
return findTextFieldByPath(child, path.subList(1, path.size()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,25 +2,25 @@
|
|||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
org.gradle.jvmargs=-Xmx2048M
|
org.gradle.jvmargs=-Xmx2048M
|
||||||
|
|
||||||
minecraft_version=1.21.3
|
minecraft_version=1.21.4
|
||||||
supported_versions=1.21.2
|
supported_versions=
|
||||||
yarn_mappings=1.21.3+build.2
|
yarn_mappings=1.21.4+build.1
|
||||||
enabled_platforms=fabric,neoforge
|
enabled_platforms=fabric,neoforge
|
||||||
|
|
||||||
archives_base_name=midnightcontrols
|
archives_base_name=midnightcontrols
|
||||||
mod_version=1.10.1
|
mod_version=1.10.5
|
||||||
maven_group=eu.midnightdust
|
maven_group=eu.midnightdust
|
||||||
release_type=beta
|
release_type=release
|
||||||
modrinth_id = bXX9h73M
|
modrinth_id = bXX9h73M
|
||||||
curseforge_id = 621768
|
curseforge_id = 621768
|
||||||
# Configure the IDs here after creating the projects on the websites
|
# Configure the IDs here after creating the projects on the websites
|
||||||
|
|
||||||
midnightlib_version=1.6.4
|
midnightlib_version=1.6.8+1.21.4
|
||||||
|
|
||||||
fabric_loader_version=0.16.9
|
fabric_loader_version=0.16.9
|
||||||
fabric_api_version=0.107.3+1.21.3
|
fabric_api_version=0.110.5+1.21.4
|
||||||
|
|
||||||
neoforge_version=21.3.28-beta
|
neoforge_version=21.4.9-beta
|
||||||
yarn_mappings_patch_neoforge_version = 1.21+build.4
|
yarn_mappings_patch_neoforge_version = 1.21+build.4
|
||||||
|
|
||||||
quilt_loader_version=0.19.0-beta.18
|
quilt_loader_version=0.19.0-beta.18
|
||||||
@@ -29,7 +29,7 @@ quilt_fabric_api_version=7.0.1+0.83.0-1.20
|
|||||||
sodium_version=mc1.21-0.6.0-beta.1
|
sodium_version=mc1.21-0.6.0-beta.1
|
||||||
obsidianui_version=0.2.10+mc1.21.3
|
obsidianui_version=0.2.10+mc1.21.3
|
||||||
modmenu_version=10.0.0-beta.1
|
modmenu_version=10.0.0-beta.1
|
||||||
emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric
|
emotecraft_version=2.5.5+1.21.4-fabric
|
||||||
bendylib_version=2.0.+
|
bendylib_version=2.0.+
|
||||||
emi_version=1.1.10+1.21+fabric
|
emi_version=1.1.10+1.21+fabric
|
||||||
libgui_version=6.0.0+1.19
|
libgui_version=6.0.0+1.19
|
||||||
|
|||||||
@@ -104,7 +104,8 @@ unifiedPublishing {
|
|||||||
curseforge {
|
curseforge {
|
||||||
token = CURSEFORGE_TOKEN
|
token = CURSEFORGE_TOKEN
|
||||||
id = rootProject.curseforge_id
|
id = rootProject.curseforge_id
|
||||||
gameVersions.addAll "Java 21", project.minecraft_version, project.supported_versions
|
gameVersions.addAll "Java 21", project.minecraft_version
|
||||||
|
if (project.supported_versions != "") gameVersions.addAll project.supported_versions
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,7 +115,8 @@ unifiedPublishing {
|
|||||||
token = MODRINTH_TOKEN
|
token = MODRINTH_TOKEN
|
||||||
id = rootProject.modrinth_id
|
id = rootProject.modrinth_id
|
||||||
version = "$project.version-$project.name"
|
version = "$project.version-$project.name"
|
||||||
gameVersions.addAll project.minecraft_version, project.supported_versions
|
gameVersions.addAll project.minecraft_version
|
||||||
|
if (project.supported_versions != "") gameVersions.addAll project.supported_versions
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user