Add new basalt ore

build.gradle

@@ -12,7 +12,7 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '4.4.0.46-experimental'
+version = '4.4.0.47-experimental'
 group = 'fr.alasdiablo.janoeo'
 archivesBaseName = 'Janoeo'
 
@@ -56,7 +56,7 @@ minecraft {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.16.1-32.0.69'
+    minecraft 'net.minecraftforge:forge:1.16.1-32.0.98'
 }
 
 jar {

changelog.md

@@ -1,3 +1,15 @@
+### 4.4.0.47-experimental
++ fix harvest level
++ fix redstone ore always lit
++ add new basalt ore
+  + diamond
+  + emerald
+  + coal
+  + gold
+  + iron
+  + lapis
+  + redstone
+
 ### 4.4.0.46-experimental
 + rework world ore generation internal code
 + balancing the nether and end ore generation

src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_blasting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:coal_basalt_blasting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_coal_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:coal_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:coal_basalt_blasting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_coal_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/minecraft/advancements/recipes/misc/coal_basalt_smelting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:coal_basalt_smelting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_coal_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:coal_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:coal_basalt_smelting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_coal_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_blasting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:diamond_basalt_blasting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_diamond_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:diamond_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:diamond_basalt_blasting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_diamond_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/minecraft/advancements/recipes/misc/diamond_basalt_smelting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:diamond_basalt_smelting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_diamond_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:diamond_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:diamond_basalt_smelting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_diamond_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_blasting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:emerald_basalt_blasting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_emerald_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:emerald_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:emerald_basalt_blasting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_emerald_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/minecraft/advancements/recipes/misc/emerald_basalt_smelting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:emerald_basalt_smelting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_emerald_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:emerald_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:emerald_basalt_smelting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_emerald_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/minecraft/advancements/recipes/misc/gold_basalt_blasting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:gold_basalt_blasting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_gold_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:gold_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:gold_basalt_blasting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_gold_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/minecraft/advancements/recipes/misc/gold_basalt_smelting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:gold_basalt_smelting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_gold_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:gold_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:gold_basalt_smelting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_gold_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/minecraft/advancements/recipes/misc/iron_basalt_blasting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:iron_basalt_blasting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_iron_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:iron_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:iron_basalt_blasting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_iron_ore",
+      "has_the_recipe"
+    ]
+  ]
+}

src/generated/resources/data/minecraft/advancements/recipes/misc/iron_basalt_smelting.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:iron_basalt_smelting"
+    ]
+  },
+  "criteria": {
+    "has_basalt_iron_ore": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "janoeo:iron_basalt_ore"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:iron_basalt_smelting"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_basalt_iron_ore",
+      "has_the_recipe"
+    ]
+  ]
+}