Moved Client code to Client.java

Moved Config screen code to ConfigMenu.java Made a correct check for if the mod is run on a server or a client to not crash server due to invalid DIST Removed unused imports Updated to minor 3.2
2023-07-15 12:49:55 +02:00
parent cb96e52767
commit e86477003b
6 changed files with 507 additions and 480 deletions
--- a/common/src/main/java/me/zacharias/speedometer/ConfigMenu.java
+++ b/common/src/main/java/me/zacharias/speedometer/ConfigMenu.java
@@ -0,0 +1,140 @@
+package me.zacharias.speedometer;
+
+import me.shedaniel.clothconfig2.api.ConfigBuilder;
+import me.shedaniel.clothconfig2.api.ConfigCategory;
+import me.shedaniel.clothconfig2.api.ConfigEntryBuilder;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+
+import java.util.Optional;
+
+public class ConfigMenu {
+  public static ConfigBuilder getConfig(Screen parent) {
+    ConfigBuilder builder = ConfigBuilder.create()
+        .setParentScreen(parent)
+        .setTitle(Component.translatable("speedometer.config.name"));
+
+    ConfigCategory category = builder.getOrCreateCategory(Component.translatable("speedometer.config.category.name"));
+
+    ConfigEntryBuilder entryBuilder = builder.entryBuilder();
+
+    category.addEntry(entryBuilder.startEnumSelector(Component.translatable("speedometer.config.speed"), SpeedTypes.class, me.zacharias.speedometer.Config.getSpeedType())
+        .setEnumNameProvider(SpeedTypes::getName)
+        .setSaveConsumer(me.zacharias.speedometer.Config::setSpeedType)
+        .build()
+    );
+
+    category.addEntry(entryBuilder.startColorField(Component.translatable("speedometer.config.color"), me.zacharias.speedometer.Config.getColor())
+        .setSaveConsumer2(me.zacharias.speedometer.Config::setColor)
+        .build()
+    );
+
+    category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.knot"), me.zacharias.speedometer.Config.getUseKnot())
+        .setSaveConsumer(me.zacharias.speedometer.Config::setUseKnot)
+        .setYesNoTextSupplier(useKnot -> Component.translatable("speedometer.useKnot."+useKnot))
+        .build()
+    );
+
+    category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.visualSpeedometer"), me.zacharias.speedometer.Config.getVisualSpeedometer())
+        .setSaveConsumer(me.zacharias.speedometer.Config::setVisualSpeedometer)
+        .setYesNoTextSupplier((visualSpeedometer -> Component.translatable("speedometer.visualSpeedometer."+visualSpeedometer)))
+        .build()
+    );
+
+    // Regex
+
+    String xRegex = "W*w*S*s*\\+*-*\\**/*[0-9]*";
+    String yRegex = "H*h*S*s*\\+*-*\\**/*[0-9]*";
+
+    // Text Placement
+
+    category.addEntry(entryBuilder.startStringDropdownMenu(Component.translatable("speedometer.config.xPosition.text"), Config.getXPositionText())
+        .setSaveConsumer(Config::setXPositionText)
+        .setErrorSupplier(xPosition -> {
+          if(xPosition.matches(xRegex)){
+            return Optional.empty();
+          }else{
+            return Optional.of(Component.translatable("speedometer.invalid"));
+          }
+        })
+        .setTooltip(
+            Component.translatable("speedometer.config.tooltip.xPosition.line1"),
+            Component.translatable("speedometer.config.tooltip.xPosition.line2"),
+            Component.translatable("speedometer.config.tooltip.xPosition.line3")
+        )
+        .build()
+    );
+
+    category.addEntry(entryBuilder.startStringDropdownMenu(Component.translatable("speedometer.config.yPosition.text"), Config.getYPositionText())
+        .setSaveConsumer(Config::setYPositionText)
+        .setErrorSupplier(yPosition -> {
+          if(yPosition.matches(yRegex)){
+            return Optional.empty();
+          }else{
+            return Optional.of(Component.translatable("speedometer.invalid"));
+          }
+        })
+        .setTooltip(
+            Component.translatable("speedometer.config.tooltip.yPosition.line1"),
+            Component.translatable("speedometer.config.tooltip.yPosition.line2"),
+            Component.translatable("speedometer.config.tooltip.yPosition.line3")
+        )
+        .build()
+    );
+
+    // Visual location
+
+    category.addEntry(entryBuilder.startStringDropdownMenu(Component.translatable("speedometer.config.xPosition.visual"), Config.getXPositionVisual())
+        .setSaveConsumer(Config::setXPositionVisual)
+        .setErrorSupplier(xPosition -> {
+          if(xPosition.matches(xRegex)){
+            return Optional.empty();
+          }else{
+            return Optional.of(Component.translatable("speedometer.invalid"));
+          }
+        })
+        .setTooltip(
+            Component.translatable("speedometer.config.tooltip.xPosition.line1"),
+            Component.translatable("speedometer.config.tooltip.xPosition.line2"),
+            Component.translatable("speedometer.config.tooltip.xPosition.line3")
+        )
+        .build()
+    );
+
+    category.addEntry(entryBuilder.startStringDropdownMenu(Component.translatable("speedometer.config.yPosition.visual"), Config.getYPositionVisual())
+        .setSaveConsumer(Config::setYPositionVisual)
+        .setErrorSupplier(yPosition -> {
+          if(yPosition.matches(yRegex)){
+            return Optional.empty();
+          }else{
+            return Optional.of(Component.translatable("speedometer.invalid"));
+          }
+        })
+        .setTooltip(
+            Component.translatable("speedometer.config.tooltip.yPosition.line1"),
+            Component.translatable("speedometer.config.tooltip.yPosition.line2"),
+            Component.translatable("speedometer.config.tooltip.yPosition.line3")
+        )
+        .build()
+    );
+
+    // Size of visual image
+
+    category.addEntry(entryBuilder.startIntField(Component.translatable("speedometer.config.imageSize"), Config.getImageSize())
+        .setSaveConsumer(Config::setImageSize)
+        .setTooltip(Component.translatable("speedometer.config.tooltip.imageSize"))
+        .build()
+    );
+
+    category.addEntry(entryBuilder.startBooleanToggle(Component.translatable("speedometer.config.debug"),Config.isDebug())
+        .setSaveConsumer(Config::setDebug)
+        .setYesNoTextSupplier(isDebug -> Component.translatable("speedometer.debug."+isDebug))
+        .setTooltip(Component.translatable("speedometer.config.tooltip.debug"))
+        .build()
+    );
+
+    builder.setSavingRunnable(me.zacharias.speedometer.Config::save);
+
+    return builder;
+  }
+}