update

Co-authored-by: Martin Robertz <[email protected]>

dependencies.gradle

@@ -1,24 +1,24 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:EnderCore:0.4.8:dev') {transitive = false}
+    api('com.github.GTNewHorizons:EnderCore:0.5.0:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.17:dev')
-    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.91-GTNH:dev')
-    api("com.github.GTNewHorizons:GTNHLib:0.6.40:dev")
+    compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.8.11-GTNH:dev')
+    api("com.github.GTNewHorizons:GTNHLib:0.7.0:dev")
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
-    api("com.github.GTNewHorizons:TinkersConstruct:1.13.54-GTNH:dev")
+    api("com.github.GTNewHorizons:TinkersConstruct:1.14.4-GTNH:dev")
 
-    compileOnly('com.github.GTNewHorizons:waila:1.8.14:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-691-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.16-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.474:dev') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:ModularUI2:2.2.10-1.7.10:dev") {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.9-GTNH:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Chisel:2.16.14-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.20-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.9.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-714-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.32:dev') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:ModularUI2:2.3.1-1.7.10:dev") {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.17.0:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.2.0-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Chisel:2.17.0-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.0-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
@@ -26,6 +26,6 @@ dependencies {
     compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797
     compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta62:api') {transitive = false}
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.3:dev")
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta60:api') {transitive = false}
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.2:dev")
 }

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.44'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43'
 }
 
 

src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java

@@ -20,6 +20,7 @@ import crazypants.enderio.material.FrankenSkull;
 import crazypants.enderio.material.Material;
 import crazypants.enderio.power.Capacitors;
 import thaumcraft.api.ThaumcraftApi;
+import thaumcraft.api.ThaumcraftApiHelper;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.api.aspects.AspectList;
 
@@ -152,6 +153,19 @@ public class ThaumcraftCompat {
         ThaumcraftApi.registerObjectTag(
                 new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.ENLIGHTENED_GLASS.ordinal()),
                 new AspectList().add(Aspect.CRYSTAL, 2).add(Aspect.LIGHT, 8).add(Aspect.SENSES, 2));
+
+        // This is a horrible hack due to the fact that I am assembling my aspects after TC does recipe parsing
+        // Therefore I redo all EIO items
+        for (Object o : Item.itemRegistry.getKeys()) {
+            if (o instanceof String) {
+                String ownermod = ((String) o).substring(0, ((String) o).indexOf(':'));
+                if (EnderIO.MODID.equals(ownermod)) {
+                    for (int idx = 0; idx < 16; idx++) {
+                        addAspectsFromRecipes((Item) Item.itemRegistry.getObject((String) o), idx);
+                    }
+                }
+            }
+        }
     }
 
     private static AspectList getAspects(Block block) {
@@ -171,6 +185,10 @@ public class ThaumcraftCompat {
         return new AspectList(item);
     }
 
+    private static void addAspectsFromRecipes(Item item, int meta) {
+        ThaumcraftApi.registerObjectTag(new ItemStack(item, 1, meta), ThaumcraftApiHelper.generateTags(item, meta));
+    }
+
     public static void loadUpgrades(List<IDarkSteelUpgrade> upgrades) {
         upgrades.add(GogglesOfRevealingUpgrade.INSTANCE);
     }