upstream/JustEnoughCalculation
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/JustEnoughCalculation.git synced 2026-11-14 01:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: may fix the abnormal number of transfers

Browse Source
This commit is contained in:
Discreater committed 2022-12-17 20:36:34 +08:00
1 parent 4085146b58
commit 90f805884d
2 files changed
+18 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/me/towdium/jecalculation/nei/Adapter.java
+9 -9
View File
@@ -31,42 +31,42 @@ public class Adapter {
public static void init() {
JustEnoughCalculation.logger.info("=====Just Enough Calculation Init Start=====");
if (Loader.isModLoaded("Forestry")) {
JustEnoughCalculation.logger.info("Forestry installed");
JustEnoughCalculation.logger.info("Forestry detected");
adapters.add(new Forestry());
}
if (Loader.isModLoaded("appliedenergistics2")) {
JustEnoughCalculation.logger.info("ae2 not supported");
JustEnoughCalculation.logger.info("ae2 detected");
adapters.add(new AE2());
}
if (Loader.isModLoaded("gregtech")) {
if(GregTech6.isGT6()) {
JustEnoughCalculation.logger.info("gregtech6 installed");
JustEnoughCalculation.logger.info("gregtech6 detected");
adapters.add(new GregTech6());
} else {
JustEnoughCalculation.logger.info("gregtech5 installed");
JustEnoughCalculation.logger.info("gregtech5 detected");
adapters.add(new GregTech());
}
}
try {
if (Loader.isModLoaded("miscutils")) {
adapters.add(new GTPP());
JustEnoughCalculation.logger.info("gt++ installed");
JustEnoughCalculation.logger.info("gt++ detected");
}
} catch (Exception e) {
JustEnoughCalculation.logger.info("exception when installing gt++");
JustEnoughCalculation.logger.error("Init error with gt++");
e.printStackTrace();
}
if (Loader.isModLoaded("Avaritia")) {
JustEnoughCalculation.logger.info("Avaritia installed");
JustEnoughCalculation.logger.info("Avaritia detected");
adapters.add(new Avaritia());
}
if (Loader.isModLoaded("EnderIO")) {
JustEnoughCalculation.logger.info("EnderIO installed");
JustEnoughCalculation.logger.info("EnderIO detected");
adapters.add(new EnderIO());
}
if (Loader.isModLoaded("thaumcraftneiplugin")) {
adapters.add(new Thaum());
JustEnoughCalculation.logger.info("Thaumcraft installed");
JustEnoughCalculation.logger.info("Thaumcraft detected");
}
JustEnoughCalculation.logger.info("=====Just Enough Calculation Init Finish=====");
}
src/main/java/me/towdium/jecalculation/nei/adapter/GregTech.java
+9 -4
View File
@@ -66,10 +66,15 @@ public class GregTech implements IAdapter {
}
protected void handleDefault(IRecipeHandler recipe, int index, List<Object[]> inputs, List<Object[]> outputs) {
for (int i = 0; i < inputs.size(); i++) {
Object[] objects = Arrays.stream(inputs.get(i)).map(o -> GregTech.convertFluid((ItemStack) o)).toArray();
inputs.set(i, objects);
}
inputs.replaceAll(ts -> Arrays.stream(ts).map(o -> {
if(o instanceof ItemStack) {
return GregTech.convertFluid((ItemStack) o);
} else if (o instanceof FluidStack) {
return o;
} else {
throw new IllegalArgumentException("Shall get ItemStack or FluidStack, but get: " + o.getClass());
}
}).toArray());
List<PositionedStack> otherStacks = recipe.getOtherStacks(index);
outputs.addAll(otherStacks.stream()
.map(positionedStack -> positionedStack.items)