Skip to content

Improve string representation of listeners for IContextSetter event #489

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
Rongmario merged 1 commit into from
Dec 1, 2025
Merged

Improve string representation of listeners for IContextSetter event #489

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
38 changes: 27 additions & 11 deletions src/main/java/net/minecraftforge/fml/common/eventhandler/EventBus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import com.google.common.collect.MapMaker;
import com.google.common.collect.Sets;
import com.google.common.reflect.TypeToken;
import org.jspecify.annotations.NonNull;

public class EventBus implements IEventExceptionHandler
{
Expand Down Expand Up @@ -165,17 +166,7 @@ private void register(Class<?> eventType, Object target, Method method, final Mo
IEventListener listener = asm;
if (IContextSetter.class.isAssignableFrom(eventType))
{
listener = e -> {
var loader = Loader.instance();
var old = loader.activeModContainer();

loader.setActiveModContainer(owner);
((IContextSetter) e).setModContainer(owner);

asm.invoke(e);

loader.setActiveModContainer(old);
};
listener = new ContextSetterEventListener(owner, asm);
}

event.getListenerList().register(busID, asm.getPriority(), listener);
Expand Down Expand Up @@ -238,4 +229,29 @@ public void handleException(EventBus bus, Event event, IEventListener[] listener
FMLLog.log.error("{}: {}", x, listeners[x]);
}
}

private record ContextSetterEventListener(
ModContainer owner,
ASMEventHandler asm
) implements IEventListener {

@Override
public void invoke(Event e) {
var loader = Loader.instance();
var old = loader.activeModContainer();

loader.setActiveModContainer(owner);
((IContextSetter) e).setModContainer(owner);

asm.invoke(e);

loader.setActiveModContainer(old);
}

@Override
@NonNull
public String toString() {
return "ContextSetter[mod=" + owner.getModId() + ", listener=" + asm + "]";
}
}
}