Rest of the pyrite (except the ripper), rest of the spirit tree stuff…

…, more plants

src/main/generated/assets/spectrum/blockstates/mermaids_brush.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "age=0": {
+      "model": "spectrum:block/mermaids_brush_none"
+    },
+    "age=1": {
+      "model": "spectrum:block/mermaids_brush_none"
+    },
+    "age=2": {
+      "model": "spectrum:block/mermaids_brush_none"
+    },
+    "age=3": {
+      "model": "spectrum:block/mermaids_brush_some"
+    },
+    "age=4": {
+      "model": "spectrum:block/mermaids_brush_some"
+    },
+    "age=5": {
+      "model": "spectrum:block/mermaids_brush_some"
+    },
+    "age=6": {
+      "model": "spectrum:block/mermaids_brush_full"
+    },
+    "age=7": {
+      "model": "spectrum:block/mermaids_brush_full"
+    }
+  }
+}

src/main/resources/assets/spectrum/blockstates/nephrite_blossom_stem.json → src/main/generated/assets/spectrum/blockstates/nephrite_blossom_stem.json

@@ -10,24 +10,21 @@
     },
     {
       "apply": {
-        "model": "spectrum:block/nephrite_blossom_stem_top"
+        "model": "spectrum:block/nephrite_blossom_stem_base"
       },
       "when": {
         "part": "stemalt"
       }
     },
     {
-      "apply": {
-        "model": "spectrum:block/nephrite_blossom_base"
-      },
-      "when": {
-        "part": "base"
-      }
-    },
-    {
-      "apply": {
-        "model": "spectrum:block/nephrite_blossom_stem_bottom"
-      },
+      "apply": [
+        {
+          "model": "spectrum:block/nephrite_blossom_stem_top"
+        },
+        {
+          "model": "spectrum:block/nephrite_blossom_stem_bottom"
+        }
+      ],
       "when": {
         "part": "base"
       }

src/main/generated/assets/spectrum/blockstates/ominous_sapling.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/ominous_sapling"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/pyrite_pile.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "spectrum:block/pyrite_pile",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "spectrum:block/pyrite_pile"
+    },
+    "axis=z": {
+      "model": "spectrum:block/pyrite_pile",
+      "x": 90
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/pyrite_relief.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "spectrum:block/pyrite_relief",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "spectrum:block/pyrite_relief"
+    },
+    "axis=z": {
+      "model": "spectrum:block/pyrite_relief",
+      "x": 90
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/pyrite_tubing.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "spectrum:block/pyrite_tubing",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "spectrum:block/pyrite_tubing"
+    },
+    "axis=z": {
+      "model": "spectrum:block/pyrite_tubing",
+      "x": 90
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/pyrite_vent.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/pyrite_vent"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/quitoxic_reeds.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/quitoxic_reeds"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/sacred_soil.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "moisture=0": {
+      "model": "spectrum:block/sacred_soil"
+    },
+    "moisture=1": {
+      "model": "spectrum:block/sacred_soil"
+    },
+    "moisture=2": {
+      "model": "spectrum:block/sacred_soil"
+    },
+    "moisture=3": {
+      "model": "spectrum:block/sacred_soil"
+    },
+    "moisture=4": {
+      "model": "spectrum:block/sacred_soil"
+    },
+    "moisture=5": {
+      "model": "spectrum:block/sacred_soil"
+    },
+    "moisture=6": {
+      "model": "spectrum:block/sacred_soil"
+    },
+    "moisture=7": {
+      "model": "spectrum:block/sacred_soil_moist"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/sag_bubble.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/sag_bubble"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/sag_leaf.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/sag_leaf"
+    }
+  }
+}

src/main/generated/assets/spectrum/blockstates/small_sag_bubble.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "spectrum:block/small_sag_bubble"
+    }
+  }
+}

src/main/resources/assets/spectrum/models/block/nephrite_blossom_bulb.json → src/main/generated/assets/spectrum/models/block/nephrite_blossom_bulb.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cross",
   "textures": {
-    "cross": "spectrum:block/nephrite_blossom_sprout"
+    "cross": "spectrum:block/nephrite_blossom_bulb"
   }
 }

src/main/java/de/dafuqs/spectrum/data/SpectrumModelProvider.java

@@ -57,10 +57,6 @@ public static void registerBlockTexturedItemModel(ItemModelGenerator ctx, Block
 
 	// Block Models
 
-	public static BlockStateSupplier singletonBlockModel(BlockStateModelGenerator ctx, Block block, TexturedModel.Factory factory) {
-		return VariantsBlockStateSupplier.create(block, createModelVariant(factory.upload(block, ctx.modelCollector)));
-	}
-
 	public static BlockStateSupplier simpleMirroredBlockModel(BlockStateModelGenerator ctx, Block block) {
 		return createMirroredVariantsSupplier(block, TexturedModel.CUBE_ALL, TexturedModel.CUBE_MIRRORED_ALL, ctx.modelCollector);
 	}