diff --git a/build.gradle b/build.gradle index 1622027..4e1a204 100644 --- a/build.gradle +++ b/build.gradle @@ -49,7 +49,7 @@ dependencies { compileOnly group: 'cofh', name: 'ThermalDynamics', version: '1.12.2-2.5.5.21', classifier: 'deobf', transitive: false compileOnly group: 'refinedstorage', name: 'refinedstorage', version: '1.6.16-386', transitive: false compileOnly group: 'codechicken', name: 'NotEnoughItems', version: '1.12.2-2.4.3.245', classifier: 'deobf', transitive: false - compileOnly group: 'appeng', name: 'appliedenergistics2', version: 'rv6-stable-7', transitive: false + compileOnly group: 'appeng', name: 'appliedenergistics2', version: 'rv6-stable-7', classifier: 'deobf', transitive: false } tasks.withType(Wrapper) { diff --git a/src/main/java/com/tom/logisticsbridge/LogisticsBridge.java b/src/main/java/com/tom/logisticsbridge/LogisticsBridge.java index d121704..3b36209 100644 --- a/src/main/java/com/tom/logisticsbridge/LogisticsBridge.java +++ b/src/main/java/com/tom/logisticsbridge/LogisticsBridge.java @@ -77,7 +77,7 @@ public class LogisticsBridge { public static final String ID = "logisticsbridge"; public static final String NAME = "Logistics Bridge"; - public static final String VERSION = "1.3.7"; + public static final String VERSION = "1.3.8"; public static final String DEPS = "after:appliedenergistics2;after:refinedstorage@[1.6.15,);required-after:logisticspipes@[0.10.3.39,)"; public static final String UPDATE = "https://github.com/tom5454/LogisticsBridge/blob/master/version-check.json"; public static final Logger log = LogManager.getLogger(NAME); diff --git a/src/main/java/com/tom/logisticsbridge/module/ModuleCrafterExt.java b/src/main/java/com/tom/logisticsbridge/module/ModuleCrafterExt.java index 0c2b39e..aab0bf3 100644 --- a/src/main/java/com/tom/logisticsbridge/module/ModuleCrafterExt.java +++ b/src/main/java/com/tom/logisticsbridge/module/ModuleCrafterExt.java @@ -242,6 +242,9 @@ public void canProvide(RequestTreeNode tree, RequestTree root, List fil public LogisticsItemOrder fullFill(LogisticsPromise promise, IRequestItems destination, IAdditionalTargetInformation info) { if(!(_service instanceof CraftingManager))return null; CraftingManager mngr = (CraftingManager) _service; + ItemIdentifierStack result = getCraftedItem(); + if(result == null)return null; + int multiply = (int) Math.ceil(promise.numberOfItems / (float) result.getStackSize()); if(mngr.isBuffered()){ List> rec = new ArrayList<>(); IRouter defSat = getSatelliteRouterByID(mngr.getSatelliteUUID()); @@ -277,7 +280,8 @@ public LogisticsItemOrder fullFill(LogisticsPromise promise, IRequestItems desti if(mat != null)rec.add(Pair.of(target[i], mat)); } - mngr.addBuffered(rec); + for(int i = 0;i