Skip to content

wip: some thoughts on how we might translate data #4178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gabizou wants to merge 1 commit into
base: api-15
Choose a base branch
from
Draft

wip: some thoughts on how we might translate data #4178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/main/java/org/spongepowered/common/data/provider/entity/AreaEffectCloudData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
package org.spongepowered.common.data.provider.entity;

import com.google.common.collect.Streams;
import net.minecraft.core.component.DataComponents;
import net.minecraft.world.entity.AreaEffectCloud;
import net.minecraft.world.item.alchemy.PotionContents;
import org.spongepowered.api.data.Keys;
Expand Down Expand Up @@ -93,12 +94,6 @@ public static void register(final DataProviderRegistrator registrator) {
h.accessor$durationOnUse(SpongeTicks.toSaturatedIntOrInfinite(v));
return true;
})
.create(Keys.POTION_EFFECTS)
.get(h -> PotionEffectUtil.copyAsPotionEffects(Streams.stream(h.accessor$potionContents().getAllEffects()).toList()))
.set((h, v) -> {
final PotionContents contents = h.accessor$potionContents();
((AreaEffectCloud) h).setPotionContents(new PotionContents(contents.potion(), contents.customColor(), PotionEffectUtil.copyAsEffectInstances(v), contents.customName()));
})
.create(Keys.REAPPLICATION_DELAY)
.get(h -> new SpongeTicks(h.accessor$reapplicationDelay()))
.setAnd((h, v) -> {
Expand All @@ -108,6 +103,14 @@ public static void register(final DataProviderRegistrator registrator) {
h.accessor$reapplicationDelay(SpongeTicks.toSaturatedIntOrInfinite(v));
return true;
});
// @formatter:on
final var areaEffectCloud = registrator.asMutable(AreaEffectCloud.class);
final var components = EntityDataProviders.of(
EntityDataProviders.transformedWith(Keys.POTION_EFFECTS, DataComponents.POTION_CONTENTS,
(p) -> PotionEffectUtil.copyAsPotionEffects(Streams.stream(p.getAllEffects()).toList()),
(a, original) -> new PotionContents(original.potion(), original.customColor(), PotionEffectUtil.copyAsEffectInstances(a), original.customName())
)
);
components.forEach(p -> p.applyToRegistrator(areaEffectCloud));
}
// @formatter:on
}
16 changes: 9 additions & 7 deletions src/main/java/org/spongepowered/common/data/provider/entity/CatData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
package org.spongepowered.common.data.provider.entity;

import net.minecraft.core.Holder;
import net.minecraft.core.component.DataComponents;
import net.minecraft.core.registries.Registries;
import net.minecraft.world.entity.animal.Cat;
import net.minecraft.world.entity.animal.CatVariant;
import org.spongepowered.api.data.Keys;
Expand All @@ -43,12 +45,6 @@ private CatData() {
public static void register(final DataProviderRegistrator registrator) {
registrator
.asMutable(Cat.class)
.create(Keys.CAT_TYPE)
.get(h -> (CatType) (Object) h.getVariant().value())
.set((h, v) -> ((CatAccessor) h).invoker$setVariant(Holder.direct((CatVariant) (Object) v)))
.create(Keys.DYE_COLOR)
.get(h -> (DyeColor) (Object) h.getCollarColor())
.set((h, v) -> ((CatAccessor)h).invoker$setCollarColor((net.minecraft.world.item.DyeColor) (Object) v))
.create(Keys.IS_BEGGING_FOR_FOOD)
.get(h -> {
throw new MissingImplementationException("CatData", "IS_BEGGING_FOR_FOOD::getter");
Expand All @@ -75,6 +71,12 @@ public static void register(final DataProviderRegistrator registrator) {
.create(Keys.IS_RELAXED)
.get(CatAccessor::invoker$isRelaxStateOne)
.set(CatAccessor::invoker$setRelaxStateOne);
// @formatter:on
final var cat = registrator.asMutable(Cat.class);
final var components = EntityDataProviders.of(
EntityDataProviders.holderOf(Keys.CAT_TYPE, DataComponents.CAT_VARIANT, Registries.CAT_VARIANT),
EntityDataProviders.enumOf(Keys.DYE_COLOR, DataComponents.CAT_COLLAR)
);
components.forEach(p -> p.applyToRegistrator(cat));
}
// @formatter:on
}
7 changes: 6 additions & 1 deletion src/main/java/org/spongepowered/common/data/provider/entity/ChickenData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ public static void register(final DataProviderRegistrator registrator) {
h.eggTime = ticks;
return true;
});
// @formatter:on
final var chicken = registrator.asMutable(Chicken.class);
final var components = EntityDataProviders.of(
// TODO - EitherHolder is a different kind of thing
// EntityDataProviders.eitherHolderOf()
);
}
// @formatter:on
}
19 changes: 12 additions & 7 deletions src/main/java/org/spongepowered/common/data/provider/entity/EntityData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
package org.spongepowered.common.data.provider.entity;

