add recipe conditions to prevent logspam

luxtracon · Nov 22, 2022 · dd82e30 · dd82e30
1 parent bb56a86
commit dd82e30
Show file tree

Hide file tree

Showing 84 changed files with 494 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ version = "${minecraft}-${floralis}"
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
-    mappings channel: 'official', version: '1.19'
+    mappings channel: 'official', version: "${minecraft}"
 
     runs {
         client {

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false
 
-floralis=5.3.0
+floralis=5.4.0
 forge=42.0.9
 minecraft=1.19.1
 

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_cactus.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_cactus.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:black_cactus"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_cactus_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_cactus_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:black_cactus_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_flower.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_flower.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:black_flower"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_flower_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_flower_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:black_flower_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_petals.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/black_petals.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:black_petals"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_cactus.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_cactus.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:blue_cactus"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_cactus_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_cactus_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:blue_cactus_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_flower.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_flower.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:blue_flower"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_flower_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_flower_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:blue_flower_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_petals.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/blue_petals.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:blue_petals"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_cactus.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_cactus.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:brown_cactus"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_cactus_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_cactus_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:brown_cactus_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_flower.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_flower.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:brown_flower"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_flower_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_flower_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:brown_flower_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_petals.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/brown_petals.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:brown_petals"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_cactus.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_cactus.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:cyan_cactus"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_cactus_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_cactus_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:cyan_cactus_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_flower.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_flower.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:cyan_flower"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_flower_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_flower_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:cyan_flower_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_petals.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/cyan_petals.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:cyan_petals"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_cactus.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_cactus.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:gray_cactus"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_cactus_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_cactus_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:gray_cactus_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_flower.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_flower.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:gray_flower"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_flower_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_flower_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:gray_flower_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_petals.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/gray_petals.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:gray_petals"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_cactus.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_cactus.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:green_cactus"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_cactus_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_cactus_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:green_cactus_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_flower.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_flower.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:green_flower"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_flower_seeds.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_flower_seeds.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:green_flower_seeds"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_petals.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/green_petals.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:green_petals"

diff --git a/src/main/resources/data/mekanism/recipes/crushing/biofuel/light_blue_cactus.json b/src/main/resources/data/mekanism/recipes/crushing/biofuel/light_blue_cactus.json
@@ -1,5 +1,11 @@
 {
   "type": "mekanism:crushing",
+  "conditions": [
+    {
+      "type": "forge:mod_loaded",
+      "modid": "mekanism"
+    }
+  ],
   "input": {
     "ingredient": {
       "item": "floralis:light_blue_cactus"