diff --git a/gradle.properties b/gradle.properties index ad32238..3791d9d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=1.19+build.1 loader_version=0.14.7 # Mod Properties -mod_version = 1.4.2 +mod_version = 1.5.0 maven_group = eu.midnightdust archives_base_name = midnightcontrols modrinth_id=bXX9h73M diff --git a/src/main/java/eu/midnightdust/midnightcontrols/MidnightControls.java b/src/main/java/eu/midnightdust/midnightcontrols/MidnightControls.java index 063f578..f7a0824 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/MidnightControls.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/MidnightControls.java @@ -16,7 +16,6 @@ import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.ModContainer; import net.minecraft.network.PacketByteBuf; -import net.minecraft.text.Text; import net.minecraft.util.Identifier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java index 054ae39..2da3a9f 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsClient.java @@ -192,6 +192,13 @@ public class MidnightControlsClient extends MidnightControls implements ClientMo // if (BINDING_RING.wasPressed()) { // client.setScreen(new RingScreen()); // } + if (client.world != null && MidnightControlsConfig.enableHints && !MidnightControlsConfig.autoSwitchMode && MidnightControlsConfig.controlsMode == ControlsMode.DEFAULT && MidnightControlsConfig.getController().isGamepad()) { + client.getToastManager().add(SystemToast.create(client, SystemToast.Type.PERIODIC_NOTIFICATION, Text.translatable("midnightcontrols.controller.tutorial.title"), + Text.translatable("midnightcontrols.controller.tutorial.description", Text.translatable("options.title"), Text.translatable("controls.title"), + Text.translatable("midnightcontrols.menu.title.controller")))); + MidnightControlsConfig.enableHints = false; + MidnightControlsConfig.save(); + } } public void onRender(MinecraftClient client) { this.input.onRender(client); diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java index e206e44..d884bdd 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java @@ -70,7 +70,9 @@ public class MidnightControlsConfig extends MidnightConfig { private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?"); @Entry(name = "Max analog values") public static double[] maxAnalogValues = new double[]{1, 1, 1, 1}; - @Entry public static boolean triggerFix = true; + @Entry(name = "Trigger button fix") public static boolean triggerFix = true; + @Entry(name = "Enable Hints") public static boolean enableHints = true; + @Entry(name = "Command Keybinds") public static List commandKeybinds = Lists.newArrayList(); /** * Loads the configuration diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java index 49c6abb..bf0d749 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java @@ -12,9 +12,7 @@ package eu.midnightdust.midnightcontrols.client; import com.google.common.collect.ImmutableSet; import dev.lambdaurora.spruceui.widget.AbstractSpruceWidget; import dev.lambdaurora.spruceui.widget.container.SpruceEntryListWidget; -import dev.lambdaurora.spruceui.widget.container.SpruceOptionListWidget; import eu.midnightdust.midnightcontrols.MidnightControls; -import eu.midnightdust.midnightcontrols.client.compat.EMICompat; import eu.midnightdust.midnightcontrols.client.compat.LibGuiCompat; import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat; import eu.midnightdust.midnightcontrols.client.compat.SodiumCompat; diff --git a/src/main/resources/assets/midnightcontrols/lang/de_de.json b/src/main/resources/assets/midnightcontrols/lang/de_de.json index 39622d0..07aaffc 100644 --- a/src/main/resources/assets/midnightcontrols/lang/de_de.json +++ b/src/main/resources/assets/midnightcontrols/lang/de_de.json @@ -68,6 +68,8 @@ "midnightcontrols.axis.right_x-": "Rechts X-", "midnightcontrols.axis.right_y-": "Rechts Y-", "midnightcontrols.button.unknown": "Unbekannt (%d)", + "midnightcontrols.controller.tutorial.title": "Spiele Minecraft mit Controller!", + "midnightcontrols.controller.tutorial.description": "Gehe zu %s -> %s -> %s", "midnightcontrols.controller.connected": "Controller %d verbunden.", "midnightcontrols.controller.disconnected": "Controller %d getrennt.", "midnightcontrols.controller.mappings.1": "Um die Controller-Mappings anzupassen, benutze %s", diff --git a/src/main/resources/assets/midnightcontrols/lang/en_us.json b/src/main/resources/assets/midnightcontrols/lang/en_us.json index b9ca512..1e96be5 100644 --- a/src/main/resources/assets/midnightcontrols/lang/en_us.json +++ b/src/main/resources/assets/midnightcontrols/lang/en_us.json @@ -80,6 +80,8 @@ "midnightcontrols.axis.right_x-": "Right X-", "midnightcontrols.axis.right_y-": "Right Y-", "midnightcontrols.button.unknown": "Unknown (%d)", + "midnightcontrols.controller.tutorial.title": "Play the game with a Controller!", + "midnightcontrols.controller.tutorial.description": "Go to %s -> %s -> %s", "midnightcontrols.controller.connected": "Controller %d connected.", "midnightcontrols.controller.disconnected": "Controller %d disconnected.", "midnightcontrols.controller.mappings.1": "To configure the controller mappings, please use %s", diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 2276825..7c2aca5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -13,6 +13,8 @@ "DioEgizio", "Ivanoks", "KiskaUWU", + "RaptaG", + "Madis0", "FlashyReese", "Hambaka", "joaoh1",