Remove portals from registry after deletion

Author: yitzy299

portals-api/src/main/java/net/quiltservertools/interdimensional/portals/CustomPortalApiRegistry.java

@@ -1,15 +1,11 @@
 package net.quiltservertools.interdimensional.portals;
 
 import net.minecraft.block.BlockState;
-import net.quiltservertools.interdimensional.portals.portal.PortalIgnitionSource;
 import net.quiltservertools.interdimensional.portals.portal.frame.PortalFrameTester;
-import net.quiltservertools.interdimensional.portals.util.ColorUtil;
 import net.quiltservertools.interdimensional.portals.util.PortalLink;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
-import net.minecraft.fluid.Fluids;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 
 import java.util.Collection;
 import java.util.concurrent.ConcurrentHashMap;
@@ -18,7 +14,7 @@
 public class CustomPortalApiRegistry {
     protected static ConcurrentHashMap<Block, PortalLink> portals = new ConcurrentHashMap<>();
 
-    private static final ConcurrentHashMap<Identifier, PortalFrameTester.PortalFrameTesterFactory> PortalFrameTesters = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<Identifier, PortalFrameTester.PortalFrameTesterFactory> PORTAL_FRAME_TESTERS = new ConcurrentHashMap<>();
 
     public static PortalLink getPortalLinkFromBase(Block baseBlock) {
         if (baseBlock == null) return null;
@@ -32,29 +28,30 @@ public static Collection<PortalLink> getAllPortalLinks() {
 
 
     public static void registerPortalFrameTester(Identifier frameTesterID, PortalFrameTester.PortalFrameTesterFactory createPortalFrameTester) {
-        PortalFrameTesters.put(frameTesterID, createPortalFrameTester);
+        PORTAL_FRAME_TESTERS.put(frameTesterID, createPortalFrameTester);
     }
 
     public static PortalFrameTester.PortalFrameTesterFactory getPortalFrameTester(Identifier frameTesterID) {
-        return PortalFrameTesters.getOrDefault(frameTesterID, null);
+        return PORTAL_FRAME_TESTERS.getOrDefault(frameTesterID, null);
     }
 
     public static void addPortal(Block frameBlock, PortalLink link) {
-        if (frameBlock == null) InterdimensionalPortals.logError("Frameblock is null");
-        if (link.getPortalBlock() == null) InterdimensionalPortals.logError("Portal block is null");
-        if (link.portalIgnitionSource == null) InterdimensionalPortals.logError("Portal ignition source is null");
-        if (link.dimID == null) InterdimensionalPortals.logError("Dimension is null");
         if (InterdimensionalPortals.dims.size() > 0 && !InterdimensionalPortals.dims.containsKey(link.dimID))
             InterdimensionalPortals.logError("Dimension not found");
         if (InterdimensionalPortals.getDefaultPortalBlock() == null)
-            InterdimensionalPortals.logError("Built in CustomPortalBlock is null");
+            InterdimensionalPortals.logError("Built in PortalBlock is null");
 
         if (portals.containsKey(frameBlock) || frameBlock.equals(Blocks.OBSIDIAN)) {
             InterdimensionalPortals.logError("A portal(or the nether portal) is already registered with a frame of: " + frameBlock);
         } else {
             portals.put(frameBlock, link);
         }
     }
+
+    public static boolean removePortal(Block frameBlock) {
+        return portals.remove(frameBlock) == null;
+    }
+
     public static boolean isRegisteredFrameBlock(BlockState state) {
         return portals.containsKey(state.getBlock());
     }

src/main/kotlin/net/quiltservertools/interdimensional/command/PortalCommand.kt

@@ -125,7 +125,7 @@ object PortalCommand : Command {
     }
 
     private fun remove(source: ServerCommandSource, name: String): Int {
-        PortalManager.portals.removeIf { it.name == name }
+        PortalManager.removePortal(name)
         source.sendFeedback("Removed portal $name".success(), false)
         return 1
     }

src/main/kotlin/net/quiltservertools/interdimensional/world/PortalManager.kt

@@ -6,6 +6,7 @@ import net.quiltservertools.interdimensional.portals.api.CustomPortalBuilder
 import net.quiltservertools.interdimensional.portals.portal.PortalIgnitionSource
 import net.minecraft.util.Identifier
 import net.minecraft.util.registry.Registry
+import net.quiltservertools.interdimensional.portals.CustomPortalApiRegistry
 import net.quiltservertools.interdimensional.portals.portal.PortalIgnitionSource.ItemUseSource
 
 object PortalManager {
@@ -95,4 +96,10 @@ object PortalManager {
         builder.registerPortal()
         portals.add(portal)
     }
+
+    fun removePortal(name: String) {
+        val portal = this.portals.first { it.name == name }
+        this.portals.remove(portal)
+        CustomPortalApiRegistry.removePortal(portal.frameBlock)
+    }
 }