diff --git a/README.md b/README.md index 5ad8b44..c3de48d 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,9 @@ the [release page](https://minecraft.curseforge.com/projects/just-enough-calcula - Recipe can be transferred from NEI recipe overlay gui (`shift` + click `?` button) - [x] vanilla - [x] gregtech - - [x] Forestry - - [x] Avaritia (hard to find the transfer button) + - [x] Forestry (`?` button may overlap with the fluid tank. Click carefully) + - [x] Avaritia (`?` button may be covered by the NEI search bar) + - [x] GT++ (support GT++ 1.7.05.68 (GTNH 2.1.0.0), have not tested old versions) - [ ] AE2 - [ ] Others - [x] Item from NEI item panel @@ -51,6 +52,8 @@ Tutorial links: ## TODO - add new button to transfer the recipe. +- [ ] convert GT item fluid to fluid +- [ ] EnderIO ## Known Issues diff --git a/README_CN.md b/README_CN.md index ac5cc70..99ef584 100644 --- a/README_CN.md +++ b/README_CN.md @@ -25,8 +25,9 @@ This mod is focused on calculation, so you might find it powerful and high perfo - 可以从 NEI 合成表 gui 页面直接获取合成表 (`shift` + 单击 `?` 按钮) - [x] 原生MC - [x] gregtech - - [x] Forestry - - [x] Avaritia (转移按钮不容易找到) + - [x] Forestry (`?` 按钮可能与流体重叠,不是很好点到) + - [x] Avaritia (`?` 按钮可能会被NEI搜索栏遮盖) + - [x] GT++ (支持 GT++ 1.7.05.68 版本(GTNH 2.1.0.0),老版本没有测试过) - [ ] AE2(目前没办法,需要 AE2 作者支持 - [ ] 其它 - [x] 从 NEI 物品列表抓取物品 diff --git a/build.gradle b/build.gradle index 3565209..bf20c39 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,6 @@ buildscript { repositories { mavenCentral() - jcenter() maven { name = "gt" url = "https://gregtech.overminddl1.com/" @@ -93,7 +92,7 @@ dependencies { // soft dependencies compile 'forestry:forestry_1.7.10-4.3.1.44' compile 'gregtech:gregtech-5.09.34.16' - compile 'fox.spiteful.avaritia:Avaritia-1.18' + compile 'gtPlusPlus:GT-PlusPlus-1.7.05.68' } processResources { diff --git a/libs/Avaritia-1.18.jar b/libs/Avaritia-1.18.jar deleted file mode 100644 index 2c5d1b0..0000000 Binary files a/libs/Avaritia-1.18.jar and /dev/null differ diff --git a/libs/GT-PlusPlus-1.7.05.68.jar b/libs/GT-PlusPlus-1.7.05.68.jar new file mode 100644 index 0000000..caf54f3 Binary files /dev/null and b/libs/GT-PlusPlus-1.7.05.68.jar differ diff --git a/src/main/java/me/towdium/jecalculation/nei/Adapter.java b/src/main/java/me/towdium/jecalculation/nei/Adapter.java index 52efd77..bc11de5 100644 --- a/src/main/java/me/towdium/jecalculation/nei/Adapter.java +++ b/src/main/java/me/towdium/jecalculation/nei/Adapter.java @@ -13,6 +13,7 @@ public class Adapter { public static List adapters = new ArrayList<>(); public static void init() { + JustEnoughCalculation.logger.info("=====Just Enough Calculation Init Start====="); if (Loader.isModLoaded("Forestry")) { JustEnoughCalculation.logger.info("Forestry installed"); adapters.add(new Forestry()); @@ -25,14 +26,20 @@ public class Adapter { JustEnoughCalculation.logger.info("gregtech installed"); adapters.add(new GregTech()); } -// if (Loader.isModLoaded("miscutils")) { -// JustEnoughCalculation.logger.info("gt++ not supported"); -// adapters.add(new GTPP()); -// } + try { + if (Loader.isModLoaded("miscutils")) { + adapters.add(new GTPP()); + JustEnoughCalculation.logger.info("gt++ installed"); + } + } catch (Exception e) { + JustEnoughCalculation.logger.info("exception when installing gt++"); + e.printStackTrace(); + } if (Loader.isModLoaded("Avaritia")) { JustEnoughCalculation.logger.info("Avaritia installed"); adapters.add(new Avaritia()); } + JustEnoughCalculation.logger.info("=====Just Enough Calculation Init Finish====="); } public static void handleRecipe(IRecipeHandler recipe, int index, List inputs, List outputs) { diff --git a/src/main/java/me/towdium/jecalculation/nei/NEICalculatorConfig.java b/src/main/java/me/towdium/jecalculation/nei/NEICalculatorConfig.java index 3d7d753..b8ce670 100644 --- a/src/main/java/me/towdium/jecalculation/nei/NEICalculatorConfig.java +++ b/src/main/java/me/towdium/jecalculation/nei/NEICalculatorConfig.java @@ -17,6 +17,7 @@ public class NEICalculatorConfig implements IConfigureNEI { @Override public void loadConfig() { + Adapter.init(); /* null For the recipeHandlers which extend `TemplateRecipeHandler` without override the `getOverlayIdentifier` function */ Set baseOverlayIdentifiers = new HashSet<>( Arrays.asList("crafting", "crafting2x2", "smelting", "fuel", "brewing", null)); diff --git a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java index 21c1eae..f036441 100644 --- a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java +++ b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java @@ -18,7 +18,6 @@ public class NEIPlugin { public static void init() { GuiContainerManager.addTooltipHandler(new JecaTooltipHandler()); - Adapter.init(); // nei version check String neiVersion = Loader.instance().getIndexedModList().get("NotEnoughItems").getVersion(); JustEnoughCalculation.logger.info("NEI version: " + neiVersion); diff --git a/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java b/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java index 7dac22c..c61ab72 100644 --- a/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java +++ b/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java @@ -1,10 +1,10 @@ package me.towdium.jecalculation.nei.adapter; import codechicken.nei.recipe.IRecipeHandler; -import codechicken.nei.recipe.TemplateRecipeHandler; -import me.towdium.jecalculation.JustEnoughCalculation; +import gregtech.api.util.GTPP_Recipe; import javax.annotation.ParametersAreNonnullByDefault; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -15,30 +15,54 @@ import java.util.stream.Stream; * don't work, why? */ @ParametersAreNonnullByDefault -public class GTPP /* extends GregTech */ { -// -// private final static Set> defaultHandlers = Stream.of( -// GTPP_NEI_DefaultHandler.class, GT_NEI_VacFurnace.class, GT_NEI_RFPP.class, -// GT_NEI_multiCentriElectroFreezer.class, GT_NEI_MillingMachine.class, GT_NEI_FluidReactor.class, -// GT_NEI_FlotationCell.class, DecayableRecipeHandler.class).collect(Collectors.toSet()); -// -// @Override -// public Set getAllOverlayIdentifier() { -// Set recipeNames = GTPP_Recipe.GT_Recipe_Map.sMappings.stream() -// .map(gt_recipe_map -> gt_recipe_map.mNEIName) -// .collect(Collectors.toSet()); -// recipeNames.add("GTPP_Decayables"); -// JustEnoughCalculation.logger.info("GTPP recipe handlers cecipe name"); -// for (String recipeName : recipeNames) { -// JustEnoughCalculation.logger.info(" " + recipeName); -// } -// return recipeNames; -// } -// -// @Override -// public void handleRecipe(IRecipeHandler recipe, int index, List inputs, List outputs) { -// if (defaultHandlers.stream().anyMatch(aClass -> aClass.isInstance(recipe))) { -// handleDefault(recipe, index, inputs, outputs); -// } -// } +public class GTPP extends GregTech { + + private final static Set> defaultHandlers; + + static { + List handlers = Stream.of( + // gtpp after 2020/5/30 + "GTPP_NEI_DefaultHandler", "GT_NEI_VacFurnace", "GT_NEI_RFPP", "GT_NEI_multiCentriElectroFreezer", + "GT_NEI_MillingMachine", "GT_NEI_FluidReactor", "GT_NEI_FlotationCell", "DecayableRecipeHandler", + // gtpp before 2020/5/30 + "GT_NEI_DefaultHandler", "GT_NEI_Dehydrator", "GT_NEI_MultiBlockHandler", "GTPP_NEI_CustomMapHandler", + "GTPP_NEI_DefaultHandlerEx" + + ).map(name -> "gtPlusPlus.nei." + name).collect(Collectors.toList()); defaultHandlers = new HashSet<>(); + for (String handler : handlers) { + try { + defaultHandlers.add(Class.forName(handler)); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + } + } + + @Override + public Set getAllOverlayIdentifier() { + Set recipeNames = new HashSet<>(); + try { + // add as many recipe as possible + recipeNames.addAll( + GTPP_Recipe.GT_Recipe_Map.sMappings.stream().map(rm -> rm.mNEIName).collect(Collectors.toSet())); + recipeNames.addAll( + GTPP_Recipe.GTPP_Recipe_Map.sMappings.stream().map(rm -> rm.mNEIName).collect(Collectors.toSet())); + recipeNames.addAll(GTPP_Recipe.GTPP_Recipe_Map_Internal.sMappingsEx.stream() + .map(rm -> rm.mNEIName) + .collect(Collectors.toSet())); + } catch (Exception e) { + e.printStackTrace(); + } + // which one? + recipeNames.add("GTPP_Decayables"); + recipeNames.add("Decayables"); + return recipeNames; + } + + @Override + public void handleRecipe(IRecipeHandler recipe, int index, List inputs, List outputs) { + if (defaultHandlers.stream().anyMatch(aClass -> aClass.isInstance(recipe))) { + handleDefault(recipe, index, inputs, outputs); + } + } }