Reimplemented different ore-types for Grantie, Diorite, Andensite. Added material, items and other stuff for each ore. Oregen rebalanced. Fixed Generator for Oregen.

10 files changed, 60 insertions, 3 deletions

diff --git a/src/main/resources/assets/taiga/blockstates/fluid_block.json b/src/main/resources/assets/taiga/blockstates/fluid_block.json
index 20fbe16..70510af 100644
--- a/src/main/resources/assets/taiga/blockstates/fluid_block.json
+++ b/src/main/resources/assets/taiga/blockstates/fluid_block.json
@@ -88,6 +88,27 @@
         }
       }
     ],
+    "jaxum_fluid": [
+      {
+        "custom": {
+          "fluid": "jaxum_fluid"
+        }
+      }
+    ],
+    "ovium_fluid": [
+      {
+        "custom": {
+          "fluid": "ovium_fluid"
+        }
+      }
+    ],
+    "terrax_fluid": [
+      {
+        "custom": {
+          "fluid": "terrax_fluid"
+        }
+      }
+    ],
     "palladium_fluid": [
       {
         "custom": {
diff --git a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json b/src/main/resources/assets/taiga/blockstates/jauxum_block.json
index 07ba243..6df85dc 100644
--- a/src/main/resources/assets/taiga/blockstates/karmesinediorite_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/jauxum_block.json
@@ -3,7 +3,7 @@
   "defaults": {
     "model": "minecraft:cube_all",
     "textures": {
-      "all": "taiga:blocks/ore/karmesinediorite"
+      "all": "taiga:blocks/block/jauxum"
     },
     "transform": "forge:default-block"
   },
diff --git a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json b/src/main/resources/assets/taiga/blockstates/jauxum_ore.json
index 534c33e..846b091 100644
--- a/src/main/resources/assets/taiga/blockstates/karmesinegranite_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/jauxum_ore.json
@@ -3,7 +3,7 @@
   "defaults": {
     "model": "minecraft:cube_all",
     "textures": {
-      "all": "taiga:blocks/ore/karmesinegranite"
+      "all": "taiga:blocks/ore/jauxum"
     },
     "transform": "forge:default-block"
   },
diff --git a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json b/src/main/resources/assets/taiga/blockstates/ovium_block.json
index bd66801..4052bcc 100644
--- a/src/main/resources/assets/taiga/blockstates/karmesineandensite_ore.json
+++ b/src/main/resources/assets/taiga/blockstates/ovium_block.json
@@ -3,7 +3,7 @@
   "defaults": {
     "model": "minecraft:cube_all",
     "textures": {
-      "all": "taiga:blocks/ore/karmesineandensite"
+      "all": "taiga:blocks/block/ovium"
     },
     "transform": "forge:default-block"
   },
diff --git a/src/main/resources/assets/taiga/blockstates/ovium_ore.json b/src/main/resources/assets/taiga/blockstates/ovium_ore.json
new file mode 100644
index 0000000..1c36838
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/ovium_ore.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/ore/ovium"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/blockstates/terrax_block.json b/src/main/resources/assets/taiga/blockstates/terrax_block.json
new file mode 100644
index 0000000..5bd661d
--- /dev/null
+++ b/src/main/resources/assets/taiga/blockstates/terrax_block.json
@@ -0,0 +1,18 @@
+{
+  "forge_marker": 1,
+  "defaults": {
+    "model": "minecraft:cube_all",
+    "textures": {
+      "all": "taiga:blocks/block/terrax"
+    },
+    "transform": "forge:default-block"
+  },
+  "variants": {
+    "normal": [
+      {}
+    ],
+    "inventory": [
+      {}
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
index 7e4d7c2..811c9f0 100644
--- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
+++ b/src/main/resources/assets/taiga/textures/blocks/ore/karmesine.png
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png
deleted file mode 100644
index 7e4d7c2..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesineandensite.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png
deleted file mode 100644
index 4f14e7a..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinediorite.png
+++ /dev/null
diff --git a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png b/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png
deleted file mode 100644
index 9b42d38..0000000
--- a/src/main/resources/assets/taiga/textures/blocks/ore/karmesinegranite.png
+++ /dev/null