Migrate to new RecipeMap (#261)

* Migrate to new RecipeMap

* update gradle+deps+bs

---------

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

.gitignore

@@ -1,6 +1,7 @@
 .gradle
 .settings
 /.idea/
+/.vscode/
 /run/
 /build/
 /eclipse/
@@ -25,7 +26,13 @@ whitelist.json
 *.iml
 *.ipr
 *.iws
-src/main/resources/mixins.*.json
+src/main/resources/mixins.*([!.]).json
 *.bat
-.vscode/settings.json
+*.DS_Store
+!gradlew.bat
 .factorypath
+addon.local.gradle
+addon.local.gradle.kts
+addon.late.local.gradle
+addon.late.local.gradle.kts
+layout.json

build.gradle

@@ -1,4 +1,4 @@
-//version: 1700844281
+//version: 1701530445
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit
 
 buildscript {
     repositories {
-        mavenCentral()
-
-        maven {
-            name 'forge'
-            url 'https://maven.minecraftforge.net'
-        }
         maven {
             // GTNH RetroFuturaGradle and ASM Fork
             name "GTNH Maven"
             url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
             allowInsecureProtocol = true
         }
-        maven {
-            name 'sonatype'
-            url 'https://oss.sonatype.org/content/repositories/snapshots/'
-        }
-        maven {
-            name 'Scala CI dependencies'
-            url 'https://repo1.maven.org/maven2/'
-        }
-
         mavenLocal()
     }
 }
@@ -793,12 +778,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
 }
 
 dependencies {
-    def lwjgl3ifyVersion = '1.5.1'
+    def lwjgl3ifyVersion = '1.5.7'
     if (modId != 'lwjgl3ify') {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
     }
 
     java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
@@ -1310,7 +1295,7 @@ def addCurseForgeRelation(String type, String name) {
 
 // Updating
 
-def buildscriptGradleVersion = "8.2.1"
+def buildscriptGradleVersion = "8.5"
 
 tasks.named('wrapper', Wrapper).configure {
     gradleVersion = buildscriptGradleVersion

dependencies.gradle

@@ -2,24 +2,24 @@
 
 dependencies {
     shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.90:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.96:dev')
     api('com.github.GTNewHorizons:Yamcl:0.5.86:dev')
     implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.1.3:dev')
 
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf") {transitive=false}
-    compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.10.11-GTNH:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.19-GTNH:dev') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.32:dev') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.34:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:Avaritia:1.46:dev') {transitive=false}
 
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
     compileOnly("curse.maven:extra-utilities-225561:2264384") {transitive=false}
 
     // for testing EOH recipes
     //runtimeOnlyNonPublishable("TGregworks:TGregworks:1.7.10-GTNH-1.0.23:deobf")
-    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.10.11-GTNH:dev')
-    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.40:dev')
-    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.7.6:dev') {
+    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev')
+    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.43:dev')
+    //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GoodGenerator:0.7.9:dev') {
     //    exclude group: "com.github.GTNewHorizons", module: "TecTech"
     //}
     //runtimeOnlyNonPublishable("curse.maven:extra-utilities-225561:2264384") {transitive=false}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,10 +130,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.

src/main/java/com/github/technus/tectech/TecTech.java

@@ -9,9 +9,9 @@
 import com.github.technus.tectech.loader.TecTechConfig;
 import com.github.technus.tectech.loader.gui.CreativeTabTecTech;
 import com.github.technus.tectech.mechanics.enderStorage.EnderWorldSavedData;
-import com.github.technus.tectech.nei.IMCForNEI;
 import com.github.technus.tectech.proxy.CommonProxy;
 import com.github.technus.tectech.recipe.EyeOfHarmonyRecipeStorage;
+import com.github.technus.tectech.recipe.TecTechRecipeMaps;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
@@ -85,6 +85,7 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) {
         FMLCommonHandler.instance().bus().register(enderWorldSavedData);
         MinecraftForge.EVENT_BUS.register(enderWorldSavedData);
 
+        TecTechRecipeMaps.init();
         MainLoader.preLoad();
     }
 
@@ -95,7 +96,6 @@ public void Load(FMLInitializationEvent event) {
 
         MainLoader.load();
         MainLoader.addAfterGregTechPostLoadRunner();
-        IMCForNEI.IMCSender();
     }
 
     @Mod.EventHandler

src/main/java/com/github/technus/tectech/loader/MainLoader.java

@@ -28,6 +28,7 @@
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
+import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.util.GT_Recipe;
 
 @SuppressWarnings("deprecation")
@@ -146,7 +147,7 @@ private static void FixBrokenFusionRecipes() {
                 }
             }
         }
-        for (GT_Recipe r : GT_Recipe.GT_Recipe_Map.sFusionRecipes.mRecipeList) {
+        for (GT_Recipe r : RecipeMaps.fusionRecipes.getAllRecipes()) {
             Fluid fluid = binds.get(r.mFluidOutputs[0].getFluid());
             if (fluid != null) {
                 if (DEBUG_MODE) {