Handle invalid game portals in non-lossy way

NucleoidMC · Dec 6, 2024 · fd42b12 · fd42b12
1 parent fc6f449
commit fd42b12
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/src/main/java/xyz/nucleoid/plasmid/impl/portal/GamePortalManager.java b/src/main/java/xyz/nucleoid/plasmid/impl/portal/GamePortalManager.java
@@ -3,6 +3,7 @@
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 import com.mojang.serialization.JsonOps;
+import com.mojang.serialization.MapCodec;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.registry.DynamicRegistryManager;
 import net.minecraft.resource.ResourceManager;
@@ -12,6 +13,8 @@
 import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.plasmid.impl.Plasmid;
 import xyz.nucleoid.plasmid.api.util.TinyRegistry;
+import xyz.nucleoid.plasmid.impl.PlasmidConfig;
+import xyz.nucleoid.plasmid.impl.portal.game.InvalidGamePortalBackend;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -86,7 +89,12 @@ private Map<Identifier, GamePortalConfig> loadConfigs(DynamicRegistryManager reg
                     var json = JsonParser.parseReader(reader);
                     var identifier = identifierFromPath(path);
                     GamePortalConfig.CODEC.parse(ops, json)
-                            .resultOrPartial(error -> Plasmid.LOGGER.error("Failed to parse game portal at {}: {}", path, error))
+                            .resultOrPartial(error -> {
+                                Plasmid.LOGGER.error("Failed to parse game portal at {}: {}", path, error);
+                                if (PlasmidConfig.get().ignoreInvalidGames()) {
+                                    configs.put(identifier, InvalidGamePortalBackend.CONFIG);
+                                }
+                            })
                             .ifPresent(config -> configs.put(identifier, config));
                 }
             } catch (IOException e) {

diff --git a/src/main/java/xyz/nucleoid/plasmid/impl/portal/game/InvalidGamePortalBackend.java b/src/main/java/xyz/nucleoid/plasmid/impl/portal/game/InvalidGamePortalBackend.java
@@ -0,0 +1,39 @@
+package xyz.nucleoid.plasmid.impl.portal.game;
+
+import com.mojang.serialization.MapCodec;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
+import xyz.nucleoid.plasmid.api.game.config.CustomValuesConfig;
+import xyz.nucleoid.plasmid.impl.portal.GamePortalBackend;
+import xyz.nucleoid.plasmid.impl.portal.GamePortalConfig;
+
+public record InvalidGamePortalBackend(Identifier identifier) implements GamePortalBackend {
+    public static final GamePortalConfig CONFIG = new GamePortalConfig() {
+        @Override
+        public GamePortalBackend createBackend(MinecraftServer server, Identifier id) {
+            return new InvalidGamePortalBackend(id);
+        }
+
+        @Override
+        public CustomValuesConfig custom() {
+            return CustomValuesConfig.empty();
+        }
+
+        @Override
+        public MapCodec<? extends GamePortalConfig> codec() {
+            return MapCodec.unit(this);
+        }
+    };
+
+    @Override
+    public Text getName() {
+        return Text.literal("Invalid portal'" + this.identifier + "'");
+    }
+
+    @Override
+    public void applyTo(ServerPlayerEntity player, boolean alt) {
+
+    }
+}
diff --git a/src/main/java/xyz/nucleoid/plasmid/mixin/game/portal/EntityMixin.java b/src/main/java/xyz/nucleoid/plasmid/mixin/game/portal/EntityMixin.java
@@ -123,8 +123,9 @@ private void removeHologram() {
     @Inject(method = "tick", at = @At("HEAD"))
     private void onTick(CallbackInfo ci) {
         if (this.loadedPortalId != null) {
-            this.tryConnectTo(this.loadedPortalId);
-            this.loadedPortalId = null;
+            if (this.tryConnectTo(this.loadedPortalId)) {
+                this.loadedPortalId = null;
+            }
         }
     }