import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import net.minecraft.core.component.DataComponents;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.PortalProcessor;
Expand Down Expand Up @@ -81,13 +82,6 @@ public static void register(final DataProviderRegistrator registrator) {
}
return (org.spongepowered.api.entity.Entity) rootVehicle;
})
.create(Keys.CUSTOM_NAME)
.get(h -> h.hasCustomName() ? SpongeAdventure.asAdventure(h.getCustomName()) : null)
.set((h, v) -> h.setCustomName(SpongeAdventure.asVanilla(v)))
.delete(h -> {
h.setCustomName(null);
h.setCustomNameVisible(false);
})
.create(Keys.DISPLAY_NAME)
.get(h -> SpongeAdventure.asAdventure(h.getDisplayName()))
.create(Keys.EYE_HEIGHT)
Expand Down Expand Up @@ -266,6 +260,17 @@ public static void register(final DataProviderRegistrator registrator) {
dv -> dv.getString(Constants.Entity.CUSTOM_NAME).map(GsonComponentSerializer.gson()::deserialize));

// @formatter:on
final var entity = registrator.asMutable(Entity.class);
final var components = EntityDataProviders.of(
EntityDataProviders.optionalTransformed(Keys.CUSTOM_NAME, DataComponents.CUSTOM_NAME, SpongeAdventure::asAdventure, SpongeAdventure::asVanilla),
EntityDataProviders.deleter(Keys.CUSTOM_NAME, h -> {
h.setCustomName(null);
h.setCustomNameVisible(false);
})
);
for (var provider : components) {
provider.applyToRegistrator(entity);
}
}

}
101 changes: 98 additions & 3 deletions src/main/java/org/spongepowered/common/data/provider/entity/EntityDataProviders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,66 @@
import net.minecraft.core.component.DataComponentType;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.entity.Entity;
import org.checkerframework.checker.nullness.qual.Nullable;
import org.spongepowered.api.data.DataTransactionResult;
import org.spongepowered.api.data.Key;
import org.spongepowered.api.data.Keys;
import org.spongepowered.api.data.value.Value;
import org.spongepowered.api.registry.DefaultedRegistryValue;
import org.spongepowered.common.adventure.SpongeAdventure;
import org.spongepowered.common.data.provider.DataProviderRegistrator;
import org.spongepowered.common.data.provider.DataProviderRegistratorBuilder;

import java.util.List;
import java.util.Optional;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;

