More cleanup

Author: mikeprimm

core/src/main/java/org/dynmapblockscan/core/AbstractBlockScanBase.java

@@ -42,9 +42,6 @@
 import org.dynmapblockscan.core.model.BlockElement;
 import org.dynmapblockscan.core.model.BlockFace;
 import org.dynmapblockscan.core.model.BlockModel;
-import org.dynmapblockscan.core.statehandlers.IStateHandler;
-import org.dynmapblockscan.core.statehandlers.IStateHandlerFactory;
-import org.dynmapblockscan.core.statehandlers.SimpleMetadataStateHandler;
 import org.dynmapblockscan.core.statehandlers.StateContainer;
 import org.dynmapblockscan.core.statehandlers.StateContainer.StateRec;
 import org.dynmapblockscan.core.statehandlers.StateContainer.WellKnownBlockClasses;
@@ -65,15 +62,10 @@ public abstract class AbstractBlockScanBase {
 
     //private Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
-    protected IStateHandlerFactory[] state_handler = {
-        new SimpleMetadataStateHandler(false)
-    };
-
     public static class BlockRecord {
     	public StateContainer sc;
     	public Map<StateRec, List<VariantList>> varList;	// Model references for block
     	public Set<String> renderProps;	// Set of render properties
-    	public IStateHandler handler;		// Best handler
     }
 
     protected static class PathElement {
@@ -832,15 +824,11 @@ protected void resolveAllElements(Map<String, BlockRecord> blockRecords, Map<Str
                     }
                     // If single simple full cube
                     if ((elems.size() == 1) && (elems.get(0).isSimpleBlock())) {
-                        if (br.handler != null) {
-                            //logger.info(String.format("%s: %s is simple block with %s map",  blkname, var.getKey(), br.handler.getName()));
-                            registerSimpleDynmapCubes(blkname, var.getKey(), elems.get(0), br.sc.getBlockType());
-                        }
+                        //logger.info(String.format("%s: %s is simple block with %s map",  blkname, var.getKey(), br.handler.getName()));
+                        registerSimpleDynmapCubes(blkname, var.getKey(), elems.get(0), br.sc.getBlockType());
                     }
                     else {
-                        if (br.handler != null) {
-                        	registerModelListModel(blkname, var.getKey(), elems, br.sc.getBlockType());
-                        }
+                    	registerModelListModel(blkname, var.getKey(), elems, br.sc.getBlockType());
                     }
         		}
         	}

forge-1.14.4/src/main/java/org/dynmapblockscan/forge_1_14_4/DynmapBlockScanPlugin.java

@@ -158,17 +158,6 @@ else if (uses_nonmodel) {
         	else {
         	    br.varList = Collections.emptyMap();
         	}
-            // Check for matching handler
-            br.handler = null;
-            for (IStateHandlerFactory f : state_handler) {
-              	br.handler = f.canHandleBlockState(br.sc);
-                if (br.handler != null) {
-                    break;
-                }
-            }
-            if (br.handler == null) {
-                logger.info(rl + ":  NO MATCHING HANDLER");
-            }
             blockRecords.put(rl.toString(), br);
         }
 

forge-1.15.2/src/main/java/org/dynmapblockscan/forge_1_15_2/DynmapBlockScanPlugin.java

@@ -158,17 +158,6 @@ else if (uses_nonmodel) {
         	else {
         	    br.varList = Collections.emptyMap();
         	}
-            // Check for matching handler
-            br.handler = null;
-            for (IStateHandlerFactory f : state_handler) {
-              	br.handler = f.canHandleBlockState(br.sc);
-                if (br.handler != null) {
-                    break;
-                }
-            }
-            if (br.handler == null) {
-                logger.info(rl + ":  NO MATCHING HANDLER");
-            }
             blockRecords.put(rl.toString(), br);
         }
 

forge-1.16.5/src/main/java/org/dynmapblockscan/forge_1_16_5/DynmapBlockScanPlugin.java

@@ -162,17 +162,6 @@ else if (uses_nonmodel) {
         	else {
         	    br.varList = Collections.emptyMap();
         	}
-            // Check for matching handler
-            br.handler = null;
-            for (IStateHandlerFactory f : state_handler) {
-              	br.handler = f.canHandleBlockState(br.sc);
-                if (br.handler != null) {
-                    break;
-                }
-            }
-            if (br.handler == null) {
-                logger.info(rl + ":  NO MATCHING HANDLER");
-            }
             blockRecords.put(rl.toString(), br);
         }
 

forge-1.17.1/src/main/java/org/dynmapblockscan/forge_1_17_1/DynmapBlockScanPlugin.java

@@ -164,17 +164,6 @@ else if (uses_nonmodel) {
         	else {
         	    br.varList = Collections.emptyMap();
         	}
-            // Check for matching handler
-            br.handler = null;
-            for (IStateHandlerFactory f : state_handler) {
-              	br.handler = f.canHandleBlockState(br.sc);
-                if (br.handler != null) {
-                    break;
-                }
-            }
-            if (br.handler == null) {
-                logger.info(rl + ":  NO MATCHING HANDLER");
-            }
             blockRecords.put(rl.toString(), br);
         }
 

forge-1.18/src/main/java/org/dynmapblockscan/forge_1_18/DynmapBlockScanPlugin.java

@@ -1,6 +1,5 @@
 package org.dynmapblockscan.forge_1_18;
 
-
 import java.io.File;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -20,7 +19,6 @@
 import org.dynmapblockscan.core.blockstate.BSBlockState;
 import org.dynmapblockscan.core.blockstate.VariantList;
 import org.dynmapblockscan.core.model.BlockModel;
-import org.dynmapblockscan.core.statehandlers.IStateHandlerFactory;
 import org.dynmapblockscan.core.statehandlers.StateContainer.StateRec;
 import org.dynmapblockscan.forge_1_18.statehandlers.ForgeStateContainer;
 
@@ -164,16 +162,6 @@ else if (uses_nonmodel) {
         	    br.varList = Collections.emptyMap();
         	}
             // Check for matching handler
-            br.handler = null;
-            for (IStateHandlerFactory f : state_handler) {
-              	br.handler = f.canHandleBlockState(br.sc);
-                if (br.handler != null) {
-                    break;
-                }
-            }
-            if (br.handler == null) {
-                logger.info(rl + ":  NO MATCHING HANDLER");
-            }
             blockRecords.put(rl.toString(), br);
         }