magic-server/L2Core
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

holder datagen fix

Browse Source
This commit is contained in:
lcy0x1
2024-08-28 09:42:41 +08:00
parent 6206df0ad8
commit d5ca782b5b
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -18,7 +18,7 @@ loader_version_range=[2,)
mod_id=l2core mod_id=l2core
mod_name=L2Core mod_name=L2Core
mod_license=LGPL-2.1 mod_license=LGPL-2.1
mod_version=3.0.7+23 mod_version=3.0.7+25
mod_group_id=dev.xkmc mod_group_id=dev.xkmc
mod_authors=lcy0x1 mod_authors=lcy0x1
mod_description=Core Library mod for all L2 mods mod_description=Core Library mod for all L2 mods

25
src/main/java/dev/xkmc/l2core/base/entity/SyncedData.java
View File

@@ -23,11 +23,13 @@ public class SyncedData {
public static final Serializer<Integer> INT; public static final Serializer<Integer> INT;
public static final Serializer<BlockPos> BLOCK_POS; public static final Serializer<BlockPos> BLOCK_POS;
public static final Serializer<String> STRING;
public static final Serializer<Optional<UUID>> UUID; public static final Serializer<Optional<UUID>> UUID;
static { static {
INT = new Simple<>(EntityDataSerializers.INT, Codec.INT); INT = new Simple<>(EntityDataSerializers.INT, Codec.INT);
BLOCK_POS = new Simple<>(EntityDataSerializers.BLOCK_POS, BlockPos.CODEC); BLOCK_POS = new Simple<>(EntityDataSerializers.BLOCK_POS, BlockPos.CODEC);
STRING = new Simple<>(EntityDataSerializers.STRING, Codec.STRING);
UUID = new Opt<>(EntityDataSerializers.OPTIONAL_UUID, UUIDUtil.CODEC); UUID = new Opt<>(EntityDataSerializers.OPTIONAL_UUID, UUIDUtil.CODEC);
} }
@@ -35,14 +37,25 @@ public class SyncedData {
private final List<Data<?>> list = new ArrayList<>(); private final List<Data<?>> list = new ArrayList<>();
@Nullable
private final SyncedData parent;
public SyncedData(Definer cls) { public SyncedData(Definer cls) {
this.cls = cls; this.cls = cls;
parent = null;
}
public SyncedData(Definer cls, SyncedData parent) {
this.cls = cls;
this.parent = parent;
} }
public void register(SynchedEntityData.Builder data) { public void register(SynchedEntityData.Builder data) {
for (Data<?> entry : list) { for (Data<?> entry : list) {
entry.register(data); entry.register(data);
} }
if (parent != null)
parent.register(data);
} }
public <T> EntityDataAccessor<T> define(Serializer<T> ser, T init, @Nullable String name) { public <T> EntityDataAccessor<T> define(Serializer<T> ser, T init, @Nullable String name) {
@@ -51,16 +64,20 @@ public class SyncedData {
return data.data; return data.data;
} }
public void write(RegistryAccess pvd, CompoundTag tag, SynchedEntityData entityData) { public void write(RegistryAccess pvd, CompoundTag tag, SynchedEntityData data) {
for (Data<?> entry : list) { for (Data<?> entry : list) {
entry.write(pvd, tag, entityData); entry.write(pvd, tag, data);
} }
if (parent != null)
parent.write(pvd, tag, data);
} }
public void read(RegistryAccess pvd, CompoundTag tag, SynchedEntityData entityData) { public void read(RegistryAccess pvd, CompoundTag tag, SynchedEntityData data) {
for (Data<?> entry : list) { for (Data<?> entry : list) {
entry.read(pvd, tag, entityData); entry.read(pvd, tag, data);
} }
if (parent != null)
parent.read(pvd, tag, data);
} }
private class Data<T> { private class Data<T> {

2
src/main/java/dev/xkmc/l2core/init/reg/registrate/LegacyHolder.java
View File

@@ -81,7 +81,7 @@ public interface LegacyHolder<T> extends Holder<T>, Supplier<T> {
@Override @Override
default boolean canSerializeIn(HolderOwner<T> pOwner) { default boolean canSerializeIn(HolderOwner<T> pOwner) {
return holder().canSerializeIn(pOwner); return true;
} }
} }