Skip to content

Commit c2907bb

Browse files
committed
Crafting CPU storage -> requestedItem
1 parent 598b20d commit c2907bb

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/main/java/de/srendi/advancedperipherals/common/addons/appliedenergistics/AppEngApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ public static Map<String, Object> parseCraftingCPU(ICraftingCPU cpu, boolean rec
402402

403403
public static Map<String, Object> parseCraftingJob(CraftingJobStatus job, @Nullable ICraftingCPU cpu) {
404404
Map<String, Object> map = new HashMap<>();
405-
map.put("storage", parseGenericStack(job.crafting()));
405+
map.put("requestedItem", parseGenericStack(job.crafting()));
406406
map.put("elapsedTimeNanos", job.elapsedTimeNanos());
407407
map.put("totalItem", job.totalItems());
408408
map.put("progress", job.progress());

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MeBridgePeripheral.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ public MethodResult craftChemical(IComputerAccess computer, IArguments arguments
628628

629629
@Override
630630
@LuaFunction(mainThread = true)
631-
public MethodResult getCraftingTasks() {
631+
public MethodResult getCraftingJobs() {
632632
if (!isAvailable())
633633
return notConnected();
634634

@@ -645,7 +645,7 @@ public MethodResult getCraftingTasks() {
645645

646646
@Override
647647
@LuaFunction(mainThread = true)
648-
public MethodResult cancelCraftingTasks(IArguments arguments) {
648+
public MethodResult cancelCraftingJobs(IArguments arguments) {
649649
if (!isAvailable())
650650
return notConnected();
651651

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/RsBridgePeripheral.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ public MethodResult craftChemical(IComputerAccess computer, IArguments arguments
625625

626626
@Override
627627
@LuaFunction(mainThread = true)
628-
public MethodResult getCraftingTasks() {
628+
public MethodResult getCraftingJobs() {
629629
if (!isAvailable())
630630
return notConnected();
631631

@@ -634,7 +634,7 @@ public MethodResult getCraftingTasks() {
634634

635635
@Override
636636
@LuaFunction(mainThread = true)
637-
public MethodResult cancelCraftingTasks(IArguments arguments) throws LuaException {
637+
public MethodResult cancelCraftingJobs(IArguments arguments) throws LuaException {
638638
if (!isAvailable())
639639
return notConnected();
640640

src/main/java/de/srendi/advancedperipherals/common/util/inventory/IStorageSystemPeripheral.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ public interface IStorageSystemPeripheral {
105105

106106
MethodResult craftItem(IComputerAccess computer, IArguments arguments) throws LuaException;
107107

108-
MethodResult getCraftingTasks();
108+
MethodResult getCraftingJobs();
109109

110-
MethodResult cancelCraftingTasks(IArguments arguments) throws LuaException;
110+
MethodResult cancelCraftingJobs(IArguments arguments) throws LuaException;
111111

112112
MethodResult craftFluid(IComputerAccess computer, IArguments arguments) throws LuaException;
113113

0 commit comments

Comments
 (0)