[1.2] Material rework (#60)

* Developement tests for nbt data in traits

* Lot of trait changes and better balancing

* Traits reworked a bit, new traits added.

* First correction of NBT Data in Trait (Soulbound). Is shown twice. Still needs corrections.

* Few fixes in traits and new trait "catcher"

* Small fix, needs workaround

* fixed some catch issues

* Fixed Catcher and Reviving Traits, new Trait: Souleater. Updated build.gradle for new TiC Version.

* Splitted SoulEater to get the bad touch to an extra trait "Cursed". Added method for using nbt more easily. Changed declaration names of fluids

* Some minor changes in Traits, Registry and Utils.

* Iron_nugget is replaced with oreDict Item when not loaded via TAIGA.

* Beginning of new material  integration. Lot of names changed, lot more work to do here. Many null pointer exceptions and no changes of values up to now.

* Some Small changes in names, registry and recipes

* Some weird stuff I don't remember :D

* fixed some things I missed while merging

* Rollback to something

* More Stuff

* fixed some merging stuff

* Fixed some misspelled names. Actually working with lots of restrictions.

* Rearranged alloys, tried to add blocks / ingots for non-tinker-materials, but they won't work.

* Again tried to fix the melting issue, but non-tinker materials still are not able to be casted as a block, ingot or nugget...

* Fixed integration of materials without tools.

* changed IMC to direct lib calls

* removed more IMC, removed redundant code

* some reformatting

* Alloy integration reworked, needs to be balanced.

* updated deps, renamed some func's, added duplicate material check

* some more renaming

* some reformatting, fixed wrong import, fixed string cmp's

* Added images for blocks, ingots, nuggets and dust. Json changes do not work yet.

* some reformatting

* Removed old json files. Placeholder needed.

* Fixed block json, items not working yet.

* Fixed my own derp (missing json files)

* Reduced materials to ensure unique traits for most of them. Still 30 though, but reduced by 20 more :'( RIP

* Changed some generator stuff, not working properly right now!

* rewrote offset generation, added some debug command, fixed some stuff

* fixed on-surface-generation, made dependencies more flexible

* reverted gen-weight back to its normal value

* Meteor generator implemented.

* fixed generating on ground

* optimized a thing

* Replaced Uru with Osram, replaced Meteorite with Uru, added Meteorite again for Hull-Material and late game alloy.

* Some changes in generation of ores, not ready yet.

* Added Cobble Meteorite. Added debug command. Implemented rest of ore generation. Some minor fixes left for generation including balancing.

* Some changes for ore generation. Added 2 separate Generic Blocks for meteorite and their cobble variant.

* some cleanup in Generator class, added meteor world save handler

* Added Textures. Added blockstates and item models. Fixed fluid rendering.

* renamed world save data file to be little more specific, removed a unused method

* some preps for the upcoming release

* First attempt of well balancing material stats. Renamed TiberiumX to Triberium.

* Final changes... ready for beta testing

* Added missing alloys.

* Corrected balancing of ore generation. Still WIP

* removed some last debug out

* one last reformat

87 files changed, 922 insertions, 428 deletions

diff --git a/src/main/resources/assets/taiga/blockstates/abyssum_block.json b/src/main/resources/assets/taiga/blockstates/abyssum_block.json
new file mode 100644
index 0000000..71f6fb3
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/abyssum_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/abyssum" 
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/abyssum_ore.json b/src/main/resources/assets/taiga/blockstates/abyssum_ore.json
new file mode 100644
index 0000000..2adad92
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/abyssum_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/abyssum"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/adamant_block.json b/src/main/resources/assets/taiga/blockstates/adamant_block.json
new file mode 100644
index 0000000..870d312
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/adamant_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/adamant"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/adamantite_block.json b/src/main/resources/assets/taiga/blockstates/adamantite_block.json
deleted file mode 100644
index c15ef35..0000000
--- a/src/main/resources/assets/taiga/blockstates/adamantite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:adamantite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/adamantite_ore.json b/src/main/resources/assets/taiga/blockstates/adamantite_ore.json
deleted file mode 100644
index aeed854..0000000
--- a/src/main/resources/assets/taiga/blockstates/adamantite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:adamantite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/aegisalt_block.json b/src/main/resources/assets/taiga/blockstates/aegisalt_block.json
deleted file mode 100644
index 5bda85d..0000000
--- a/src/main/resources/assets/taiga/blockstates/aegisalt_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:aegisalt_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/arcanite_block.json b/src/main/resources/assets/taiga/blockstates/arcanite_block.json
deleted file mode 100644
index 11b765a..0000000
--- a/src/main/resources/assets/taiga/blockstates/arcanite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:arcanite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/arcanite_ore.json b/src/main/resources/assets/taiga/blockstates/arcanite_ore.json
deleted file mode 100644
index ed63a02..0000000
--- a/src/main/resources/assets/taiga/blockstates/arcanite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:arcanite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/astrium_block.json b/src/main/resources/assets/taiga/blockstates/astrium_block.json
index 09049d8..c0783c1 100644
--- a/src/main/resources/assets/taiga/blockstates/astrium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/astrium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/astrium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:astrium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/aurorium_block.json b/src/main/resources/assets/taiga/blockstates/aurorium_block.json
new file mode 100644
index 0000000..576858c
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/aurorium_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/aurorium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/aurorium_ore.json b/src/main/resources/assets/taiga/blockstates/aurorium_ore.json
new file mode 100644
index 0000000..02c9113
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/aurorium_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/aurorium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/basalt.json b/src/main/resources/assets/taiga/blockstates/basalt.json
deleted file mode 100644
index 4aa78ef..0000000
--- a/src/main/resources/assets/taiga/blockstates/basalt.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:basalt"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/basalt_block.json b/src/main/resources/assets/taiga/blockstates/basalt_block.json
new file mode 100644
index 0000000..c4e762f
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/basalt_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/basalt"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/bismuth_block.json b/src/main/resources/assets/taiga/blockstates/bismuth_block.json
deleted file mode 100644
index a55f859..0000000
--- a/src/main/resources/assets/taiga/blockstates/bismuth_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:bismuth_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/bismuth_ore.json b/src/main/resources/assets/taiga/blockstates/bismuth_ore.json
deleted file mode 100644
index 40e3b5e..0000000
--- a/src/main/resources/assets/taiga/blockstates/bismuth_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:bismuth_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/bysmuid_block.json b/src/main/resources/assets/taiga/blockstates/bysmuid_block.json
deleted file mode 100644
index a542d20..0000000
--- a/src/main/resources/assets/taiga/blockstates/bysmuid_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:bysmuid_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/cryptogen_block.json b/src/main/resources/assets/taiga/blockstates/cryptogen_block.json
deleted file mode 100644
index ddc3c2d..0000000
--- a/src/main/resources/assets/taiga/blockstates/cryptogen_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:cryptogen_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/duranite_block.json b/src/main/resources/assets/taiga/blockstates/duranite_block.json
new file mode 100644
index 0000000..7759fdf
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/duranite_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/duranite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/duranite_ore.json b/src/main/resources/assets/taiga/blockstates/duranite_ore.json
new file mode 100644
index 0000000..a004354
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/duranite_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/duranite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/dyonite_block.json b/src/main/resources/assets/taiga/blockstates/dyonite_block.json
index e2e94ac..0039b6a 100644
--- a/src/main/resources/assets/taiga/blockstates/dyonite_block.json
+++ b/src/main/resources/assets/taiga/blockstates/dyonite_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/dyonite"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:dyonite_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/eezo_block.json b/src/main/resources/assets/taiga/blockstates/eezo_block.json
new file mode 100644
index 0000000..126074d
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/eezo_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/eezo"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/eezo_ore.json b/src/main/resources/assets/taiga/blockstates/eezo_ore.json
new file mode 100644
index 0000000..75b7aed
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/eezo_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/eezo"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/eternite_block.json b/src/main/resources/assets/taiga/blockstates/eternite_block.json
deleted file mode 100644
index a175f8f..0000000
--- a/src/main/resources/assets/taiga/blockstates/eternite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:eternite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/eternite_ore.json b/src/main/resources/assets/taiga/blockstates/eternite_ore.json
deleted file mode 100644
index 0a44944..0000000
--- a/src/main/resources/assets/taiga/blockstates/eternite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:eternite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json
index fb06fc9..b135075 100644
--- a/src/main/resources/assets/taiga/blockstates/fluid_block.json
+++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json
@@ -4,276 +4,241 @@
     "model": "forge:fluid"
   },
   "variants": {
-    "arcanite": [
+    "triberium_fluid": [
       {
         "custom": {
-          "fluid": "arcanite"
+          "fluid": "triberium_fluid"
         }
       }
     ],
-    "tiberium": [
+    "meteorite_fluid": [
       {
         "custom": {
-          "fluid": "tiberium"
+          "fluid": "meteorite_fluid"
         }
       }
     ],
-    "prometheum": [
+    "basalt_fluid": [
       {
         "custom": {
-          "fluid": "prometheum"
+          "fluid": "basalt_fluid"
         }
       }
     ],
-    "rubium": [
+    "tiberium_fluid": [
       {
         "custom": {
-          "fluid": "rubium"
+          "fluid": "tiberium_fluid"
         }
       }
     ],
-    "violium": [
+    "aurorium_fluid": [
       {
         "custom": {
-          "fluid": "violium"
+          "fluid": "aurorium_fluid"
         }
       }
     ],
-    "bismuth": [
+    "prometheum_fluid": [
       {
         "custom": {
-          "fluid": "bismuth"
+          "fluid": "prometheum_fluid"
         }
       }
     ],
-    "karmesine": [
+    "duranite_fluid": [
       {
         "custom": {
-          "fluid": "karmesine"
+          "fluid": "duranite_fluid"
         }
       }
     ],
-    "mindorite": [
+    "valyrium_fluid": [
       {
         "custom": {
-          "fluid": "mindorite"
+          "fluid": "valyrium_fluid"
         }
       }
     ],
-    "titanite": [
+    "vibranium_fluid": [
       {
         "custom": {
-          "fluid": "titanite"
+          "fluid": "vibranium_fluid"
         }
       }
     ],
-    "meteorite": [
+    "karmesine_fluid": [
       {
         "custom": {
-          "fluid": "meteorite"
+          "fluid": "karmesine_fluid"
         }
       }
     ],
-    "adamantite": [
+    "palladium_fluid": [
       {
         "custom": {
-          "fluid": "adamantite"
+          "fluid": "palladium_fluid"
         }
       }
     ],
-    "vibranium": [
+    "uru_fluid": [
       {
         "custom": {
-          "fluid": "vibranium"
+          "fluid": "uru_fluid"
         }
       }
     ],
-    "ignitite": [
+    "osram_fluid": [
       {
         "custom": {
-          "fluid": "ignitite"
+          "fluid": "osram_fluid"
         }
       }
     ],
-    "palladium": [
+    "abyssum_fluid": [
       {
         "custom": {
-          "fluid": "palladium"
+          "fluid": "abyssum_fluid"
         }
       }
     ],
-    "eternite": [
+    "eezo_fluid": [
       {
         "custom": {
-          "fluid": "eternite"
+          "fluid": "eezo_fluid"
         }
       }
     ],
-    "mythril": [
+    "tiberiumX_fluid": [
       {
         "custom": {
-          "fluid": "mythril"
+          "fluid": "tiberiumX_fluid"
         }
       }
     ],
-    "astrium": [
+    "fractum_fluid": [
       {
         "custom": {
-          "fluid": "astrium"
+          "fluid": "fractum_fluid"
         }
       }
     ],
-    "nitronite": [
+    "violium_fluid": [
       {
         "custom": {
-          "fluid": "nitronite"
+          "fluid": "violium_fluid"
         }
       }
     ],
-    "proxideum": [
+    "proxii_fluid": [
       {
         "custom": {
-          "fluid": "proxideum"
+          "fluid": "proxii_fluid"
         }
       }
     ],
-    "noctunyx": [
+    "tritonite_fluid": [
       {
         "custom": {
-          "fluid": "noctunyx"
+          "fluid": "tritonite_fluid"
         }
       }
     ],
-    "imperomite": [
+    "ignitz_fluid": [
       {
         "custom": {
-          "fluid": "imperomite"
+          "fluid": "ignitz_fluid"
         }
       }
     ],
-    "cryptogen": [
+    "imperomite_fluid": [
       {
         "custom": {
-          "fluid": "cryptogen"
+          "fluid": "imperomite_fluid"
         }
       }
     ],
-    "fractoryte": [
+    "solarium_fluid": [
       {
         "custom": {
-          "fluid": "fractoryte"
+          "fluid": "solarium_fluid"
         }
       }
     ],
-    "seismodium": [
+    "nihilite_fluid": [
       {
         "custom": {
-          "fluid": "seismodium"
+          "fluid": "nihilite_fluid"
         }
       }
     ],
-    "terramite": [
+    "adamant_fluid": [
       {
         "custom": {
-          "fluid": "terramite"
+          "fluid": "adamant_fluid"
         }
       }
     ],
-    "lumixyl": [
+    "dyonite_fluid": [
       {
         "custom": {
-          "fluid": "lumixyl"
+          "fluid": "dyonite_fluid"
         }
       }
     ],
-    "solarium": [
+    "nucleum_fluid": [
       {
         "custom": {
-          "fluid": "solarium"
+          "fluid": "nucleum_fluid"
         }
       }
     ],
-    "dyonite": [
+    "lumix_fluid": [
       {
         "custom": {
-          "fluid": "dyonite"
+          "fluid": "lumix_fluid"
         }
       }
     ],
-    "ultranite": [
+    "seismum_fluid": [
       {
         "custom": {
-          "fluid": "ultranite"
+          "fluid": "seismum_fluid"
         }
       }
     ],
-    "nucleum": [
+    "astrium_fluid": [
       {
         "custom": {
-          "fluid": "nucleum"
+          "fluid": "astrium_fluid"
         }
       }
     ],
-    "aegisalt": [
+    "niob_fluid": [
       {
         "custom": {
-          "fluid": "aegisalt"
+          "fluid": "niob_fluid"
         }
       }
     ],
-    "bysmuid": [
+    "yrdeen_fluid": [
       {
         "custom": {
-          "fluid": "bysmuid"
+          "fluid": "yrdeen_fluid"
         }
       }
     ],
-    "radiant_enderium": [
+    "iox_fluid": [
       {
         "custom": {
-          "fluid": "radiant_enderium"
+          "fluid": "iox_fluid"
         }
       }
     ],
-    "glimming_enderium": [
+    "obsidiorite_fluid": [
       {
         "custom": {
-          "fluid": "glimming_enderium"
-        }
-      }
-    ],
-    "energy_enderium": [
-      {
-        "custom": {
-          "fluid": "energy_enderium"
-        }
-      }
-    ],
-    "glimmercoal_fluid": [
-      {
-        "custom": {
-          "fluid": "glimmercoal_fluid"
-        }
-      }
-    ],
-    "nitro_fluid": [
-      {
-        "custom": {
-          "fluid": "nitro_fluid"
-        }
-      }
-    ],
-    "anthracite_fluid": [
-      {
-        "custom": {
-          "fluid": "anthracite_fluid"
-        }
-      }
-    ],
-    "spectrum_fluid": [
-      {
-        "custom": {
-          "fluid": "spectrum_fluid"
+          "fluid": "obsidiorite_fluid"
         }
       }
     ]
diff --git a/src/main/resources/assets/taiga/blockstates/fractoryte_block.json b/src/main/resources/assets/taiga/blockstates/fractoryte_block.json
deleted file mode 100644
index 2c8cd91..0000000
--- a/src/main/resources/assets/taiga/blockstates/fractoryte_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:fractoryte_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/fractum_block.json b/src/main/resources/assets/taiga/blockstates/fractum_block.json
new file mode 100644
index 0000000..1bc30d4
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/fractum_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/fractum"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/ignitite_block.json b/src/main/resources/assets/taiga/blockstates/ignitite_block.json
deleted file mode 100644
index 05f3557..0000000
--- a/src/main/resources/assets/taiga/blockstates/ignitite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:ignitite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/ignitite_ore.json b/src/main/resources/assets/taiga/blockstates/ignitite_ore.json
deleted file mode 100644
index 8368a87..0000000
--- a/src/main/resources/assets/taiga/blockstates/ignitite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:ignitite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/ignitz_block.json b/src/main/resources/assets/taiga/blockstates/ignitz_block.json
new file mode 100644
index 0000000..d23cb65
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/ignitz_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/ignitz"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/imperomite_block.json b/src/main/resources/assets/taiga/blockstates/imperomite_block.json
index 8aa54df..2bf4f14 100644
--- a/src/main/resources/assets/taiga/blockstates/imperomite_block.json
+++ b/src/main/resources/assets/taiga/blockstates/imperomite_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/imperomite"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:imperomite_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/iox_block.json b/src/main/resources/assets/taiga/blockstates/iox_block.json
new file mode 100644
index 0000000..d5ca26a
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/iox_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/iox"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesine_block.json b/src/main/resources/assets/taiga/blockstates/karmesine_block.json
index 97b3302..c82dba9 100644
--- a/src/main/resources/assets/taiga/blockstates/karmesine_block.json
+++ b/src/main/resources/assets/taiga/blockstates/karmesine_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/karmesine"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:karmesine_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesine_ore.json b/src/main/resources/assets/taiga/blockstates/karmesine_ore.json
index 31184ff..c38813c 100644
--- a/src/main/resources/assets/taiga/blockstates/karmesine_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/karmesine_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:karmesine_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/karmesine"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json
new file mode 100644
index 0000000..bd66801
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/karmesineandensite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json
new file mode 100644
index 0000000..07ba243
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/karmesinediorite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json b/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json
new file mode 100644
index 0000000..534c33e
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/karmesinegranite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/lignite_ore.json b/src/main/resources/assets/taiga/blockstates/lignite_ore.json
deleted file mode 100644
index 0eb941e..0000000
--- a/src/main/resources/assets/taiga/blockstates/lignite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:lignite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/lumix_block.json b/src/main/resources/assets/taiga/blockstates/lumix_block.json
new file mode 100644
index 0000000..d806b54
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/lumix_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/lumix"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/lumixyl_block.json b/src/main/resources/assets/taiga/blockstates/lumixyl_block.json
deleted file mode 100644
index 7a12aac..0000000
--- a/src/main/resources/assets/taiga/blockstates/lumixyl_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:lumixyl_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/meteorite_block.json b/src/main/resources/assets/taiga/blockstates/meteorite_block.json
index b6166b7..786bb60 100644
--- a/src/main/resources/assets/taiga/blockstates/meteorite_block.json
+++ b/src/main/resources/assets/taiga/blockstates/meteorite_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/meteorite"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:meteorite_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/meteorite_ore.json b/src/main/resources/assets/taiga/blockstates/meteorite_ore.json
deleted file mode 100644
index d84f51b..0000000
--- a/src/main/resources/assets/taiga/blockstates/meteorite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:meteorite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json b/src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json
new file mode 100644
index 0000000..eff3144
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/meteoritecobble_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/meteoritecobble"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/mindorite_block.json b/src/main/resources/assets/taiga/blockstates/mindorite_block.json
deleted file mode 100644
index 52a9a32..0000000
--- a/src/main/resources/assets/taiga/blockstates/mindorite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:mindorite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/mindorite_ore.json b/src/main/resources/assets/taiga/blockstates/mindorite_ore.json
deleted file mode 100644
index 7780d42..0000000
--- a/src/main/resources/assets/taiga/blockstates/mindorite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:mindorite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/mythril_block.json b/src/main/resources/assets/taiga/blockstates/mythril_block.json
deleted file mode 100644
index 53dde45..0000000
--- a/src/main/resources/assets/taiga/blockstates/mythril_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:mythril_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/mythril_ore.json b/src/main/resources/assets/taiga/blockstates/mythril_ore.json
deleted file mode 100644
index 2a2d020..0000000
--- a/src/main/resources/assets/taiga/blockstates/mythril_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:mythril_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/nihilite_block.json b/src/main/resources/assets/taiga/blockstates/nihilite_block.json
new file mode 100644
index 0000000..7a8a386
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/nihilite_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/nihilite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/niob_block.json b/src/main/resources/assets/taiga/blockstates/niob_block.json
new file mode 100644
index 0000000..b28fa4f
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/niob_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/niob"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/nitronite_block.json b/src/main/resources/assets/taiga/blockstates/nitronite_block.json
deleted file mode 100644
index 74113cd..0000000
--- a/src/main/resources/assets/taiga/blockstates/nitronite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:nitronite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/noctunyx_block.json b/src/main/resources/assets/taiga/blockstates/noctunyx_block.json
deleted file mode 100644
index 4a8f4b7..0000000
--- a/src/main/resources/assets/taiga/blockstates/noctunyx_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:noctunyx_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/nucleum_block.json b/src/main/resources/assets/taiga/blockstates/nucleum_block.json
index 2082110..b7c6bed 100644
--- a/src/main/resources/assets/taiga/blockstates/nucleum_block.json
+++ b/src/main/resources/assets/taiga/blockstates/nucleum_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/nucleum"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:nucleum_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/obsidiorite_block.json b/src/main/resources/assets/taiga/blockstates/obsidiorite_block.json
new file mode 100644
index 0000000..2dffc7d
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/obsidiorite_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/obsidiorite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json b/src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json
new file mode 100644
index 0000000..53e133f
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/obsidioritecobble_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/obsidioritecobble"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/osram_block.json b/src/main/resources/assets/taiga/blockstates/osram_block.json
new file mode 100644
index 0000000..e5c69e6
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/osram_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/osram"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/osram_ore.json b/src/main/resources/assets/taiga/blockstates/osram_ore.json
new file mode 100644
index 0000000..b2ad55d
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/osram_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/osram"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/palladium_block.json b/src/main/resources/assets/taiga/blockstates/palladium_block.json
index 601d4ab..ad302fe 100644
--- a/src/main/resources/assets/taiga/blockstates/palladium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/palladium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/palladium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:palladium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/palladium_ore.json b/src/main/resources/assets/taiga/blockstates/palladium_ore.json
index 78e862b..c35b9e4 100644
--- a/src/main/resources/assets/taiga/blockstates/palladium_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/palladium_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:palladium_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/palladium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/prometheum_block.json b/src/main/resources/assets/taiga/blockstates/prometheum_block.json
index af31aa8..3ce7fbb 100644
--- a/src/main/resources/assets/taiga/blockstates/prometheum_block.json
+++ b/src/main/resources/assets/taiga/blockstates/prometheum_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/prometheum"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:prometheum_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/prometheum_ore.json b/src/main/resources/assets/taiga/blockstates/prometheum_ore.json
index ff3de0d..4f13232 100644
--- a/src/main/resources/assets/taiga/blockstates/prometheum_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/prometheum_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:prometheum_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/prometheum"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/proxideum_block.json b/src/main/resources/assets/taiga/blockstates/proxideum_block.json
deleted file mode 100644
index 9e0c38b..0000000
--- a/src/main/resources/assets/taiga/blockstates/proxideum_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:proxideum_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/proxii_block.json b/src/main/resources/assets/taiga/blockstates/proxii_block.json
new file mode 100644
index 0000000..f0f94bc
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/proxii_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/proxii"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/rotten_ground.json b/src/main/resources/assets/taiga/blockstates/rotten_ground.json
deleted file mode 100644
index 39e72bf..0000000
--- a/src/main/resources/assets/taiga/blockstates/rotten_ground.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:rotten_ground"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/rubium_block.json b/src/main/resources/assets/taiga/blockstates/rubium_block.json
deleted file mode 100644
index 2e491ef..0000000
--- a/src/main/resources/assets/taiga/blockstates/rubium_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:rubium_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/rubium_ore.json b/src/main/resources/assets/taiga/blockstates/rubium_ore.json
deleted file mode 100644
index 82b330e..0000000
--- a/src/main/resources/assets/taiga/blockstates/rubium_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:rubium_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/seismodium_block.json b/src/main/resources/assets/taiga/blockstates/seismodium_block.json
deleted file mode 100644
index 19fa838..0000000
--- a/src/main/resources/assets/taiga/blockstates/seismodium_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:seismodium_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/seismum_block.json b/src/main/resources/assets/taiga/blockstates/seismum_block.json
new file mode 100644
index 0000000..ab10664
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/seismum_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/seismum"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/slaggold_ore.json b/src/main/resources/assets/taiga/blockstates/slaggold_ore.json
deleted file mode 100644
index 5e5c317..0000000
--- a/src/main/resources/assets/taiga/blockstates/slaggold_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:slaggold_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/slagiron_ore.json b/src/main/resources/assets/taiga/blockstates/slagiron_ore.json
deleted file mode 100644
index a45629e..0000000
--- a/src/main/resources/assets/taiga/blockstates/slagiron_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:slagiron_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/solarium_block.json b/src/main/resources/assets/taiga/blockstates/solarium_block.json
index 9d52d5a..730c52b 100644
--- a/src/main/resources/assets/taiga/blockstates/solarium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/solarium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/solarium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:solarium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/terramite_block.json b/src/main/resources/assets/taiga/blockstates/terramite_block.json
deleted file mode 100644
index 55bac8a..0000000
--- a/src/main/resources/assets/taiga/blockstates/terramite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:terramite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/tiberium_block.json b/src/main/resources/assets/taiga/blockstates/tiberium_block.json
index 95f8be5..8de7043 100644
--- a/src/main/resources/assets/taiga/blockstates/tiberium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/tiberium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/tiberium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:tiberium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/tiberium_ore.json b/src/main/resources/assets/taiga/blockstates/tiberium_ore.json
index fba6296..618929b 100644
--- a/src/main/resources/assets/taiga/blockstates/tiberium_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/tiberium_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:tiberium_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/tiberium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/titanite_block.json b/src/main/resources/assets/taiga/blockstates/titanite_block.json
deleted file mode 100644
index 5bde804..0000000
--- a/src/main/resources/assets/taiga/blockstates/titanite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:titanite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/titanite_ore.json b/src/main/resources/assets/taiga/blockstates/titanite_ore.json
deleted file mode 100644
index ab7f988..0000000
--- a/src/main/resources/assets/taiga/blockstates/titanite_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:titanite_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/triberium_block.json b/src/main/resources/assets/taiga/blockstates/triberium_block.json
new file mode 100644
index 0000000..a4fbb33
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/triberium_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/triberium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/tritonite_block.json b/src/main/resources/assets/taiga/blockstates/tritonite_block.json
new file mode 100644
index 0000000..a10ab3c
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/tritonite_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/tritonite"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/ultranite_block.json b/src/main/resources/assets/taiga/blockstates/ultranite_block.json
deleted file mode 100644
index b3368d9..0000000
--- a/src/main/resources/assets/taiga/blockstates/ultranite_block.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "normal": {
-      "model": "taiga:ultranite_block"
-    }
-  }
-}
diff --git a/src/main/resources/assets/taiga/blockstates/uru_block.json b/src/main/resources/assets/taiga/blockstates/uru_block.json
new file mode 100644
index 0000000..31363cf
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/uru_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/uru"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/uru_ore.json b/src/main/resources/assets/taiga/blockstates/uru_ore.json
new file mode 100644
index 0000000..089fd9a
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/uru_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/uru"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/valyrium_block.json b/src/main/resources/assets/taiga/blockstates/valyrium_block.json
new file mode 100644
index 0000000..f7e5fda
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/valyrium_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/valyrium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/valyrium_ore.json b/src/main/resources/assets/taiga/blockstates/valyrium_ore.json
new file mode 100644
index 0000000..bcc0804
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/valyrium_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/valyrium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/vibranium_block.json b/src/main/resources/assets/taiga/blockstates/vibranium_block.json
index 75cf810..c35e154 100644
--- a/src/main/resources/assets/taiga/blockstates/vibranium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/vibranium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/vibranium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:vibranium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/vibranium_ore.json b/src/main/resources/assets/taiga/blockstates/vibranium_ore.json
index aa1be1a..2852ccf 100644
--- a/src/main/resources/assets/taiga/blockstates/vibranium_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/vibranium_ore.json
@@ -1,7 +1,18 @@
 {
-    "variants": {
-        "normal": {
-            "model": "taiga:vibranium_ore"
-        }
-    }
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/vibranium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/violium_block.json b/src/main/resources/assets/taiga/blockstates/violium_block.json
index d5c1232..2eb5a1e 100644
--- a/src/main/resources/assets/taiga/blockstates/violium_block.json
+++ b/src/main/resources/assets/taiga/blockstates/violium_block.json
@@ -1,7 +1,18 @@
 {
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/violium"
+    },
+    "transform": "forge:default-block"
+  },
   "variants": {
-    "normal": {
-      "model": "taiga:violium_block"
-    }
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/violium_ore.json b/src/main/resources/assets/taiga/blockstates/violium_ore.json
deleted file mode 100644
index afd18f6..0000000
--- a/src/main/resources/assets/taiga/blockstates/violium_ore.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "normal": {
-            "model": "taiga:violium_ore"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/yrdeen_block.json b/src/main/resources/assets/taiga/blockstates/yrdeen_block.json
new file mode 100644
index 0000000..70cf16c
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/yrdeen_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/yrdeen"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file