mirror of
https://github.com/GTNewHorizons/ForgeMultipart.git
synced 2026-11-20 04:09:45 +00:00
refactor: drop unused IDWriter and JPartialOcclusion Scala bridges
The downstream ABI inventory scanned 240 mod jars in GTNH daily 2026-08-14+678 and found no consumer of either bridge. Both were written speculatively, before the inventory existed. IDWriter had no downstream reference at all, so its four Scala function accessors are removed and the class now selects a carrier width directly. That also removes the Integer boxing and Function1/Function2 allocation per read and write that the first port had preserved. Calling write or read before setMax now throws IllegalStateException rather than NullPointerException; no caller reaches that state. JPartialOcclusion$class had no downstream reference either. The two consumers that touch JPartialOcclusion only call getPartialOcclusionBoxes, and the two jars that implement the interface emit no call to the helper. The interface and both of its method descriptors are unchanged. The ReferenceScalaPartialOcclusion fixture is removed with the helper it existed to verify. Validated with 27 plain-JVM tests, a clean checkstyleTest build with Spotless re-enabled, and the Java 8 Forge dedicated-server suite.
This commit is contained in:
1 parent
78959e70e9
commit
246dafffda
9 files changed
+99
-157
No files matched your search
@@ -2,97 +2,50 @@ package codechicken.multipart;
|
||||
|
||||
import codechicken.lib.data.MCDataInput;
|
||||
import codechicken.lib.data.MCDataOutput;
|
||||
import scala.Function1;
|
||||
import scala.Function2;
|
||||
import scala.runtime.AbstractFunction1;
|
||||
import scala.runtime.AbstractFunction2;
|
||||
import scala.runtime.BoxedUnit;
|
||||
|
||||
/** Class for reading and writing IDs, widening the carrier data type as necessary. */
|
||||
public class IDWriter {
|
||||
|
||||
private Function2<MCDataOutput, Object, BoxedUnit> write;
|
||||
private Function1<MCDataInput, Object> read;
|
||||
|
||||
@Deprecated
|
||||
public Function2<MCDataOutput, Object, BoxedUnit> write() {
|
||||
return write;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public void write_$eq(Function2<MCDataOutput, Object, BoxedUnit> write) {
|
||||
this.write = write;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public Function1<MCDataInput, Object> read() {
|
||||
return read;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public void read_$eq(Function1<MCDataInput, Object> read) {
|
||||
this.read = read;
|
||||
}
|
||||
|
||||
public void write(MCDataOutput data, int id) {
|
||||
write.apply(data, id);
|
||||
}
|
||||
|
||||
public int read(MCDataInput data) {
|
||||
return (Integer) read.apply(data);
|
||||
}
|
||||
private int width;
|
||||
|
||||
public void setMax(int value) {
|
||||
// The reference Scala implementation widens negative values as signed values.
|
||||
long maximum = value;
|
||||
if (maximum > 0xffffL) {
|
||||
write_$eq(new AbstractFunction2<MCDataOutput, Object, BoxedUnit>() {
|
||||
|
||||
@Override
|
||||
public BoxedUnit apply(MCDataOutput data, Object id) {
|
||||
data.writeInt((Integer) id);
|
||||
return BoxedUnit.UNIT;
|
||||
}
|
||||
});
|
||||
read_$eq(new AbstractFunction1<MCDataInput, Object>() {
|
||||
|
||||
@Override
|
||||
public Object apply(MCDataInput data) {
|
||||
return data.readInt();
|
||||
}
|
||||
});
|
||||
width = 4;
|
||||
} else if (maximum > 0xffL) {
|
||||
write_$eq(new AbstractFunction2<MCDataOutput, Object, BoxedUnit>() {
|
||||
|
||||
@Override
|
||||
public BoxedUnit apply(MCDataOutput data, Object id) {
|
||||
data.writeShort((Integer) id);
|
||||
return BoxedUnit.UNIT;
|
||||
}
|
||||
});
|
||||
read_$eq(new AbstractFunction1<MCDataInput, Object>() {
|
||||
|
||||
@Override
|
||||
public Object apply(MCDataInput data) {
|
||||
return data.readUShort();
|
||||
}
|
||||
});
|
||||
width = 2;
|
||||
} else {
|
||||
write_$eq(new AbstractFunction2<MCDataOutput, Object, BoxedUnit>() {
|
||||
width = 1;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public BoxedUnit apply(MCDataOutput data, Object id) {
|
||||
data.writeByte((Integer) id);
|
||||
return BoxedUnit.UNIT;
|
||||
}
|
||||
});
|
||||
read_$eq(new AbstractFunction1<MCDataInput, Object>() {
|
||||
public void write(MCDataOutput data, int id) {
|
||||
switch (width) {
|
||||
case 1:
|
||||
data.writeByte(id);
|
||||
break;
|
||||
case 2:
|
||||
data.writeShort(id);
|
||||
break;
|
||||
case 4:
|
||||
data.writeInt(id);
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("setMax was not called before writing an ID");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object apply(MCDataInput data) {
|
||||
return (int) data.readUByte();
|
||||
}
|
||||
});
|
||||
public int read(MCDataInput data) {
|
||||
switch (width) {
|
||||
case 1:
|
||||
return data.readUByte();
|
||||
case 2:
|
||||
return data.readUShort();
|
||||
case 4:
|
||||
return data.readInt();
|
||||
default:
|
||||
throw new IllegalStateException("setMax was not called before reading an ID");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
package codechicken.multipart;
|
||||
|
||||
/** Binary bridge for Scala implementations compiled against the original trait. */
|
||||
@Deprecated
|
||||
public abstract class JPartialOcclusion$class {
|
||||
|
||||
private JPartialOcclusion$class() {}
|
||||
|
||||
public static boolean allowCompleteOcclusion(JPartialOcclusion instance) {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static void $init$(JPartialOcclusion instance) {}
|
||||
}
|
||||
Reference in new issue
Block a user