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

entity fix

Browse Source
This commit is contained in:
lcy0x1
2024-07-30 21:46:56 +08:00
parent 541ba4932b
commit 51a494edc7
7 changed files with 213 additions and 12 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_name=L2Core
mod_license=LGPL-2.1
mod_version=3.0.6
mod_version=3.0.7-pre4
mod_group_id=dev.xkmc
mod_authors=lcy0x1
mod_description=Core Library mod for all L2 mods

46
src/main/java/dev/xkmc/l2core/base/entity/BaseEntity.java Normal file
View File

@@ -0,0 +1,46 @@
package dev.xkmc.l2core.base.entity;
import dev.xkmc.l2serial.serialization.codec.PacketCodec;
import dev.xkmc.l2serial.serialization.codec.TagCodec;
import dev.xkmc.l2serial.serialization.marker.SerialClass;
import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.Level;
import net.neoforged.neoforge.entity.IEntityWithComplexSpawn;
import javax.annotation.ParametersAreNonnullByDefault;
@SerialClass
public abstract class BaseEntity extends Entity implements IEntityWithComplexSpawn {
public BaseEntity(EntityType<?> type, Level world) {
super(type, world);
}
@Override
protected void addAdditionalSaveData(CompoundTag tag) {
var dat = new TagCodec(registryAccess()).toTag(new CompoundTag(), this);
if (dat != null) tag.put("auto-serial", dat);
}
@Override
protected void readAdditionalSaveData(CompoundTag tag) {
if (!tag.contains("auto-serial")) return;
new TagCodec(registryAccess()).fromTag(tag.getCompound("auto-serial"), this.getClass(), this);
}
@Override
public void writeSpawnData(RegistryFriendlyByteBuf buffer) {
PacketCodec.to(buffer, this);
}
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
public void readSpawnData(RegistryFriendlyByteBuf data) {
PacketCodec.from(data, (Class) this.getClass(), this);
}
}

116
src/main/java/dev/xkmc/l2core/base/entity/SyncedData.java Normal file
View File

@@ -0,0 +1,116 @@
package dev.xkmc.l2core.base.entity;
import com.mojang.serialization.Codec;
import net.minecraft.core.BlockPos;
import net.minecraft.core.RegistryAccess;
import net.minecraft.core.UUIDUtil;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtOps;
import net.minecraft.nbt.Tag;
import net.minecraft.network.syncher.EntityDataAccessor;
import net.minecraft.network.syncher.EntityDataSerializer;
import net.minecraft.network.syncher.EntityDataSerializers;
import net.minecraft.network.syncher.SynchedEntityData;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
public class SyncedData {
public static final Serializer<Integer> INT;
public static final Serializer<BlockPos> BLOCK_POS;
public static final Serializer<Optional<UUID>> UUID;
static {
INT = new Serializer<>(EntityDataSerializers.INT, Codec.INT);
BLOCK_POS = new Serializer<>(EntityDataSerializers.BLOCK_POS, BlockPos.CODEC);
UUID = new Serializer<>(EntityDataSerializers.OPTIONAL_UUID, UUIDUtil.CODEC.xmap(Optional::of, Optional::get));
}
private final Definer cls;
private final List<Data<?>> list = new ArrayList<>();
public SyncedData(Definer cls) {
this.cls = cls;
}
public void register(SynchedEntityData.Builder data) {
for (Data<?> entry : list) {
entry.register(data);
}
}
public <T> EntityDataAccessor<T> define(Serializer<T> ser, T init, @Nullable String name) {
Data<T> data = new Data<>(ser, init, name);
list.add(data);
return data.data;
}
public void write(RegistryAccess pvd, CompoundTag tag, SynchedEntityData entityData) {
for (Data<?> entry : list) {
entry.write(pvd, tag, entityData);
}
}
public void read(RegistryAccess pvd, CompoundTag tag, SynchedEntityData entityData) {
for (Data<?> entry : list) {
entry.read(pvd, tag, entityData);
}
}
private class Data<T> {
private final Serializer<T> ser;
private final EntityDataAccessor<T> data;
private final T init;
private final String name;
private Data(Serializer<T> ser, T init, @Nullable String name) {
this.ser = ser;
this.data = cls.define(ser.ser());
this.init = init;
this.name = name;
}
private void register(SynchedEntityData.Builder data) {
data.define(this.data, this.init);
}
public void write(RegistryAccess pvd, CompoundTag tag, SynchedEntityData entityData) {
if (name == null) return;
Tag ans = ser.write(pvd, entityData.get(data));
if (ans != null) tag.put(name, ans);
}
public void read(RegistryAccess pvd, CompoundTag tag, SynchedEntityData entityData) {
if (name == null) return;
var in = tag.get(name);
entityData.set(data, Optional.ofNullable(in).map(e -> ser.read(pvd, e)).orElse(init));
}
}
public record Serializer<T>(EntityDataSerializer<T> ser, Codec<T> codec) {
@Nullable
public Tag write(RegistryAccess pvd, T t) {
return codec.encodeStart(pvd.createSerializationContext(NbtOps.INSTANCE), t).getOrThrow();
}
@Nullable
public T read(RegistryAccess pvd, Tag tag) {
return codec.decode(pvd.createSerializationContext(NbtOps.INSTANCE), tag).getOrThrow().getFirst();
}
}
public interface Definer {
<T> EntityDataAccessor<T> define(EntityDataSerializer<T> ser);
}
}

