Skip to content

Make ME Processing Modem Interface append their attached name in queueEvent #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bearU369 merged 1 commit into from
Mar 19, 2026
Merged

Make ME Processing Modem Interface append their attached name in queueEvent #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion forge/src/main/java/com/bear369/logistorage/mixin/ae2/CraftingCpuLogicMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ private void onFinishJob(boolean success, CallbackInfo ci) {
long targetAmount = getFinalJobOutput().amount();

peripheral.emitEventSignal(
true,
success ? "crafting_process_complete" : "crafting_process_cancel",
itemID,
targetAmount,
Expand Down Expand Up @@ -150,7 +151,7 @@ private boolean onPushPattern(
} else {
String itemID = getFinalJobOutput().what().getId().toString();
long targetAmount = getFinalJobOutput().amount();
peripheral.emitEventSignal("crafting_process_start", itemID, targetAmount, triggeringSource);
peripheral.emitEventSignal(true, "crafting_process_start", itemID, targetAmount, triggeringSource);

activeProvider.add(patternProvider);
peripheral.beginPatternSend(details.getOutputs());
Expand Down
10 changes: 8 additions & 2 deletions ...com/bear369/logistorage/shared/computercraft/peripherial/AbstractAttachedPeripherial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,21 @@

import dan200.computercraft.api.peripheral.IComputerAccess;
import dan200.computercraft.api.peripheral.IPeripheral;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;

public abstract class AbstractAttachedPeripherial implements IPeripheral {
private Set<IComputerAccess> computers = new HashSet<>();

public void emitEventSignal(String event, Object... objects) {
public void emitEventSignal(boolean isNameAttached, String event, Object... objects) {
for (IComputerAccess computer : computers) {
computer.queueEvent(event, objects);
Object[] args = Arrays.copyOf(objects, objects.length);
if (isNameAttached) {
args = Arrays.copyOf(args, args.length + 1);
args[args.length - 1] = computer.getAttachmentName();
}
computer.queueEvent(event, args);
}
}

Expand Down
12 changes: 6 additions & 6 deletions ...r369/logistorage/shared/computercraft/peripherial/MEProcessInterfacePeripherialLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void beginPatternSend(GenericStack[] outputs) {
final GenericStackRecord record = new GenericStackRecord(stack);
insertedList.add(record.toTable());
}
super.emitEventSignal("crafting_process_preinsert", insertedList);
super.emitEventSignal(true, "crafting_process_preinsert", insertedList);
}

@Override
Expand All @@ -72,7 +72,7 @@ public void logPatternSend(Map<Integer, GenericStack> insertedSlots) {
final GenericStackRecord record = new GenericStackRecord(insertedSlots.get(slot));
insertedList.add(record.toTable(slot + 1)); // +1 for Lua-aligned indexing
}
super.emitEventSignal("crafting_process_insert", insertedList);
super.emitEventSignal(true, "crafting_process_insert", insertedList);
}

@Override
Expand All @@ -83,25 +83,25 @@ public void finalizePattenSend(GenericStack[] stacks) {
final GenericStackRecord record = new GenericStackRecord(stack);
insertedList.add(record.toTable());
}
super.emitEventSignal("crafting_process_postinsert", insertedList);
super.emitEventSignal(true, "crafting_process_postinsert", insertedList);
}

@Override
public void onCraftingBegin(GenericStack stack, String triggeringSrc) {
final GenericStackRecord record = new GenericStackRecord(stack);
super.emitEventSignal("crafting_start", record.name, record.amount, triggeringSrc);
super.emitEventSignal(true, "crafting_start", record.name, record.amount, triggeringSrc);
}

@Override
public void onCraftingFinish(GenericStack stack, String triggeringSrc) {
final GenericStackRecord record = new GenericStackRecord(stack);
super.emitEventSignal("crafting_complete", record.name, record.amount, triggeringSrc);
super.emitEventSignal(true, "crafting_complete", record.name, record.amount, triggeringSrc);
}

@Override
public void onCraftingCancel(GenericStack stack, String triggeringSrc) {
final GenericStackRecord record = new GenericStackRecord(stack);
super.emitEventSignal("crafting_cancel", record.name, record.amount, triggeringSrc);
super.emitEventSignal(true, "crafting_cancel", record.name, record.amount, triggeringSrc);
}

public IItemHandler getItemHandler() {
Expand Down
Loading