Skip to content

switch to new RFB transform signature #758

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

Open
danyadev wants to merge 3 commits into
base: master
Choose a base branch
from
Open

switch to new RFB transform signature #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0d9f64
implement transformClassIfNeeded
danyadev Feb 24, 2026
bcaef0b
update RFB
danyadev May 29, 2026
1af737a
Merge branch 'master' into rfb-transformer-compat
czqwq May 29, 2026
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
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ configurations {
dependencies {
api("com.github.GTNewHorizons:GTNHLib:0.9.52:dev")

compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.16") { transitive = false }
compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.1.0") { transitive = false }
compileOnly("com.mitchej123:supernova:0.0.2:api") { transitive = false }

transformedMod("com.github.GTNewHorizons:NotEnoughItems:2.8.84-GTNH:dev") // force a more up-to-date NEI version
Expand Down
4 changes: 2 additions & 2 deletions .../com/mitchej123/hodgepodge/core/fml/transformers/mc/SpeedupLongIntHashMapTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private byte[] transformBytes(String transformedName, byte[] basicClass) {
cr.accept(cn, 0);
final boolean changed = transformClassNode(transformedName, cn);
if (changed) {
final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
final ClassWriter cw = new ClassWriter(0);
cn.accept(cw);
final byte[] transformedBytes = cw.toByteArray();
HodgepodgeClassDump.dumpClass(transformedName, basicClass, transformedBytes, this);
Expand All @@ -73,7 +73,7 @@ private byte[] transformBytes(String transformedName, byte[] basicClass) {
private static boolean transformClassNode(String transformedName, ClassNode cn) {
boolean changed = false;
for (MethodNode mn : cn.methods) {
for (AbstractInsnNode node : mn.instructions.toArray()) {
for (AbstractInsnNode node = mn.instructions.getFirst(); node != null; node = node.getNext()) {
if (node.getOpcode() == NEW && node instanceof TypeInsnNode tNode && isTargetDesc(tNode.desc)) {
final AbstractInsnNode secondNode = node.getNext();
if (secondNode.getOpcode() == DUP) {
Expand Down
11 changes: 9 additions & 2 deletions ...in/java/com/mitchej123/hodgepodge/core/rfb/transformers/ConfigParsingTimeTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,21 @@ public boolean shouldTransformClass(@NotNull ExtensibleClassLoader classLoader,
}

@Override
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull Context context,
public boolean transformClassIfNeeded(@NotNull ExtensibleClassLoader classLoader, @NotNull Context context,
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
final ClassNode cn = classNode.getNode();
if (cn == null) {
return;
return false;
}
transformClassNode(cn);
HodgepodgeClassDump.dumpClass(className, classNode, this);
return true;
}

@Override
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
transformClassIfNeeded(classLoader, context, manifest, className, classNode);
}

private static final String THIS = "net/minecraftforge/common/config/Configuration";
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/com/mitchej123/hodgepodge/core/rfb/transformers/EnumValuesTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public boolean shouldTransformClass(@NotNull ExtensibleClassLoader classLoader,
}

@Override
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull Context context,
public boolean transformClassIfNeeded(@NotNull ExtensibleClassLoader classLoader, @NotNull Context context,
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
final ClassNode cn = classNode.getNode();
assert cn != null;
Expand All @@ -65,6 +65,13 @@ public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull
classNode.computeFrames();
HodgepodgeClassDump.dumpBytecode(className, classNode, this);
}
return changed;
}

@Override
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull Context context,
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
transformClassIfNeeded(classLoader, context, manifest, className, classNode);
}

private static boolean transformClassNode(ClassNode cn) {
Expand Down
14 changes: 11 additions & 3 deletions ...n/java/com/mitchej123/hodgepodge/core/rfb/transformers/ForgeConfigurationTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,12 @@ public boolean shouldTransformClass(@NotNull ExtensibleClassLoader classLoader,
}

@Override
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
public boolean transformClassIfNeeded(@NotNull ExtensibleClassLoader classLoader,
@NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest, @NotNull String className,
@NotNull ClassNodeHandle classNode) {
final ClassNode cn = classNode.getNode();
if (cn == null) {
return;
return false;
}
switch (className) {
case "net.minecraftforge.common.config.Property" -> {
Expand All @@ -67,6 +68,13 @@ public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull
case "net.minecraftforge.common.config.ConfigCategory" -> transformConfigCategory(cn);
}
HodgepodgeClassDump.dumpClass(className, classNode, this);
return true;
}

@Override
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNode) {
transformClassIfNeeded(classLoader, context, manifest, className, classNode);
}

private static void transformProperty(ClassNode cn) {
Expand Down
15 changes: 12 additions & 3 deletions ...va/com/mitchej123/hodgepodge/core/rfb/transformers/ForgeEventSubscriptionTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,14 @@ public boolean shouldTransformClass(@NotNull ExtensibleClassLoader classLoader,
}

@Override
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNodeHandle) {
public boolean transformClassIfNeeded(@NotNull ExtensibleClassLoader classLoader,
@NotNull RfbClassTransformer.Context context, @Nullable Manifest manifest, @NotNull String className,
@NotNull ClassNodeHandle classNodeHandle) {
final ClassNode classNode = classNodeHandle.getNode();
if (classNode == null) {
return;
return false;
}

boolean changed = false;
for (MethodNode method : classNode.methods) {
if (method.name.equals("transform") && method.desc.equals("(Ljava/lang/String;Ljava/lang/String;[B)[B")) {
Expand All @@ -70,6 +72,13 @@ public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull
} else {
FMLRelaunchLog.severe("[ForgeEventSubscriptionTransformer] Failed to transform {}", classNode.name);
}
return changed;
}

@Override
public void transformClass(@NotNull ExtensibleClassLoader classLoader, @NotNull RfbClassTransformer.Context context,
@Nullable Manifest manifest, @NotNull String className, @NotNull ClassNodeHandle classNodeHandle) {
transformClassIfNeeded(classLoader, context, manifest, className, classNodeHandle);
}

private static boolean transformTransformMethod(MethodNode method) {
Expand Down