Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Schematic content ID mapping

Browse Source
This commit is contained in:
Anuken
2025-08-01 04:32:17 -04:00
parent e95c543fb2
commit 0320ccbccd
2 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/mindustry/io/TypeIO.java
View File

@@ -138,14 +138,16 @@ public class TypeIO{
}
}
@Nullable
public static Object readObject(Reads read){
public static @Nullable Object readObject(Reads read){
return readObjectBoxed(read, false);
}
/** Reads an object, but boxes buildings. */
@Nullable
public static Object readObjectBoxed(Reads read, boolean box){
/** Reads an object, but optionally boxes buildings. */
public static @Nullable Object readObjectBoxed(Reads read, boolean box){
return readObject(read, box, null);
}
public static @Nullable Object readObject(Reads read, boolean box, @Nullable ContentMapper mapper){
byte type = read.b();
return switch(type){
case 0 -> null;
@@ -153,7 +155,7 @@ public class TypeIO{
case 2 -> read.l();
case 3 -> read.f();
case 4 -> readString(read);
case 5 -> content.getByID(ContentType.all[read.b()], read.s());
case 5 -> mapper == null ? content.getByID(ContentType.all[read.b()], read.s()) : mapper.get(ContentType.all[read.b()], read.s());
case 6 -> {
short length = read.s();
IntSeq arr = new IntSeq(length);
@@ -202,7 +204,7 @@ public class TypeIO{
case 22 -> {
int objlen = read.i();
Object[] objs = new Object[objlen];
for(int i = 0; i < objlen; i++) objs[i] = readObjectBoxed(read, box);
for(int i = 0; i < objlen; i++) objs[i] = readObject(read, box, mapper);
yield objs;
}
case 23 -> content.unitCommand(read.us());
@@ -1093,6 +1095,11 @@ public class TypeIO{
}
}
/** Converter of an ID to a content instance. */
public interface ContentMapper{
Content get(ContentType type, int id);
}
public interface Boxed<T> {
T unbox();
}