EMI support and more

build.gradle

@@ -63,6 +63,7 @@ var settings = new Object() {
     boolean megane
     boolean modmenu
     boolean rei
+    boolean emi
     boolean theOneProbe
     boolean kubejs
     boolean techReborn
@@ -80,6 +81,7 @@ dependencies {
     modImplementation "net.fabricmc.fabric-api:fabric-api:$fabric_version"
 
     modCompileOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:$rei_version"
+    modCompileOnly "dev.emi:emi-fabric:$emi_version:api"
     modCompileOnly "dev.latvian.mods:kubejs-fabric:$kubejs_version"
     modCompileOnly "com.terraformersmc:modmenu:$modmenu_version"
 
@@ -88,11 +90,15 @@ dependencies {
 
     // Add generated data to runtime classpath (slightly hacky)
     runtimeOnly files("src/main/generated")
+    modRuntimeOnly "me.shedaniel.cloth:cloth-config-fabric:$cloth_config_version"
 
     if (settings.rei) {
         modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:$rei_version"
         modRuntimeOnly "dev.architectury:architectury-fabric:$architectury_version"
     }
+    if (settings.emi) {
+        modRuntimeOnly "dev.emi:emi-fabric:$emi_version"
+    }
     // Disabled: no 1.19.3 support
     //if (settings.kubejs) modRuntimeOnly "dev.latvian.mods:kubejs-fabric:$kubejs_version"
     if (settings.modmenu) modRuntimeOnly "com.terraformersmc:modmenu:$modmenu_version"
@@ -164,6 +170,8 @@ tasks.runDatagen.dependsOn(tasks.copyDatagenOverrides)
 // Delete datagen on clean
 clean.delete("src/main/generated")
 
+
+import groovy.json.JsonException
 import groovy.json.JsonSlurper
 import groovy.json.JsonOutput
 
@@ -175,8 +183,12 @@ processResources {
     }
 
     doLast {
-        fileTree(dir: outputs.files.asPath, include: "**/*.json").each {
-            File file -> file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
+        fileTree(dir: outputs.files.asPath, include: "**/*.json").each { File file ->
+            try {
+                file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
+            } catch (JsonException e) {
+                throw new RuntimeException("Failed to minify json for $file", e)
+            }
         }
     }
 }

changelog/1.0.0-beta.2+1.20.1.md

@@ -1,3 +1,7 @@
 * Fix recipe serialization not working on dedicated servers
 * Make barrel recipe abort if connections change
-* Make rei compat code slightly more safe
+* Make rei compat code slightly more safe
+* Add EMI compat
+* Fix lighting on REI entities
+* Add recipes for mangrove blocks
+* Increase leaking chance so that it actually happens and fix leak placement

config.gradle

@@ -2,7 +2,7 @@ import java.nio.file.Files
 
 var path = project.file("dev_settings.properties").toPath()
 var properties = new Properties()
-properties.putAll(wthit: "false", the_one_probe: "true", modmenu: "true", rei: "true", kubejs: "false", tech_reborn: "false", industrial_revolution: "false", modern_industrialization: "false", jade: "false")
+properties.putAll(wthit: "false", the_one_probe: "true", modmenu: "true", rei: "true", emi: "false", kubejs: "false", tech_reborn: "false", industrial_revolution: "false", modern_industrialization: "false", jade: "false")
 
 if (Files.exists(path)) {
     properties.load(Files.newBufferedReader(path))
@@ -14,6 +14,7 @@ wthit = Boolean.parseBoolean(properties.getProperty("wthit"))
 megane = Boolean.parseBoolean(properties.getProperty("megane"))
 modmenu = Boolean.parseBoolean(properties.getProperty("modmenu"))
 rei = Boolean.parseBoolean(properties.getProperty("rei"))
+emi = Boolean.parseBoolean(properties.getProperty("emi"))
 theOneProbe = Boolean.parseBoolean(properties.getProperty("the_one_probe"))
 kubejs = Boolean.parseBoolean(properties.getProperty("kubejs"))
 techReborn = Boolean.parseBoolean(properties.getProperty("tech_reborn"))

gradle.properties

@@ -11,6 +11,7 @@ maven_group=wraith.fabricaeexnihilo
 archives_base_name=wraith-fabricaeexnihilo
 # Dependencies
 fabric_version=0.84.0+1.20.1
+emi_version=1.0.9+1.20.1
 rei_version=12.0.622
 architectury_version=9.0.6
 modmenu_version=7.0.0
@@ -21,3 +22,4 @@ megane_version=8.3.0
 tech_reborn_version=5.8.0
 modern_industrialization_version=1.3.2
 industrial_revolution_version=3940035
+cloth_config_version=11.1.106

src/main/generated/data/fabricaeexnihilo/advancements/recipes/decorations/barrel/mangrove.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_planks": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:mangrove_planks"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "fabricaeexnihilo:barrel/mangrove"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_planks",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "fabricaeexnihilo:barrel/mangrove"
+    ]
+  },
+  "sends_telemetry_event": false
+}

src/main/generated/data/fabricaeexnihilo/advancements/recipes/decorations/crucible/mangrove.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_log": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:mangrove_log"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "fabricaeexnihilo:crucible/mangrove"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_log",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "fabricaeexnihilo:crucible/mangrove"
+    ]
+  },
+  "sends_telemetry_event": false
+}

