From c39cb2d3e7de77077fb8864769bc0ed13fd8aae3 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sun, 16 Aug 2020 00:05:56 -0500
Subject: [PATCH] Add one-sided tweak to hide mod from client before login

---
 .../src/main/java/org/dynmap/forge_1_13_2/DynmapMod.java   | 6 ++++++
 .../src/main/java/org/dynmap/forge_1_14_4/DynmapMod.java   | 6 ++++++
 .../src/main/java/org/dynmap/forge_1_15_2/DynmapMod.java   | 7 +++++++
 .../src/main/java/org/dynmap/forge_1_16_1/DynmapMod.java   | 6 ++++++
 .../src/main/java/org/dynmap/forge_1_16_2/DynmapMod.java   | 6 ++++++
 5 files changed, 31 insertions(+)

diff --git a/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapMod.java b/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapMod.java
index 6acd451a..646a4882 100644
--- a/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapMod.java
+++ b/forge-1.13.2/src/main/java/org/dynmap/forge_1_13_2/DynmapMod.java
@@ -2,6 +2,7 @@ package org.dynmap.forge_1_13_2;
 
 import java.io.File;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.dynmap.DynmapCommonAPI;
 import org.dynmap.DynmapCommonAPIListener;
 import org.dynmap.Log;
@@ -12,13 +13,16 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ExtensionPoint;
 import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.network.FMLNetworkConstants;
 
 @Mod("dynmap")
 public class DynmapMod
@@ -66,6 +70,8 @@ public class DynmapMod
 
         MinecraftForge.EVENT_BUS.register(this);
 
+        ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+
         Log.setLogger(new OurLog());      
         org.dynmap.modsupport.ModSupportImpl.init();
     }
diff --git a/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapMod.java b/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapMod.java
index 63c5eb7c..23022875 100644
--- a/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapMod.java
+++ b/forge-1.14.4/src/main/java/org/dynmap/forge_1_14_4/DynmapMod.java
@@ -2,6 +2,7 @@ package org.dynmap.forge_1_14_4;
 
 import java.io.File;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.dynmap.DynmapCommonAPI;
 import org.dynmap.DynmapCommonAPIListener;
 import org.dynmap.Log;
@@ -12,13 +13,16 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ExtensionPoint;
 import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.network.FMLNetworkConstants;
 
 @Mod("dynmap")
 public class DynmapMod
@@ -66,6 +70,8 @@ public class DynmapMod
 
         MinecraftForge.EVENT_BUS.register(this);
 
+        ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+
         Log.setLogger(new OurLog());      
         org.dynmap.modsupport.ModSupportImpl.init();
     }
diff --git a/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapMod.java b/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapMod.java
index a7d5bf54..057e5b58 100644
--- a/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapMod.java
+++ b/forge-1.15.2/src/main/java/org/dynmap/forge_1_15_2/DynmapMod.java
@@ -2,23 +2,28 @@ package org.dynmap.forge_1_15_2;
 
 import java.io.File;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.dynmap.DynmapCommonAPI;
 import org.dynmap.DynmapCommonAPIListener;
 import org.dynmap.Log;
 import org.dynmap.forge_1_15_2.DynmapPlugin.OurLog;
 
+
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ExtensionPoint;
 import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.network.FMLNetworkConstants;
 
 @Mod("dynmap")
 public class DynmapMod
@@ -66,6 +71,8 @@ public class DynmapMod
 
         MinecraftForge.EVENT_BUS.register(this);
 
+        ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+        
         Log.setLogger(new OurLog());      
         org.dynmap.modsupport.ModSupportImpl.init();
     }
diff --git a/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapMod.java b/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapMod.java
index 29b43eb3..735c0b23 100644
--- a/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapMod.java
+++ b/forge-1.16.1/src/main/java/org/dynmap/forge_1_16_1/DynmapMod.java
@@ -2,6 +2,7 @@ package org.dynmap.forge_1_16_1;
 
 import java.io.File;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.dynmap.DynmapCommonAPI;
 import org.dynmap.DynmapCommonAPIListener;
 import org.dynmap.Log;
@@ -12,13 +13,16 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ExtensionPoint;
 import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.network.FMLNetworkConstants;
 
 @Mod("dynmap")
 public class DynmapMod
@@ -66,6 +70,8 @@ public class DynmapMod
 
         MinecraftForge.EVENT_BUS.register(this);
 
+        ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+
         Log.setLogger(new OurLog());      
         org.dynmap.modsupport.ModSupportImpl.init();
     }
diff --git a/forge-1.16.2/src/main/java/org/dynmap/forge_1_16_2/DynmapMod.java b/forge-1.16.2/src/main/java/org/dynmap/forge_1_16_2/DynmapMod.java
index 5a92e453..b4db809c 100644
--- a/forge-1.16.2/src/main/java/org/dynmap/forge_1_16_2/DynmapMod.java
+++ b/forge-1.16.2/src/main/java/org/dynmap/forge_1_16_2/DynmapMod.java
@@ -2,6 +2,7 @@ package org.dynmap.forge_1_16_2;
 
 import java.io.File;
 
+import org.apache.commons.lang3.tuple.Pair;
 import org.dynmap.DynmapCommonAPI;
 import org.dynmap.DynmapCommonAPIListener;
 import org.dynmap.Log;
@@ -12,13 +13,16 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ExtensionPoint;
 import net.minecraftforge.fml.ModList;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.network.FMLNetworkConstants;
 
 @Mod("dynmap")
 public class DynmapMod
@@ -66,6 +70,8 @@ public class DynmapMod
 
         MinecraftForge.EVENT_BUS.register(this);
 
+        ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
+
         Log.setLogger(new OurLog());      
         org.dynmap.modsupport.ModSupportImpl.init();
     }