Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Commit

Permalink
Migrate to new RecipeMap
Browse files Browse the repository at this point in the history
  • Loading branch information
miozune committed Dec 1, 2023
1 parent 7e0704c commit 7564ddb
Show file tree
Hide file tree
Showing 26 changed files with 403 additions and 1,326 deletions.
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.gradle
.settings
/.idea/
/.vscode/
/run/
/build/
/eclipse/
Expand All @@ -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
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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.92-pre:dev')
api('com.github.GTNewHorizons:Yamcl:0.5.86:dev')
implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.1.3:dev')

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/github/technus/tectech/TecTech.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -85,6 +85,7 @@ public void PreLoad(FMLPreInitializationEvent PreEvent) {
FMLCommonHandler.instance().bus().register(enderWorldSavedData);
MinecraftForge.EVENT_BUS.register(enderWorldSavedData);

TecTechRecipeMaps.init();
MainLoader.preLoad();
}

Expand All @@ -95,7 +96,6 @@ public void Load(FMLInitializationEvent event) {

MainLoader.load();
MainLoader.addAfterGregTechPostLoadRunner();
IMCForNEI.IMCSender();
}

@Mod.EventHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,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")
Expand Down Expand Up @@ -143,7 +144,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) {
Expand Down
45 changes: 0 additions & 45 deletions src/main/java/com/github/technus/tectech/nei/IMCForNEI.java

This file was deleted.

35 changes: 0 additions & 35 deletions src/main/java/com/github/technus/tectech/nei/NEI_TT_Config.java

This file was deleted.

This file was deleted.

Loading

0 comments on commit 7564ddb

Please sign in to comment.