Skip to content

Follow-up fix for temporary compat with AE2 GUIs #193

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
brachy84 merged 1 commit into from
Mar 18, 2026
Merged

Follow-up fix for temporary compat with AE2 GUIs #193

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
19 changes: 14 additions & 5 deletions src/main/java/com/cleanroommc/modularui/core/ClassTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,31 @@ public class ClassTransformer implements IClassTransformer {

@Override
public byte[] transform(String name, String transformedName, byte[] basicClass) {
if (!ModularUICore.stackUpLoaded) {
// Temporarily use AE2's implementation if it's loaded
if (ModularUICore.ae2Loaded && transformedName.equals(PacketByteBufferVisitor.PACKET_UTIL_CLASS)) {
// Don't patch over StackUp
if (ModularUICore.stackUpLoaded) {
return basicClass;
}
// Patch using AE2's implementation if it's loaded (temporary, see #155)
if (ModularUICore.ae2Loaded) {
// AE2 is missing PacketUtilPatch, patch it in
if (transformedName.equals(PacketByteBufferVisitor.PACKET_UTIL_CLASS)) {
Consumer<ClassNode> consumer = (node) -> {
ClassSplicer.spliceClasses(node, "com.cleanroommc.modularui.core.temp.PacketUtilPatch",
"writeItemStackFromClientToServer");
};
ModularUICore.LOGGER.info("Applied {} ASM, specific for AE2, from ModularUI", transformedName);
return ClassSplicer.processNode(basicClass, consumer);
} else if (transformedName.equals(PacketByteBufferVisitor.PACKET_UTIL_CLASS) ||
}
// Don't patch over AE2's PacketBufferPatch
return basicClass;
}
// Otherwise apply ModularUI's patches
if (transformedName.equals(PacketByteBufferVisitor.PACKET_UTIL_CLASS) ||
transformedName.equals(PacketByteBufferVisitor.PACKET_BUFFER_CLASS)) {
ClassWriter classWriter = new ClassWriter(0);
new ClassReader(basicClass).accept(new PacketByteBufferVisitor(classWriter), 0);
ModularUICore.LOGGER.info("Applied {} ASM from ModularUI", transformedName);
return classWriter.toByteArray();
}
}
return basicClass;
}
Expand Down