Fix handling of old forge-specific blockstate

Author: mikeprimm

core/src/main/java/org/dynmapblockscan/core/blockstate/ForgeVariantV1.java

@@ -224,7 +224,7 @@ public Variant generateVanilla(Map<String, BlockModel> models) {
             // Add model to model table
             models.put(modid, bm);
             // Switch our model reference to corresponding blockstate level model reference
-            mod = "dynmapblockscan:forgemodel" + idx;
+            mod = "dynmapblockscan:block/forgemodel" + idx;
         }
         // Now build vanilla variant
         Variant var = new Variant(mod, this.x, this.y, this.z, this.uvlock, this.weight);

forge-1.12.2/src/main/java/org/dynmapblockscan/DynmapBlockScanMod.java

@@ -1,6 +1,8 @@
 package org.dynmapblockscan;
 
 import java.io.File;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import net.minecraft.server.MinecraftServer;
@@ -33,6 +35,8 @@ public class DynmapBlockScanMod
     public static DynmapBlockScanPlugin plugin;
     public static File jarfile;
     public static boolean verboselogging = false;
+    public static String[] excludeModules = { "minecraft" };
+    public static String[] excludeBlockNames = { };
 
     public DynmapBlockScanMod() {
     }
@@ -47,6 +51,10 @@ public void preInit(FMLPreInitializationEvent event)
             cfg.load();
 
            verboselogging = cfg.get("Settings",  "verboselog", false).getBoolean(false);
+           
+           excludeModules = cfg.get("Settings", "exclude_modules", new String[] { "minecraft" }).getStringList();
+           excludeBlockNames = cfg.get("Settings", "exclude_blocknames", new String[0]).getStringList();
+
         }
         finally
         {
@@ -70,6 +78,8 @@ public void serverStarting(FMLServerStartingEvent event) {
         server = event.getServer();
         if(plugin == null)
             plugin = proxy.startServer(server);
+        plugin.setDisabledModules(Arrays.asList(excludeModules));
+        plugin.setDisabledBlockNames(Arrays.asList(excludeBlockNames));
         plugin.serverStarting();
     }