From dac5e55ee1a4389961fd3898395887ebd35a462b Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Wed, 29 Oct 2025 15:16:27 +0100 Subject: [PATCH] release: v1.11.3-beta.2 --- .../client/MidnightControlsConfig.java | 10 +++++----- .../client/gui/MidnightControlsRenderer.java | 8 -------- .../client/gui/MidnightControlsSettingsScreen.java | 3 --- .../client/gui/config/MappingsStringInputWidget.java | 4 ++++ .../resources/assets/midnightcontrols/lang/en_us.json | 1 + gradle.properties | 4 ++-- 6 files changed, 12 insertions(+), 18 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java index 5ee1f98..504222e 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java @@ -65,7 +65,7 @@ public class MidnightControlsConfig extends MidnightConfig { public static final String VISUAL = "visual"; public static final String MISC = "misc"; public static final String BUTTONS = "buttons"; - public static final String MAPPING = "mapping"; + //public static final String MAPPING = "mapping"; public static boolean isEditing = false; @Hidden @Entry public static int configVersion = 2; @@ -192,7 +192,7 @@ public class MidnightControlsConfig extends MidnightConfig { @Entry(category = MISC, name = "Excluded Controllers (Name Regex)") public static List excludedControllers = Lists.newArrayList(".*(Keyboard)$", ".*(Touchpad)$", ".*(Pen)$", ".*(Finger)$"); // Init mapping tab (see #onTabInit()) - @Comment(category = MAPPING) @Condition(requiredModId = "thisModDoesNotExist") public static Comment this_spacer_will_never_be_visible_as_well; + //@Comment(category = MAPPING) @Condition(requiredModId = "thisModDoesNotExist") public static Comment this_spacer_will_never_be_visible_as_well; @Entry @Hidden public static Map> controllerBindingProfiles = new HashMap<>(); @@ -252,9 +252,9 @@ public class MidnightControlsConfig extends MidnightConfig { }).dimensions(screen.width - 185, 0, 175, 20).build(); list.addButton(List.of(editButton), Text.of("Legacy Config UI"), new EntryInfo(null, screen.modid)); } - if (MAPPING.equals(tabName)) { - MappingsStringInputWidget.add(centeredComment, list, screen); - } +// if (MAPPING.equals(tabName)) { +// MappingsStringInputWidget.add(centeredComment, list, screen); +// } } /** diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java index d1fc1ff..4dd002b 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java @@ -12,23 +12,15 @@ package eu.midnightdust.midnightcontrols.client.gui; import eu.midnightdust.midnightcontrols.client.enums.ControllerType; import eu.midnightdust.midnightcontrols.client.MidnightControlsClient; import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig; -import eu.midnightdust.midnightcontrols.client.MidnightInput; -import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat; import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding; -import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gl.RenderPipelines; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.resource.language.I18n; -import net.minecraft.client.texture.Sprite; -import net.minecraft.screen.slot.Slot; -import net.minecraft.util.Atlases; import org.jetbrains.annotations.NotNull; import org.lwjgl.glfw.GLFW; -import static eu.midnightdust.midnightcontrols.MidnightControls.id; - /** * Represents the midnightcontrols renderer. * diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java index 7b71ad1..e68c2be 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java @@ -63,7 +63,6 @@ public class MidnightControlsSettingsScreen extends SpruceScreen { private final SpruceOption virtualKeyboardOption; private final SpruceOption hideCursorOption; private final SpruceOption resetOption; - private final SpruceOption advancedConfigOption; // Gameplay options private final SpruceOption analogMovementOption; private final SpruceOption autoJumpOption; @@ -224,7 +223,6 @@ public class MidnightControlsSettingsScreen extends SpruceScreen { var client = MinecraftClient.getInstance(); this.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight()); }); - this.advancedConfigOption = SpruceSimpleActionOption.of("midnightcontrols.midnightconfig.title", button -> client.setScreen(MidnightControlsConfig.getScreen(this, MidnightControlsConstants.NAMESPACE))); // Gameplay options this.analogMovementOption = new SpruceToggleBooleanOption("midnightcontrols.menu.analog_movement", () -> MidnightControlsConfig.analogMovement, value -> MidnightControlsConfig.analogMovement = value, @@ -399,7 +397,6 @@ public class MidnightControlsSettingsScreen extends SpruceScreen { list.addSingleOptionEntry(this.hideCursorOption); list.addSingleOptionEntry(this.joystickAsMouseOption); list.addSingleOptionEntry(this.eyeTrackingAsMouseOption); - list.addSingleOptionEntry(this.advancedConfigOption); return list; } diff --git a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/MappingsStringInputWidget.java b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/MappingsStringInputWidget.java index 75b0b7e..a69a34c 100644 --- a/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/MappingsStringInputWidget.java +++ b/common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/MappingsStringInputWidget.java @@ -10,6 +10,8 @@ package eu.midnightdust.midnightcontrols.client.gui.config; import com.google.common.collect.Lists; +import dev.lambdaurora.spruceui.Position; +import dev.lambdaurora.spruceui.widget.text.SpruceTextAreaWidget; import eu.midnightdust.lib.config.EntryInfo; import eu.midnightdust.lib.config.MidnightConfigListWidget; import eu.midnightdust.lib.config.MidnightConfigScreen; @@ -32,6 +34,7 @@ import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.cli public class MappingsStringInputWidget { public static void add(EntryInfo centered, MidnightConfigListWidget list, MidnightConfigScreen screen) { + //SpruceTextAreaWidget editButton = new SpruceTextAreaWidget(Position.of(0, 0), 20, 20, Text.empty()); MultilineTextFieldWidget editButton = new MultilineTextFieldWidget(screen.getTextRenderer(), screen.width / 2 - 128, 0, 256, 60, Text.of("TESTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT\nnew line!")); TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> { screen.updateList(); @@ -42,6 +45,7 @@ public class MappingsStringInputWidget { }); list.addButton(List.of(), Text.translatable("midnightcontrols.menu.title.mappings.string"), centered); + //screen.addDrawableChild(editButton); list.addButton(Lists.newArrayList(editButton, resetButton), Text.empty(), centered); list.addButton(List.of(), Text.empty(), centered); list.addButton(List.of(), Text.empty(), centered); diff --git a/common/src/main/resources/assets/midnightcontrols/lang/en_us.json b/common/src/main/resources/assets/midnightcontrols/lang/en_us.json index ca27b4d..96167a4 100644 --- a/common/src/main/resources/assets/midnightcontrols/lang/en_us.json +++ b/common/src/main/resources/assets/midnightcontrols/lang/en_us.json @@ -238,6 +238,7 @@ "midnightcontrols.virtual_mouse.skin.second_dark": "Second Dark", "midnightcontrols.midnightconfig.category.controller": "Controller", "midnightcontrols.midnightconfig.category.buttons": "Buttons", + "midnightcontrols.midnightconfig.category.mapping": "Mapping", "midnightcontrols.midnightconfig.category.misc": "Miscellaneous", "midnightcontrols.midnightconfig.category.screens": "Screens", "midnightcontrols.midnightconfig.category.gameplay": "Gameplay", diff --git a/gradle.properties b/gradle.properties index ebbb084..98aace8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx2048M minecraft_version=1.21.9 -supported_versions= +supported_versions=1.21.10 yarn_mappings=1.21.9+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightcontrols -mod_version=1.11.3-beta.1 +mod_version=1.11.3-beta.2 maven_group=eu.midnightdust release_type=beta modrinth_id = bXX9h73M