public final class EntityDataProviders extends DataProviderRegistratorBuilder {

public sealed interface KeyComponentProvider<A extends DefaultedRegistryValue, MC> {
public sealed interface KeyComponentProvider<A, MC> {
<T extends Entity> void applyToRegistrator(DataProviderRegistrator.MutableRegistrator<T> registrator);
}

public static List<KeyComponentProvider<?, ?>> of(KeyComponentProvider<?, ?>... providers) {
return List.of(providers);
}

public static <A, MC> KeyComponentProvider<A, MC> transformed(
Key<? extends Value<A>> apiKey,
DataComponentType<MC> componentType,
Function<MC, A> getter,
Function<A, MC> setter
) {
return new FunctionalProvider<>(apiKey, componentType, getter, setter);
}

public static <A, MC> KeyComponentProvider<A, MC> transformedWith(
Key<? extends Value<A>> apiKey,
DataComponentType<MC> componentType,
Function<MC, A> getter,
BiFunction<A, @Nullable MC, MC> setter
) {
return new BiFunctionProvider<>(apiKey, componentType, getter, setter);
}

public static <A, MC> KeyComponentProvider<A, MC> optionalTransformed(
Key<Value<A>> apiKey,
DataComponentType<MC> componentType,
Function<MC, A> getter,
Function<A, MC> setter
) {
return new OptionalFunctionProvider<>(apiKey, componentType, getter, setter);
}

public static <A, MC> KeyComponentProvider<A, MC> deleter(
Key<Value<A>> apiKey,
Consumer<Entity> deleter
) {
return new DeletionProvider<>(apiKey, deleter);
}

public static <A extends DefaultedRegistryValue, MC> KeyComponentProvider<A, MC> holderOf(
Key<Value<A>> apiKey,
DataComponentType<Holder<MC>> componentType,
Expand All @@ -62,9 +104,62 @@ public static <A extends DefaultedRegistryValue, MC extends Enum<MC>> KeyCompone
return new EnumProvider<>(apiKey, componentType);
}

record DeletionProvider<A, MC>(
Key<Value<A>> apiKey,
Consumer<Entity> deleter
) implements KeyComponentProvider<A, MC> {
public <T extends Entity> void applyToRegistrator(DataProviderRegistrator.MutableRegistrator<T> registrator) {
registrator.create(this.apiKey)
.delete(deleter::accept);
}
}

record FunctionalProvider<A, MC>(
Key<? extends Value<A>> apiKey,
DataComponentType<MC> componentType,
Function<MC, A> getter,
Function<A, MC> setter
) implements KeyComponentProvider<A, MC> {
public <T extends Entity> void applyToRegistrator(DataProviderRegistrator.MutableRegistrator<T> registrator) {
registrator.create(this.apiKey)
.get(h -> this.getter.apply(h.get(this.componentType)))
.set((h, v) -> h.setComponent(this.componentType, this.setter.apply(v)));
}
}

record BiFunctionProvider<A, MC>(
Key<? extends Value<A>> apiKey,
DataComponentType<MC> componentType,
Function<MC, A> getter,
BiFunction<A, @Nullable MC, MC> setter
) implements KeyComponentProvider<A, MC> {
public <T extends Entity> void applyToRegistrator(DataProviderRegistrator.MutableRegistrator<T> registrator) {
registrator.create(this.apiKey)
.get(h -> this.getter.apply(h.get(this.componentType)))
.set((h, v) -> {
final var existing = h.get(this.componentType);
final var newValue = this.setter.apply(v, existing);
h.setComponent(this.componentType, newValue);
});
}
}

record OptionalFunctionProvider<A, MC>(
Key<? extends Value<A>> apiKey,
DataComponentType<MC> componentType,
Function<MC, A> getter,
Function<A, MC> setter
) implements KeyComponentProvider<A, MC> {
public <T extends Entity> void applyToRegistrator(DataProviderRegistrator.MutableRegistrator<T> registrator) {
registrator.create(this.apiKey)
.get(h -> Optional.ofNullable(h.get(this.componentType)).map(this.getter).orElse(null))
.set((h, v) -> h.setComponent(this.componentType, v == null ? null : this.setter.apply(v)));
}
}

@SuppressWarnings("unchecked")
record HolderProvider<A extends DefaultedRegistryValue, MC>(
Key<Value<A>> apiKey,
Key<? extends Value<A>> apiKey,
DataComponentType<Holder<MC>> componentType,
ResourceKey<Registry<MC>> resourceKey
) implements KeyComponentProvider<A, MC> {
Expand All @@ -85,7 +180,7 @@ public <T extends Entity> void applyToRegistrator(DataProviderRegistrator.Mutabl

@SuppressWarnings("unchecked")
record EnumProvider<A extends DefaultedRegistryValue, MC extends Enum<MC>>(
Key<Value<A>> apiKey,
Key<? extends Value<A>> apiKey,
DataComponentType<MC> componentType
) implements KeyComponentProvider<A, MC> {
public <T extends Entity> void applyToRegistrator(DataProviderRegistrator.MutableRegistrator<T> registrator) {
Expand Down
Loading