This commit is contained in:
Anuken
2025-12-21 00:00:13 -05:00
parent 012eeabc87
commit 6c3b6aeea5
2 changed files with 10 additions and 8 deletions

View File

@@ -399,7 +399,9 @@ public class ContentParser{
T t = internalRead(type, elementType, jsonData, keyType); T t = internalRead(type, elementType, jsonData, keyType);
if(t != null && !Reflect.isWrapper(t.getClass()) && (type == null || !type.isPrimitive())){ if(t != null && !Reflect.isWrapper(t.getClass()) && (type == null || !type.isPrimitive())){
checkNullFields(t); checkNullFields(t);
listeners.each(hook -> hook.parsed(type, jsonData, t)); if(jsonData.isObject()){
listeners.each(hook -> hook.parsed(type, jsonData, t));
}
} }
return t; return t;
} }

View File

@@ -129,6 +129,13 @@ public class DataPatcher{
} }
void created(Object object, Object parent){ void created(Object object, Object parent){
if(object instanceof Weapon weapon){
weapon.init();
}else if(object instanceof Content cont){
cont.init();
cont.postInit();
}
if(!Vars.headless){ if(!Vars.headless){
if(object instanceof DrawPart part && parent instanceof MappableContent cont){ if(object instanceof DrawPart part && parent instanceof MappableContent cont){
part.load(cont.name); part.load(cont.name);
@@ -138,16 +145,9 @@ public class DataPatcher{
draw.load(block); draw.load(block);
}else if(object instanceof Weapon weapon){ }else if(object instanceof Weapon weapon){
weapon.load(); weapon.load();
weapon.init();
}else if(object instanceof Content cont){ }else if(object instanceof Content cont){
cont.init();
cont.postInit();
cont.load(); cont.load();
} }
}else{
if(object instanceof Weapon weapon){
weapon.init();
}
} }
} }