DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vastly improve performance of major block name generation

Browse Source
This commit is contained in:
Jonas Herzig
2019-03-13 22:03:03 +01:00
parent 22ab39c2db
commit cd16e014d1
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/replaymod/render/blend/data/Serializer.java
View File

@@ -24,7 +24,7 @@ import static org.cakelab.blender.io.block.BlockCodes.ID_DATA;
public class Serializer { public class Serializer {
private final Map<Object, CPointer<Object>> serialized = new HashMap<>(); private final Map<Object, CPointer<Object>> serialized = new HashMap<>();
private final Set<String> usedNames = new HashSet<>(); private final Map<String, Integer> usedNames = new HashMap<>();
public <T> CPointer<T> getMajor(Object obj, Class<T> clazz) { public <T> CPointer<T> getMajor(Object obj, Class<T> clazz) {
CPointer<Object> pointer = serialized.get(obj); CPointer<Object> pointer = serialized.get(obj);
@@ -47,13 +47,8 @@ public class Serializer {
if (id.code != ID_DATA) { if (id.code != ID_DATA) {
ID asID = pointer.cast(ID.class).get(); ID asID = pointer.cast(ID.class).get();
String name = id.code.toString().substring(0, 2) + id.name; String name = id.code.toString().substring(0, 2) + id.name;
String fullName = name; int counter = usedNames.compute(name, (n, i) -> i == null ? 0 : i + 1);
int i = 0; String fullName = counter == 0 ? name : name + "." + counter;
while (usedNames.contains(fullName)) {
fullName = name + "." + i;
i++;
}
usedNames.add(fullName);
asID.getName().fromString(fullName); asID.getName().fromString(fullName);
} }