src/main/generated/data/fabricaeexnihilo/advancements/recipes/decorations/sieve/mangrove.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_planks": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:mangrove_planks"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "fabricaeexnihilo:sieve/mangrove"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_planks",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "fabricaeexnihilo:sieve/mangrove"
+    ]
+  },
+  "sends_telemetry_event": false
+}

src/main/generated/data/fabricaeexnihilo/advancements/recipes/decorations/strainer/mangrove.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_log": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:mangrove_log"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "fabricaeexnihilo:strainer/mangrove"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_log",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "fabricaeexnihilo:strainer/mangrove"
+    ]
+  },
+  "sends_telemetry_event": false
+}

src/main/generated/data/fabricaeexnihilo/recipes/barrel/mangrove.json

@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "group": "fabricaeexnihilo:barrel",
+  "key": {
+    "#": {
+      "item": "minecraft:mangrove_planks"
+    },
+    "S": {
+      "item": "minecraft:mangrove_slab"
+    }
+  },
+  "pattern": [
+    "# #",
+    "# #",
+    "#S#"
+  ],
+  "result": {
+    "item": "fabricaeexnihilo:mangrove_barrel"
+  },
+  "show_notification": true
+}

src/main/generated/data/fabricaeexnihilo/recipes/barrel_crafting/leaking/crushed_netherrack.json

@@ -17,6 +17,6 @@
   "icon": "fabricaeexnihilo:crushed_netherrack",
   "trigger": {
     "type": "tick",
-    "chance": 0.01
+    "chance": 0.1
   }
 }

src/main/generated/data/fabricaeexnihilo/recipes/barrel_crafting/leaking/crushed_netherrack_with_blood.json

@@ -17,6 +17,6 @@
   "icon": "fabricaeexnihilo:crushed_netherrack",
   "trigger": {
     "type": "tick",
-    "chance": 0.01
+    "chance": 0.1
   }
 }

src/main/generated/data/fabricaeexnihilo/recipes/barrel_crafting/leaking/mossy_cobblestone.json

@@ -17,6 +17,6 @@
   "icon": "minecraft:mossy_cobblestone",
   "trigger": {
     "type": "tick",
-    "chance": 0.01
+    "chance": 0.1
   }
 }

src/main/generated/data/fabricaeexnihilo/recipes/barrel_crafting/leaking/mossy_stone_bricks.json

@@ -17,6 +17,6 @@
   "icon": "minecraft:mossy_stone_bricks",
   "trigger": {
     "type": "tick",
-    "chance": 0.01
+    "chance": 0.1
   }
 }

src/main/generated/data/fabricaeexnihilo/recipes/barrel_crafting/leaking/mushroom.json

@@ -17,6 +17,6 @@
   "icon": "minecraft:brown_mushroom",
   "trigger": {
     "type": "tick",
-    "chance": 0.01
+    "chance": 0.1
   }
 }

src/main/generated/data/fabricaeexnihilo/recipes/barrel_crafting/leaking/mycelium.json

@@ -20,6 +20,6 @@
   "icon": "minecraft:mycelium",
   "trigger": {
     "type": "tick",
-    "chance": 0.01
+    "chance": 0.1
   }
 }

src/main/generated/data/fabricaeexnihilo/recipes/barrel_crafting/leaking/netherrack.json

@@ -17,6 +17,6 @@
   "icon": "minecraft:netherrack",
   "trigger": {
     "type": "tick",
-    "chance": 0.01
+    "chance": 0.1
   }
 }

src/main/generated/data/fabricaeexnihilo/recipes/barrel_crafting/leaking/soul_sand.json

@@ -17,6 +17,6 @@
   "icon": "minecraft:soul_sand",
   "trigger": {
     "type": "tick",
-    "chance": 0.01
+    "chance": 0.1
   }
 }

src/main/generated/data/fabricaeexnihilo/recipes/barrel_crafting/leaking/soul_soil.json

@@ -17,6 +17,6 @@
   "icon": "minecraft:soul_soil",
   "trigger": {
     "type": "tick",
-    "chance": 0.01
+    "chance": 0.1
   }
 }

src/main/generated/data/fabricaeexnihilo/recipes/crucible/mangrove.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "group": "fabricaeexnihilo:crucible",
+  "key": {
+    "#": {
+      "item": "minecraft:mangrove_log"
+    },
+    "I": {
+      "item": "minecraft:stick"
+    },
+    "S": {
+      "item": "minecraft:mangrove_slab"
+    }
+  },
+  "pattern": [
+    "# #",
+    "#S#",
+    "I I"
+  ],
+  "result": {
+    "item": "fabricaeexnihilo:mangrove_crucible"
+  },
+  "show_notification": true
+}