8
src/main/java/dev/xkmc/l2core/base/entity/package-info.java Normal file
View File

@@ -0,0 +1,8 @@
@MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault
package dev.xkmc.l2core.base.entity;
import net.minecraft.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;

17
src/main/java/dev/xkmc/l2core/init/reg/registrate/L2Registrate.java
View File

@@ -46,6 +46,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.TreeMap;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
@@ -122,7 +123,7 @@ public class L2Registrate extends AbstractRegistrate<L2Registrate> {
Registries.PARTICLE_TYPE, sup)).register();
RegistrateDistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () ->
OneTimeEventReceiver.addModListener(this, RegisterParticleProvidersEvent.class,
event -> pvd.get().register(event, ans.get())));
event -> pvd.get().register().accept(event, ans.get())));
return new Val.Registrate<>(ans);
}
@@ -270,19 +271,19 @@ public class L2Registrate extends AbstractRegistrate<L2Registrate> {
public interface ParticleSupplier<T extends ParticleOptions> {
static <T extends ParticleOptions> ParticleSupplier<T> provider(ParticleProvider<T> pvd) {
return (event, type) -> event.registerSpecial(type, pvd);
static <T extends ParticleOptions> ParticleSupplier<T> provider(NonNullSupplier<ParticleProvider<T>> pvd) {
return () -> (event, type) -> event.registerSpecial(type, pvd.get());
}
static <T extends ParticleOptions> ParticleSupplier<T> sprite(ParticleProvider.Sprite<T> pvd) {
return (event, type) -> event.registerSprite(type, pvd);
static <T extends ParticleOptions> ParticleSupplier<T> sprite(NonNullSupplier<ParticleProvider.Sprite<T>> pvd) {
return () -> (event, type) -> event.registerSprite(type, pvd.get());
}
static <T extends ParticleOptions> ParticleSupplier<T> spriteSet(ParticleEngine.SpriteParticleRegistration<T> pvd) {
return (event, type) -> event.registerSpriteSet(type, pvd);
static <T extends ParticleOptions> ParticleSupplier<T> spriteSet(NonNullSupplier<ParticleEngine.SpriteParticleRegistration<T>> pvd) {
return () -> (event, type) -> event.registerSpriteSet(type, pvd.get());
}
void register(RegisterParticleProvidersEvent event, ParticleType<T> type);
BiConsumer<RegisterParticleProvidersEvent, ParticleType<T>> register();
}

31
src/main/java/dev/xkmc/l2core/init/reg/simple/DCReg.java
View File

@@ -3,9 +3,10 @@ package dev.xkmc.l2core.init.reg.simple;
import com.mojang.serialization.Codec;
import dev.xkmc.l2core.util.DCStack;
import dev.xkmc.l2serial.serialization.codec.CodecAdaptor;
import dev.xkmc.l2serial.util.Wrappers;
import net.minecraft.core.UUIDUtil;
import net.minecraft.core.component.DataComponentType;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.RegistryFriendlyByteBuf;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.ComponentSerialization;
@@ -17,6 +18,9 @@ import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.registries.DeferredHolder;
import net.neoforged.neoforge.registries.DeferredRegister;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
public record DCReg(DeferredRegister<DataComponentType<?>> reg) {
@@ -31,11 +35,24 @@ public record DCReg(DeferredRegister<DataComponentType<?>> reg) {
return new DCValImpl<>(reg.register(id, builder::build));
}
public <T> DCVal<List<T>> list(String id, Codec<T> codec, StreamCodec<? super RegistryFriendlyByteBuf, T> stream, boolean cache) {
var builder = DataComponentType.<List<T>>builder()
.persistent(codec.listOf())
.networkSynchronized(stream.apply(Wrappers.cast(ByteBufCodecs.list())));
if (cache) builder.cacheEncoding();
return new DCValImpl<>(reg.register(id, builder::build));
}
public <T> DCVal<T> reg(String id, Class<T> cls, boolean cache) {
var cdc = new CodecAdaptor<>(cls);
return reg(id, cdc, cdc.toNetwork(), cache);
}
public <T> DCVal<List<T>> list(String id, Class<T> cls, boolean cache) {
var cdc = new CodecAdaptor<>(cls);
return reg(id, cdc.listOf(), ByteBufCodecs.<RegistryFriendlyByteBuf, T>list().apply(cdc.toNetwork()), cache);
}
public DCVal<Unit> unit(String id) {
return reg(id, Unit.CODEC, StreamCodec.unit(Unit.INSTANCE), false);
}
@@ -56,9 +73,17 @@ public record DCReg(DeferredRegister<DataComponentType<?>> reg) {
return reg(id, Codec.STRING, ByteBufCodecs.STRING_UTF8, false);
}
public DCVal<ResourceLocation> loc(String id) {
return reg(id, ResourceLocation.CODEC, ResourceLocation.STREAM_CODEC, false);
}
public DCVal<UUID> uuid(String id) {
return reg(id, Codec.STRING.xmap(UUID::fromString, UUID::toString),
StreamCodec.of((b, e) -> FriendlyByteBuf.writeUUID(b, e), b -> FriendlyByteBuf.readUUID(b)), true);
return reg(id, UUIDUtil.CODEC, UUIDUtil.STREAM_CODEC, true);
}
public DCVal<Set<UUID>> uuidSet(String id) {
return reg(id, UUIDUtil.CODEC_LINKED_SET, UUIDUtil.STREAM_CODEC.apply(
ByteBufCodecs.collection(LinkedHashSet::newLinkedHashSet)), true);
}
public DCVal<DCStack> stack(String id) {

5
src/main/java/dev/xkmc/l2core/serial/advancements/CriterionBuilder.java
View File

@@ -15,6 +15,7 @@ import net.neoforged.neoforge.common.conditions.ICondition;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
public class CriterionBuilder implements IAdvBuilder {
@@ -71,6 +72,10 @@ public class CriterionBuilder implements IAdvBuilder {
new EnchantmentPredicate(enchantment, MinMaxBounds.Ints.ANY))))));
}
public static CriterionBuilder player(PlayerTrigger trigger) {
return one(trigger.createCriterion(new PlayerTrigger.TriggerInstance(Optional.empty())));
}
public static CriterionBuilder one(Criterion<?> instance) {
return new CriterionBuilder(RequirementsStrategy.AND).add(instance);
}