Some models work, some don't

src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagic.java

@@ -60,13 +60,14 @@ public class RegistrarBloodMagic {
 
     @SubscribeEvent
     public static void registerBloodOrbs(RegistryEvent.Register<BloodOrb> event) {
+        ResourceLocation orb = RegistrarBloodMagicItems.BLOOD_ORB.getRegistryName();
         event.getRegistry().registerAll(
-                new BloodOrb("weak", 1, 5000).setRegistryName("weak"),
+                new BloodOrb("weak", 1, 5000).withModel(new ModelResourceLocation(orb, "type=weak")).setRegistryName("weak"),
-                new BloodOrb("apprentice", 2, 25000).setRegistryName("apprentice"),
+                new BloodOrb("apprentice", 2, 25000).withModel(new ModelResourceLocation(orb, "type=apprentice")).setRegistryName("apprentice"),
-                new BloodOrb("magician", 3, 150000).setRegistryName("magician"),
+                new BloodOrb("magician", 3, 150000).withModel(new ModelResourceLocation(orb, "type=magician")).setRegistryName("magician"),
-                new BloodOrb("master", 4, 1000000).setRegistryName("master"),
+                new BloodOrb("master", 4, 1000000).withModel(new ModelResourceLocation(orb, "type=master")).setRegistryName("master"),
-                new BloodOrb("archmage", 5, 10000000).setRegistryName("archmage"),
+                new BloodOrb("archmage", 5, 10000000).withModel(new ModelResourceLocation(orb, "type=archmage")).setRegistryName("archmage"),
-                new BloodOrb("transcendent", 6, 30000000).setRegistryName("transcendent")
+                new BloodOrb("transcendent", 6, 30000000).withModel(new ModelResourceLocation(orb, "type=transcendent")).setRegistryName("transcendent")
         );
     }
 

src/main/java/WayofTime/bloodmagic/core/RegistrarBloodMagicBlocks.java

@@ -8,7 +8,7 @@ import WayofTime.bloodmagic.tile.routing.TileInputRoutingNode;
 import WayofTime.bloodmagic.tile.routing.TileItemRoutingNode;
 import WayofTime.bloodmagic.tile.routing.TileMasterRoutingNode;
 import WayofTime.bloodmagic.tile.routing.TileOutputRoutingNode;
-import com.google.common.collect.Sets;
+import com.google.common.collect.Lists;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.init.Blocks;
@@ -18,7 +18,7 @@ import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
-import java.util.Set;
+import java.util.List;
 
 @Mod.EventBusSubscriber(modid = BloodMagic.MODID)
 @GameRegistry.ObjectHolder(BloodMagic.MODID)
@@ -66,14 +66,14 @@ public class RegistrarBloodMagicBlocks {
     public static final Block INVERSION_PILLAR = Blocks.AIR;
     public static final Block INVERSION_PILLAR_END = Blocks.AIR;
 
-    static Set<Block> blocks;
+    static List<Block> blocks;
 
     @SubscribeEvent
     public static void registerBlocks(RegistryEvent.Register<Block> event) {
         FluidRegistry.registerFluid(BlockLifeEssence.getLifeEssence());
         FluidRegistry.addBucketForFluid(BlockLifeEssence.getLifeEssence());
 
-        blocks = Sets.newHashSet(
+        blocks = Lists.newArrayList(
                 new BlockAltar().setRegistryName("altar"),
                 new BlockBloodRune().setRegistryName("blood_rune"),
                 new BlockRitualController().setRegistryName("ritual_controller"),

src/main/java/WayofTime/bloodmagic/item/ItemBoundTool.java

@@ -74,7 +74,7 @@ public class ItemBoundTool extends ItemTool implements IBindable, IActivatable {
 
     @Override
     public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> subItems) {
-        if (isInCreativeTab(tab))
+        if (!isInCreativeTab(tab))
             return;
 
         subItems.add(Utils.setUnbreakable(new ItemStack(this)));

src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java

@@ -61,9 +61,10 @@ public class ItemBlockBloodTank extends ItemBlock {
     @SideOnly(Side.CLIENT)
     public void getSubItems(CreativeTabs creativeTab, NonNullList<ItemStack> list) {
         if (!isInCreativeTab(creativeTab))
+            return;
 
-            for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++)
+        for (int i = 0; i < TileBloodTank.CAPACITIES.length; i++)
-                list.add(new ItemStack(this, 1, i));
+            list.add(new ItemStack(this, 1, i));
     }
 
     public int getCapacity(ItemStack container) {

src/main/resources/assets/bloodmagic/blockstates/blockcrystal.json

@@ -1,22 +0,0 @@
-{
-  "forge_marker": 1,
-  "defaults": {
-    "textures": { },
-    "model": "cube_all",
-    "uvlock": true
-  },
-  "variants": {
-    "type": {
-      "large": {
-        "textures": {
-          "all": "bloodmagic:blocks/ShardCluster"
-        }
-      },
-      "brick": {
-        "textures": {
-          "all": "bloodmagic:blocks/ShardClusterBrick"
-        }
-      }
-    }
-  }
-}

src/main/resources/assets/bloodmagic/blockstates/blood_orb.json

@@ -0,0 +1,41 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "builtin/generated",
+    "transform": "forge:default-item"
+  },
+  "variants": {
+    "type": {
+      "weak": {
+        "textures": {
+          "layer0": "bloodmagic:items/weakbloodorb"
+        }
+      },
+      "apprentice": {
+        "textures": {
+          "layer0": "bloodmagic:items/apprenticebloodorb"
+        }
+      },
+      "magician": {
+        "textures": {
+          "layer0": "bloodmagic:items/magicianbloodorb"
+        }
+      },
+      "master": {
+        "textures": {
+          "layer0": "bloodmagic:items/masterbloodorb"
+        }
+      },
+      "archmage": {
+        "textures": {
+          "layer0": "bloodmagic:items/archmagebloodorb"
+        }
+      },
+      "transcendent": {
+        "textures": {
+          "layer0": "bloodmagic:items/transcendentbloodorb"
+        }
+      }
+    }
+  }
+}

src/main/resources/assets/bloodmagic/blockstates/decorative_brick.json

@@ -7,15 +7,25 @@
   },
   "variants": {
     "type": {
-      "large": {
+      "bloodstone_tile": {
         "textures": {
           "all": "bloodmagic:blocks/LargeBloodStoneBrick"
         }
       },
-      "brick": {
+      "bloodstone_brick": {
         "textures": {
           "all": "bloodmagic:blocks/BloodStoneBrick"
         }
+      },
+      "crystal_tile": {
+        "textures": {
+          "all": "bloodmagic:blocks/shardcluster"
+        }
+      },
+      "crystal_brick": {
+        "textures": {
+          "all": "bloodmagic:blocks/shardclusterbrick"
+        }
       }
     }
   }

src/main/resources/assets/bloodmagic/blockstates/item/itemblockdemoncrystal.json

@@ -1,39 +0,0 @@
-{
-  "forge_marker": 1,
-  "defaults": {
-    "model": "bloodmagic:crystal/Crystal1.obj",
-    "custom": { "flip-v": true },
-    "transform": {
-        "translation": [ 0, 0, 1]
-    }
-  },
-  "variants": {
-    "type": {
-    		"default": {
-	    		"textures": {
-	    			"#crystal" : "bloodmagic:models/DefaultCrystal"
-	    		}
-    		},
-    		"corrosive": {
-	    		"textures": {
-	    			"#crystal" : "bloodmagic:models/CorrosiveCrystal"
-	    		}
-    		},
-    		"destructive": {
-	    		"textures": {
-	    			"#crystal" : "bloodmagic:models/DestructiveCrystal"
-    			}
-    		},
-    		"vengeful": {
-    			"textures": {
-    				"#crystal" : "bloodmagic:models/VengefulCrystal"
-    			}
-    		},
-    		"steadfast": {
-    			"textures": {
-    				"#crystal" : "bloodmagic:models/SteadfastCrystal"
-    			}
-    		}
-    	}
-  }
-}