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

release: v1.11.3-beta.2

Browse Source
This commit is contained in:
Martin Prokoph
2025-10-29 15:16:27 +01:00
parent 6b89dbf8e5
commit dac5e55ee1
6 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java
View File

@@ -65,7 +65,7 @@ public class MidnightControlsConfig extends MidnightConfig {
public static final String VISUAL = "visual"; public static final String VISUAL = "visual";
public static final String MISC = "misc"; public static final String MISC = "misc";
public static final String BUTTONS = "buttons"; public static final String BUTTONS = "buttons";
public static final String MAPPING = "mapping"; //public static final String MAPPING = "mapping";
public static boolean isEditing = false; public static boolean isEditing = false;
@Hidden @Entry public static int configVersion = 2; @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<String> excludedControllers = Lists.newArrayList(".*(Keyboard)$", ".*(Touchpad)$", ".*(Pen)$", ".*(Finger)$"); @Entry(category = MISC, name = "Excluded Controllers (Name Regex)") public static List<String> excludedControllers = Lists.newArrayList(".*(Keyboard)$", ".*(Touchpad)$", ".*(Pen)$", ".*(Finger)$");
// Init mapping tab (see #onTabInit()) // 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<String, Map<String, String>> controllerBindingProfiles = new HashMap<>(); @Entry @Hidden public static Map<String, Map<String, String>> controllerBindingProfiles = new HashMap<>();
@@ -252,9 +252,9 @@ public class MidnightControlsConfig extends MidnightConfig {
}).dimensions(screen.width - 185, 0, 175, 20).build(); }).dimensions(screen.width - 185, 0, 175, 20).build();
list.addButton(List.of(editButton), Text.of("Legacy Config UI"), new EntryInfo(null, screen.modid)); list.addButton(List.of(editButton), Text.of("Legacy Config UI"), new EntryInfo(null, screen.modid));
} }
if (MAPPING.equals(tabName)) { // if (MAPPING.equals(tabName)) {
MappingsStringInputWidget.add(centeredComment, list, screen); // MappingsStringInputWidget.add(centeredComment, list, screen);
} // }
} }
/** /**

8
common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsRenderer.java
View File

@@ -12,23 +12,15 @@ package eu.midnightdust.midnightcontrols.client.gui;
import eu.midnightdust.midnightcontrols.client.enums.ControllerType; import eu.midnightdust.midnightcontrols.client.enums.ControllerType;
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.client.MidnightInput;
import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding; import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
import eu.midnightdust.midnightcontrols.client.util.HandledScreenAccessor;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gl.RenderPipelines; import net.minecraft.client.gl.RenderPipelines;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.resource.language.I18n; 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.jetbrains.annotations.NotNull;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import static eu.midnightdust.midnightcontrols.MidnightControls.id;
/** /**
* Represents the midnightcontrols renderer. * Represents the midnightcontrols renderer.
* *

3
common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java
View File

@@ -63,7 +63,6 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
private final SpruceOption virtualKeyboardOption; private final SpruceOption virtualKeyboardOption;
private final SpruceOption hideCursorOption; private final SpruceOption hideCursorOption;
private final SpruceOption resetOption; private final SpruceOption resetOption;
private final SpruceOption advancedConfigOption;
// Gameplay options // Gameplay options
private final SpruceOption analogMovementOption; private final SpruceOption analogMovementOption;
private final SpruceOption autoJumpOption; private final SpruceOption autoJumpOption;
@@ -224,7 +223,6 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
var client = MinecraftClient.getInstance(); var client = MinecraftClient.getInstance();
this.init(client, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight()); 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 // Gameplay options
this.analogMovementOption = new SpruceToggleBooleanOption("midnightcontrols.menu.analog_movement", this.analogMovementOption = new SpruceToggleBooleanOption("midnightcontrols.menu.analog_movement",
() -> MidnightControlsConfig.analogMovement, value -> MidnightControlsConfig.analogMovement = value, () -> MidnightControlsConfig.analogMovement, value -> MidnightControlsConfig.analogMovement = value,
@@ -399,7 +397,6 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
list.addSingleOptionEntry(this.hideCursorOption); list.addSingleOptionEntry(this.hideCursorOption);
list.addSingleOptionEntry(this.joystickAsMouseOption); list.addSingleOptionEntry(this.joystickAsMouseOption);
list.addSingleOptionEntry(this.eyeTrackingAsMouseOption); list.addSingleOptionEntry(this.eyeTrackingAsMouseOption);
list.addSingleOptionEntry(this.advancedConfigOption);
return list; return list;
} }

4
common/src/main/java/eu/midnightdust/midnightcontrols/client/gui/config/MappingsStringInputWidget.java
View File

@@ -10,6 +10,8 @@
package eu.midnightdust.midnightcontrols.client.gui.config; package eu.midnightdust.midnightcontrols.client.gui.config;
import com.google.common.collect.Lists; 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.EntryInfo;
import eu.midnightdust.lib.config.MidnightConfigListWidget; import eu.midnightdust.lib.config.MidnightConfigListWidget;
import eu.midnightdust.lib.config.MidnightConfigScreen; import eu.midnightdust.lib.config.MidnightConfigScreen;
@@ -32,6 +34,7 @@ import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.cli
public class MappingsStringInputWidget { public class MappingsStringInputWidget {
public static void add(EntryInfo centered, MidnightConfigListWidget list, MidnightConfigScreen screen) { 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!")); 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 -> { TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> {
screen.updateList(); screen.updateList();
@@ -42,6 +45,7 @@ public class MappingsStringInputWidget {
}); });
list.addButton(List.of(), Text.translatable("midnightcontrols.menu.title.mappings.string"), centered); 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(Lists.newArrayList(editButton, resetButton), Text.empty(), centered);
list.addButton(List.of(), Text.empty(), centered); list.addButton(List.of(), Text.empty(), centered);
list.addButton(List.of(), Text.empty(), centered); list.addButton(List.of(), Text.empty(), centered);

1
common/src/main/resources/assets/midnightcontrols/lang/en_us.json
View File

@@ -238,6 +238,7 @@
"midnightcontrols.virtual_mouse.skin.second_dark": "Second Dark", "midnightcontrols.virtual_mouse.skin.second_dark": "Second Dark",
"midnightcontrols.midnightconfig.category.controller": "Controller", "midnightcontrols.midnightconfig.category.controller": "Controller",
"midnightcontrols.midnightconfig.category.buttons": "Buttons", "midnightcontrols.midnightconfig.category.buttons": "Buttons",
"midnightcontrols.midnightconfig.category.mapping": "Mapping",
"midnightcontrols.midnightconfig.category.misc": "Miscellaneous", "midnightcontrols.midnightconfig.category.misc": "Miscellaneous",
"midnightcontrols.midnightconfig.category.screens": "Screens", "midnightcontrols.midnightconfig.category.screens": "Screens",
"midnightcontrols.midnightconfig.category.gameplay": "Gameplay", "midnightcontrols.midnightconfig.category.gameplay": "Gameplay",

4
gradle.properties
View File

@@ -3,12 +3,12 @@ org.gradle.parallel=true
org.gradle.jvmargs=-Xmx2048M org.gradle.jvmargs=-Xmx2048M
minecraft_version=1.21.9 minecraft_version=1.21.9
supported_versions= supported_versions=1.21.10
yarn_mappings=1.21.9+build.1 yarn_mappings=1.21.9+build.1
enabled_platforms=fabric,neoforge enabled_platforms=fabric,neoforge
archives_base_name=midnightcontrols archives_base_name=midnightcontrols
mod_version=1.11.3-beta.1 mod_version=1.11.3-beta.2
maven_group=eu.midnightdust maven_group=eu.midnightdust
release_type=beta release_type=beta
modrinth_id = bXX9h73M modrinth_id = bXX9h73M