diff --git a/README.md b/README.md index 9e73c27..6a99419 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,9 @@ the [release page](https://minecraft.curseforge.com/projects/just-enough-calcula - [x] vanilla - [x] gregtech - [x] Forestry + - [x] Avaritia (hard to find the transfer button) - [ ] AE2 + - [ ] GT++ - [ ] Others - [x] Item from NEI item panel - [ ] Fluid from NEI item panel (Now need to get fluid from labels picker) @@ -34,7 +36,7 @@ the [release page](https://minecraft.curseforge.com/projects/just-enough-calcula ## TODO -- Handle nei key binding (`R` to open recipe and `U` to open usage) +- add new button to transfer the recipe. ## Known Issues diff --git a/README_CN.md b/README_CN.md index 4702fb9..76ef99a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -25,12 +25,18 @@ This mod is focused on calculation, so you might find it powerful and high perfo - [x] 原生MC - [x] gregtech - [x] Forestry + - [x] Avaritia (转移按钮不容易找到) - [ ] AE2(目前没办法,需要 AE2 作者支持 + - [ ] GT++ - [ ] 其它 - [x] 从 NEI 物品列表抓取物品 - [ ] 从 NEI 物品列表抓取流体 (暂未实现,目前请从 计算器内部流体标签 抓取流体) - [x] 矿物词典支持 +## TODO + +- NEI 合成表界面添加新按钮转移合成表 + ## 已知问题 - [ ] 如果在进入是世界后立刻打开计算器 gui,游戏可能会 **崩溃 (强烈建议进入世界后等 3~4 秒)** diff --git a/build.gradle b/build.gradle index 3de53aa..6f53e79 100644 --- a/build.gradle +++ b/build.gradle @@ -93,6 +93,8 @@ dependencies { // soft dependencies compile 'forestry:forestry_1.7.10-4.3.1.44' compile 'gregtech:gregtech-5.09.34.16' + compile 'gtPlusPlus:GT-PlusPlus-1.7.05.68' + compile 'fox.spiteful.avaritia:Avaritia-1.18' } processResources { diff --git a/libs/Avaritia-1.18.jar b/libs/Avaritia-1.18.jar new file mode 100644 index 0000000..2c5d1b0 Binary files /dev/null and b/libs/Avaritia-1.18.jar 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/JecaConfig.java b/src/main/java/me/towdium/jecalculation/JecaConfig.java index 5b93e29..4b476d9 100644 --- a/src/main/java/me/towdium/jecalculation/JecaConfig.java +++ b/src/main/java/me/towdium/jecalculation/JecaConfig.java @@ -1,6 +1,5 @@ package me.towdium.jecalculation; -import codechicken.core.CommonUtils; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.common.config.Configuration; @@ -15,6 +14,7 @@ public class JecaConfig { public static final File defaultFile = new File(configDir, "default.json"); public static final File dataDir = new File(configDir, "data/"); + public static File getDataFile(String group) { return new File(dataDir, group + ".json"); } diff --git a/src/main/java/me/towdium/jecalculation/event/handlers/NEIEventHandler.java b/src/main/java/me/towdium/jecalculation/event/handlers/NEIEventHandler.java index 268fd9e..b83499a 100644 --- a/src/main/java/me/towdium/jecalculation/event/handlers/NEIEventHandler.java +++ b/src/main/java/me/towdium/jecalculation/event/handlers/NEIEventHandler.java @@ -3,7 +3,6 @@ package me.towdium.jecalculation.event.handlers; import codechicken.nei.NEIClientConfig; import codechicken.nei.NEIClientUtils; import codechicken.nei.guihook.IContainerInputHandler; -import me.towdium.jecalculation.JustEnoughCalculation; import me.towdium.jecalculation.data.label.ILabel; import me.towdium.jecalculation.gui.JecaGui; import me.towdium.jecalculation.nei.NEIPlugin; diff --git a/src/main/java/me/towdium/jecalculation/nei/Adapter.java b/src/main/java/me/towdium/jecalculation/nei/Adapter.java index 6309ea3..a07faa8 100644 --- a/src/main/java/me/towdium/jecalculation/nei/Adapter.java +++ b/src/main/java/me/towdium/jecalculation/nei/Adapter.java @@ -4,10 +4,7 @@ import codechicken.nei.PositionedStack; import codechicken.nei.recipe.IRecipeHandler; import cpw.mods.fml.common.Loader; import me.towdium.jecalculation.JustEnoughCalculation; -import me.towdium.jecalculation.nei.adapter.AE2; -import me.towdium.jecalculation.nei.adapter.Forestry; -import me.towdium.jecalculation.nei.adapter.GregTech; -import me.towdium.jecalculation.nei.adapter.IAdapter; +import me.towdium.jecalculation.nei.adapter.*; import java.util.ArrayList; import java.util.List; @@ -21,13 +18,21 @@ public class Adapter { adapters.add(new Forestry()); } if (Loader.isModLoaded("appliedenergistics2")) { - JustEnoughCalculation.logger.info("ae2 installed"); + JustEnoughCalculation.logger.info("ae2 not supported"); adapters.add(new AE2()); } if (Loader.isModLoaded("gregtech")) { JustEnoughCalculation.logger.info("gregtech installed"); adapters.add(new GregTech()); } + if (Loader.isModLoaded("miscutils")) { + JustEnoughCalculation.logger.info("gt++ not supported"); + adapters.add(new GTPP()); + } + if (Loader.isModLoaded("Avaritia")) { + JustEnoughCalculation.logger.info("Avaritia installed"); + adapters.add(new Avaritia()); + } } public static void handleRecipe(IRecipeHandler recipe, int index, List inputs, List outputs) { diff --git a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java index e5b9ac5..21c1eae 100644 --- a/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java +++ b/src/main/java/me/towdium/jecalculation/nei/NEIPlugin.java @@ -1,7 +1,8 @@ package me.towdium.jecalculation.nei; import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.recipe.*; +import codechicken.nei.recipe.GuiCraftingRecipe; +import codechicken.nei.recipe.GuiUsageRecipe; import cpw.mods.fml.common.Loader; import me.towdium.jecalculation.JustEnoughCalculation; import me.towdium.jecalculation.data.label.ILabel; diff --git a/src/main/java/me/towdium/jecalculation/nei/adapter/AE2.java b/src/main/java/me/towdium/jecalculation/nei/adapter/AE2.java index fe11482..dd33582 100644 --- a/src/main/java/me/towdium/jecalculation/nei/adapter/AE2.java +++ b/src/main/java/me/towdium/jecalculation/nei/adapter/AE2.java @@ -2,11 +2,13 @@ package me.towdium.jecalculation.nei.adapter; import codechicken.nei.recipe.IRecipeHandler; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; +@ParametersAreNonnullByDefault public class AE2 implements IAdapter{ @Override public Set getAllOverlayIdentifier() { diff --git a/src/main/java/me/towdium/jecalculation/nei/adapter/AdapterUtil.java b/src/main/java/me/towdium/jecalculation/nei/adapter/AdapterUtil.java index a011de1..49fb236 100644 --- a/src/main/java/me/towdium/jecalculation/nei/adapter/AdapterUtil.java +++ b/src/main/java/me/towdium/jecalculation/nei/adapter/AdapterUtil.java @@ -1,10 +1,6 @@ package me.towdium.jecalculation.nei.adapter; -import codechicken.nei.recipe.IRecipeHandler; - import javax.annotation.ParametersAreNonnullByDefault; -import java.util.ArrayList; -import java.util.List; import java.util.Optional; @SuppressWarnings("rawtypes") diff --git a/src/main/java/me/towdium/jecalculation/nei/adapter/Avaritia.java b/src/main/java/me/towdium/jecalculation/nei/adapter/Avaritia.java new file mode 100644 index 0000000..2519737 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/nei/adapter/Avaritia.java @@ -0,0 +1,23 @@ +package me.towdium.jecalculation.nei.adapter; + +import codechicken.nei.recipe.IRecipeHandler; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +@ParametersAreNonnullByDefault +public class Avaritia implements IAdapter { + + @Override + public Set getAllOverlayIdentifier() { + return new HashSet<>(Arrays.asList("extreme_compression", "extreme")); + } + + @Override + public void handleRecipe(IRecipeHandler recipe, int index, List inputs, List outputs) { + + } +} diff --git a/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java b/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java new file mode 100644 index 0000000..8ec93c4 --- /dev/null +++ b/src/main/java/me/towdium/jecalculation/nei/adapter/GTPP.java @@ -0,0 +1,46 @@ +package me.towdium.jecalculation.nei.adapter; + +import codechicken.nei.recipe.IRecipeHandler; +import codechicken.nei.recipe.TemplateRecipeHandler; +import gregtech.api.util.GTPP_Recipe; +import gtPlusPlus.nei.*; +import me.towdium.jecalculation.JustEnoughCalculation; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +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); + } + } +} diff --git a/src/main/java/me/towdium/jecalculation/nei/adapter/GregTech.java b/src/main/java/me/towdium/jecalculation/nei/adapter/GregTech.java index f18ede9..9768689 100644 --- a/src/main/java/me/towdium/jecalculation/nei/adapter/GregTech.java +++ b/src/main/java/me/towdium/jecalculation/nei/adapter/GregTech.java @@ -28,19 +28,23 @@ public class GregTech implements IAdapter { @Override public void handleRecipe(IRecipeHandler recipe, int index, List inputs, List outputs) { if (recipe instanceof GT_NEI_DefaultHandler || recipe instanceof GT_NEI_AssLineHandler) { - for (int i = 0; i < inputs.size(); i++) { - Object[] objects = Arrays.stream(inputs.get(i)).map(o -> this.convertFluid((ItemStack) o)).toArray(); - inputs.set(i, objects); - } - List otherStacks = recipe.getOtherStacks(index); - outputs.addAll(otherStacks.stream() - .map(positionedStack -> positionedStack.items) - .map(itemStacks -> Arrays.stream(itemStacks).map(this::convertFluid).toArray()) - .collect(Collectors.toList())); + handleDefault(recipe, index, inputs, outputs); } } - private Object convertFluid(ItemStack itemStack) { + protected void handleDefault(IRecipeHandler recipe, int index, List inputs, List outputs) { + for (int i = 0; i < inputs.size(); i++) { + Object[] objects = Arrays.stream(inputs.get(i)).map(o -> this.convertFluid((ItemStack) o)).toArray(); + inputs.set(i, objects); + } + List otherStacks = recipe.getOtherStacks(index); + outputs.addAll(otherStacks.stream() + .map(positionedStack -> positionedStack.items) + .map(itemStacks -> Arrays.stream(itemStacks).map(this::convertFluid).toArray()) + .collect(Collectors.toList())); + } + + protected Object convertFluid(ItemStack itemStack) { FluidStack fluidStack = GT_Utility.getFluidFromDisplayStack(itemStack); return fluidStack == null ? itemStack : fluidStack; }