Merge remote-tracking branch 'refs/remotes/origin/1.20.1-fabric' into…

… 1.19.2-fabric # Conflicts: # src/main/java/me/melontini/handytests/mixin/client/MinecraftClientMixin.java
constellation-mc · Jun 1, 2024 · 0b99846 · 0b99846
2 parents 35bab63 + 11f1c88
commit 0b99846
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/src/main/java/me/melontini/handytests/mixin/client/MinecraftClientMixin.java b/src/main/java/me/melontini/handytests/mixin/client/MinecraftClientMixin.java
@@ -1,6 +1,8 @@
 package me.melontini.handytests.mixin.client;
 
 import me.melontini.handytests.util.Utils;
+import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.SharedConstants;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.TitleScreen;
 import net.minecraft.resource.DataPackSettings;
@@ -13,28 +15,40 @@
 import net.minecraft.world.gen.WorldPresets;
 import net.minecraft.world.level.LevelInfo;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.regex.Pattern;
+
 @Mixin(value = MinecraftClient.class, priority = 1200)
 public class MinecraftClientMixin {
+
+    @Unique
+    private static final Pattern RESERVED_WINDOWS_NAMES = Pattern.compile(".*\\.|(?:COM|CLOCK\\$|CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(?:\\..*)?", 2);
+
     @Inject(method = "method_29338", at = @At("TAIL"), require = 0)
     private void handy$init(CallbackInfo ci) {
         if (!Utils.ENABLED) return;
 
         MinecraftClient.getInstance().send(() -> {
             try {
                 MinecraftClient client = MinecraftClient.getInstance();
+                String levelName = "handy_test_" + FabricLoader.getInstance().getModContainer("minecraft").orElseThrow().getMetadata().getVersion().getFriendlyString();
+
+                for (char c : SharedConstants.INVALID_CHARS_LEVEL_NAME) levelName = levelName.replace(c, '_');
+                levelName = levelName.replaceAll("[./\"]", "_");
+                if (RESERVED_WINDOWS_NAMES.matcher(levelName).matches()) levelName = "_" + levelName + "_";
 
-                if (!client.getLevelStorage().levelExists("handy_tests_world")) {
+                if (!client.getLevelStorage().levelExists(levelName)) {
                     var imm = DynamicRegistryManager.createAndLoad().toImmutable();
                     var opt = imm.get(Registry.WORLD_PRESET_KEY).entryOf(WorldPresets.FLAT).value().createGeneratorOptions(0L, true, false);
-                    client.createIntegratedServerLoader().createAndStart("handy_tests_world",
-                            new LevelInfo("handy_tests_world", GameMode.CREATIVE, false, Difficulty.PEACEFUL, true,
+                    client.createIntegratedServerLoader().createAndStart(levelName,
+                            new LevelInfo(levelName, GameMode.CREATIVE, false, Difficulty.PEACEFUL, true,
                                     new GameRules(), DataPackSettings.SAFE_MODE), imm, opt);
                 } else {
-                    client.createIntegratedServerLoader().start(new TitleScreen(), "handy_tests_world");
+                    client.createIntegratedServerLoader().start(new TitleScreen(), levelName);
                 }
             } catch (Throwable t) {
                 CrashReport report = CrashReport.create(t, "Setting tests world");