Merge remote-tracking branch 'upstream'

Author: cev-api

src/main/java/dev/xpple/seedmapper/SeedMapper.java

@@ -3,6 +3,7 @@
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.brigadier.CommandDispatcher;
 import dev.xpple.betterconfig.api.ModConfigBuilder;
+import dev.xpple.seedmapper.command.arguments.DurationArgument;
 import dev.xpple.seedmapper.command.arguments.MapFeatureArgument;
 import dev.xpple.seedmapper.command.arguments.SeedIdentifierArgument;
 import dev.xpple.seedmapper.command.arguments.SeedResolutionArgument;
@@ -19,6 +20,7 @@
 import dev.xpple.seedmapper.command.commands.SourceCommand;
 import dev.xpple.seedmapper.command.commands.StopTaskCommand;
 import dev.xpple.seedmapper.config.Configs;
+import dev.xpple.seedmapper.config.DurationAdapter;
 import dev.xpple.seedmapper.config.MapFeatureAdapter;
 import dev.xpple.seedmapper.config.SeedIdentifierAdapter;
 import dev.xpple.seedmapper.config.SeedResolutionAdapter;
@@ -41,11 +43,13 @@
 import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.commands.CommandBuildContext;
+import net.minecraft.resources.Identifier;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.time.Duration;
 
 public class SeedMapper implements ClientModInitializer {
 
@@ -73,6 +77,7 @@ public void onInitializeClient() {
             .registerType(SeedIdentifier.class, new SeedIdentifierAdapter(), SeedIdentifierArgument::seedIdentifier)
             .registerType(SeedResolutionArgument.SeedResolution.class, new SeedResolutionAdapter(), SeedResolutionArgument::seedResolution)
             .registerTypeHierarchy(MapFeature.class, new MapFeatureAdapter(), MapFeatureArgument::mapFeature)
+            .registerType(Duration.class, new DurationAdapter(), DurationArgument::duration)
             .registerGlobalChangeHook(event -> {
                 if (event.config().equals("DevMode")) {
                     try {
@@ -91,8 +96,9 @@ public void onInitializeClient() {
 
         SeedDatabaseHelper.fetchSeeds();
 
-        KeyMapping seedMapKeyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.seedMap", InputConstants.KEY_M, KeyMapping.Category.GAMEPLAY));
-        KeyMapping minimapKeyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.seedMapMinimap", InputConstants.KEY_COMMA, KeyMapping.Category.GAMEPLAY));
+        KeyMapping.Category category = KeyMapping.Category.register(Identifier.fromNamespaceAndPath(MOD_ID, MOD_ID));
+        KeyMapping seedMapKeyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.seedMap", InputConstants.KEY_M, category));
+        KeyMapping minimapKeyMapping = KeyBindingHelper.registerKeyBinding(new KeyMapping("key.minimap", InputConstants.KEY_COMMA, category));
         ClientTickEvents.END_CLIENT_TICK.register(minecraft -> {
             while (seedMapKeyMapping.consumeClick()) {
                 minecraft.player.connection.sendCommand("sm:seedmap");

src/main/java/dev/xpple/seedmapper/command/arguments/DurationArgument.java

@@ -0,0 +1,104 @@
+package dev.xpple.seedmapper.command.arguments;
+
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import dev.xpple.seedmapper.command.CustomClientCommandSource;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
+import it.unimi.dsi.fastutil.objects.Object2IntMaps;
+import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
+import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.network.chat.Component;
+import net.minecraft.util.TimeUtil;
+import net.minecraft.util.Util;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Consumer;
+
+public class DurationArgument implements ArgumentType<Duration> {
+
+    private static final Collection<String> EXAMPLES = List.of("5s", "10m", "3h");
+
+    private static final SimpleCommandExceptionType INVALID_UNIT_EXCEPTION = new SimpleCommandExceptionType(Component.translatable("argument.time.invalid_unit"));
+
+    public static DurationArgument duration() {
+        return new DurationArgument();
+    }
+
+    public static DurationArgument getDuration(CommandContext<CustomClientCommandSource> context, String name) {
+        return context.getArgument(name, DurationArgument.class);
+    }
+
+    @Override
+    public Duration parse(StringReader reader) throws CommandSyntaxException {
+        return new Parser(reader).parse();
+    }
+
+    @Override
+    public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
+        StringReader reader = new StringReader(builder.getInput());
+        reader.setCursor(builder.getStart());
+
+        Parser parser = new Parser(reader);
+
+        try {
+            parser.parse();
+        } catch (CommandSyntaxException ignored) {
+        }
+
+        if (parser.suggester != null) {
+            parser.suggester.accept(builder);
+        }
+
+        return builder.buildFuture();
+    }
+
+    @Override
+    public Collection<String> getExamples() {
+        return EXAMPLES;
+    }
+
+    private static final class Parser {
+
+        private static final Object2IntMap<String> UNITS = Util.make(() -> {
+            Object2IntMap<String> temp = new Object2IntOpenHashMap<>();
+
+            temp.put("s", 1);
+            temp.put("m", TimeUtil.SECONDS_PER_MINUTE);
+            temp.put("h", (int) TimeUtil.SECONDS_PER_HOUR);
+
+            return Object2IntMaps.unmodifiable(temp);
+        });
+
+        private final StringReader reader;
+        private Consumer<SuggestionsBuilder> suggester;
+
+        private Parser(StringReader reader) {
+            this.reader = reader;
+        }
+
+        private Duration parse() throws CommandSyntaxException {
+            float durationRaw = reader.readFloat();
+            int cursor = reader.getCursor();
+            suggester = builder -> {
+                SuggestionsBuilder newBuilder = builder.createOffset(cursor);
+                SharedSuggestionProvider.suggest(UNITS.keySet(), newBuilder);
+                builder.add(newBuilder);
+            };
+            String string = reader.readUnquotedString();
+            int unit = UNITS.getOrDefault(string, -1);
+            if (unit == -1) {
+                throw INVALID_UNIT_EXCEPTION.create();
+            }
+            int durationSeconds = Math.round(durationRaw * unit);
+            return Duration.ofSeconds(durationSeconds);
+        }
+    }
+}

src/main/java/dev/xpple/seedmapper/config/Configs.java

@@ -6,6 +6,7 @@
 import dev.xpple.betterconfig.api.ModConfig;
 import dev.xpple.seedmapper.SeedMapper;
 import dev.xpple.seedmapper.command.arguments.SeedResolutionArgument;
+import dev.xpple.seedmapper.render.RenderManager;
 import dev.xpple.seedmapper.seedmap.MapFeature;
 import dev.xpple.seedmapper.seedmap.SeedMapMinimapManager;
 import dev.xpple.seedmapper.seedmap.SeedMapScreen;
@@ -19,6 +20,7 @@
 import dev.xpple.seedmapper.render.esp.EspStyle;
 
 import java.net.SocketAddress;
+import java.time.Duration;
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
@@ -265,7 +267,7 @@ public static void applyWaypointCompassOverlaySetting() {
         return toggledFeatures;
     });
 
-    public static Component listToggledFeatures() {
+    private static Component listToggledFeatures() {
         return join(Component.literal(", "), ToggledFeatures.stream()
             .map(MapFeature::getName)
             .map(Component::literal));
@@ -274,7 +276,7 @@ public static Component listToggledFeatures() {
     @Config(comment = "getDevModeComment")
     public static boolean DevMode = false;
 
-    public static Component getDevModeComment() {
+    private static Component getDevModeComment() {
         return Component.translatable("config.devMode.comment");
     }
 
@@ -376,4 +378,9 @@ private static boolean applyWorldPresetInternal(String presetId) {
         notifySeedConsumers(generatorFlags);
         return true;
     }
+    @Config(onChange = "updateHighlightDuration")
+    public static Duration HighlightDuration = Duration.ofMinutes(5);
+    private static void updateHighlightDuration(Duration oldValue, Duration newValue) {
+        RenderManager.rebuildLineSet();
+    }
 }

src/main/java/dev/xpple/seedmapper/config/DurationAdapter.java

@@ -0,0 +1,20 @@
+package dev.xpple.seedmapper.config;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+
+import java.io.IOException;
+import java.time.Duration;
+
+public class DurationAdapter extends TypeAdapter<Duration> {
+    @Override
+    public void write(JsonWriter writer, Duration duration) throws IOException {
+        writer.value(duration.toString());
+    }
+
+    @Override
+    public Duration read(JsonReader reader) throws IOException {
+        return Duration.parse(reader.nextString());
+    }
+}

src/main/java/dev/xpple/seedmapper/render/RenderManager.java

@@ -46,6 +46,17 @@ private RenderManager() {
     private static final byte AXIS_X = 0;
     private static final byte AXIS_Y = 1;
     private static final byte AXIS_Z = 2;
+    private static Set<Line> lines = Collections.emptySet();
+    static {
+        rebuildLineSet();
+    }
+
+    public static void rebuildLineSet() {
+        Set<Line> temp = lines;
+        lines = Collections.newSetFromMap(CacheBuilder.newBuilder().expireAfterWrite(Configs.HighlightDuration).<Line, Boolean>build().asMap());
+        lines.addAll(temp);
+        temp.clear();
+    }
 
     public static void drawBoxes(Collection<BlockPos> posBatch, EspStyle style, int fallbackColor) {
         if (posBatch.isEmpty()) {

src/main/resources/assets/seedmapper/lang/en_us.json

@@ -1,5 +1,5 @@
 {
-  "commands.exceptions.noSeedAvailable": "No seed available, set it using the /cconfig command.",
+  "commands.exceptions.noSeedAvailable": "No seed available, set it using the /sm:config command.",
   "commands.exceptions.alreadyBusyLocating": "Already busy locating something [%s].",
   "commands.exceptions.alreadyBusyLocating.stopTask": "stop task",
   "commands.exceptions.alreadyBusyLocating.clickToStop": "Click to stop the task",
@@ -100,6 +100,7 @@
   "config.manualWaypointCompassOverlay.comment": "Set the waypoint compass overlay to be manually toggled instead of automatic.",
   "config.worldBorder.comment": "Limits the seed map to a square world border radius in blocks. Use 0 to disable.",
 
+  "key.category.seedmapper.seedmapper": "SeedMapper",
   "key.seedMap": "Seed map",
   "key.minimap": "Seed minimap",
 

src/main/resources/assets/seedmapper/lang/zh_cn.json

@@ -1,5 +1,5 @@
 {
-  "commands.exceptions.noSeedAvailable": "无可用种子，请使用 /cconfig 命令设置。",
+  "commands.exceptions.noSeedAvailable": "无可用种子，请使用 /sm:config 命令设置。",
   "commands.exceptions.alreadyBusyLocating": "已在定位其他目标 [%s]。",
   "commands.exceptions.alreadyBusyLocating.stopTask": "停止任务",
   "commands.exceptions.alreadyBusyLocating.clickToStop": "点击停止任务",