PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-08 06:26:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add tag support to the item traits loader

Browse source
This commit is contained in:
Sollace 2023-11-02 15:47:45 +00:00
parent 0f4360a896
commit 177eb541a7
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
3 changed files with 65 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/minelittlepony/unicopia/Debug.java
View file

@ -1,9 +1,11 @@
package com.minelittlepony.unicopia;
import com.minelittlepony.unicopia.ability.magic.spell.trait.SpellTraits;
import com.minelittlepony.unicopia.entity.mob.AirBalloonEntity;
import com.minelittlepony.unicopia.entity.mob.UEntities;
import net.minecraft.entity.vehicle.BoatEntity;
import net.minecraft.registry.Registries;
import net.minecraft.world.World;
public interface Debug {
@ -18,6 +20,16 @@ public interface Debug {
}
TESTS_COMPLETE[0] = true;
try {
Registries.ITEM.getEntrySet().forEach(entry -> {
if (SpellTraits.of(entry.getValue()).isEmpty()) {
// Unicopia.LOGGER.warn("No traits registered for item {}", entry.getKey());
}
});
} catch (Throwable t) {
throw new IllegalStateException("Tests failed", t);
}
try {
for (var type : BoatEntity.Type.values()) {
var balloon = UEntities.AIR_BALLOON.create(world);

7
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/SpellTraits.java
View file

@ -43,7 +43,7 @@ public final class SpellTraits implements Iterable<Map.Entry<Trait, Float>> {
static final Map<Trait, List<Item>> ITEMS = new HashMap<>();
public static void load(Map<Identifier, SpellTraits> newRegistry) {
REGISTRY = new HashMap<>(newRegistry);
REGISTRY = newRegistry;
ITEMS.clear();
REGISTRY.forEach((itemId, traits) -> {
Registries.ITEM.getOrEmpty(itemId).ifPresent(item -> {
@ -220,10 +220,7 @@ public final class SpellTraits implements Iterable<Map.Entry<Trait, Float>> {
}
public static Stream<Item> getItems(Trait trait) {
return REGISTRY.entrySet().stream()
.filter(e -> e.getValue().get(trait) > 0)
.map(Map.Entry::getKey)
.flatMap(id -> Registries.ITEM.getOrEmpty(id).stream());
return ITEMS.getOrDefault(trait, List.of()).stream();
}
public static Optional<SpellTraits> getEmbeddedTraits(ItemStack stack) {

66
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/trait/TraitLoader.java
View file

@ -5,7 +5,9 @@ import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
@ -26,7 +28,11 @@ import net.minecraft.resource.SinglePreparationResourceReloader;
import net.minecraft.util.Identifier;
import net.minecraft.util.JsonHelper;
import net.minecraft.util.profiler.Profiler;
import net.minecraft.item.Item;
import net.minecraft.item.ItemConvertible;
import net.minecraft.registry.Registries;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.tag.TagKey;
public class TraitLoader extends SinglePreparationResourceReloader<Multimap<Identifier, TraitLoader.TraitStream>> implements IdentifiableResourceReloadListener {
private static final Identifier ID = Unicopia.id("data/traits");
@ -77,9 +83,24 @@ public class TraitLoader extends SinglePreparationResourceReloader<Multimap<Iden
@Override
protected void apply(Multimap<Identifier, TraitStream> prepared, ResourceManager manager, Profiler profiler) {
profiler.startTick();
SpellTraits.load(prepared.values().stream()
Set<Map.Entry<TraitStream.Key, SpellTraits>> newRegistry = prepared.values().stream()
.flatMap(TraitStream::entries)
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, SpellTraits::union)));
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, SpellTraits::union))
.entrySet();
SpellTraits.load(Registries.ITEM.getEntrySet().stream()
.map(entry -> Map.entry(
entry.getKey().getValue(),
newRegistry.stream()
.filter(p -> p.getKey().test(entry.getValue()))
.map(Map.Entry::getValue)
.reduce(SpellTraits::union)
.orElse(SpellTraits.EMPTY)
))
.filter(entry -> !entry.getValue().isEmpty())
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)));
profiler.endTick();
}
@ -88,14 +109,14 @@ public class TraitLoader extends SinglePreparationResourceReloader<Multimap<Iden
boolean replace();
Stream<Map.Entry<Identifier, SpellTraits>> entries();
Stream<Map.Entry<Key, SpellTraits>> entries();
static TraitStream of(Identifier id, String pack, JsonObject json) {
if (json.has("items") && json.get("items").isJsonObject()) {
return new TraitMap(JsonHelper.getBoolean(json, "replace", false),
Resources.GSON.getAdapter(TYPE).fromJsonTree(json.get("items")).entrySet().stream().collect(Collectors.toMap(
a -> Identifier.tryParse(a.getKey()),
a -> Key.of(a.getKey()),
a -> SpellTraits.fromString(a.getValue()).orElse(SpellTraits.EMPTY)
))
);
@ -106,23 +127,16 @@ public class TraitLoader extends SinglePreparationResourceReloader<Multimap<Iden
SpellTraits.fromString(JsonHelper.getString(json, "traits")).orElse(SpellTraits.EMPTY),
StreamSupport.stream(JsonHelper.getArray(json, "items").spliterator(), false)
.map(JsonElement::getAsString)
.map(Identifier::tryParse)
.filter(item -> {
if (item == null || !Registries.ITEM.containsId(item)) {
Unicopia.LOGGER.warn("Skipping unknown item {} in {}:{}", item, pack, id);
return false;
}
return true;
})
.map(Key::of)
.collect(Collectors.toSet())
);
}
record TraitMap (
boolean replace,
Map<Identifier, SpellTraits> items) implements TraitStream {
Map<Key, SpellTraits> items) implements TraitStream {
@Override
public Stream<Entry<Identifier, SpellTraits>> entries() {
public Stream<Entry<Key, SpellTraits>> entries() {
return items.entrySet().stream();
}
}
@ -130,12 +144,32 @@ public class TraitLoader extends SinglePreparationResourceReloader<Multimap<Iden
record TraitSet (
boolean replace,
SpellTraits traits,
Set<Identifier> items) implements TraitStream {
Set<Key> items) implements TraitStream {
@Override
public Stream<Entry<Identifier, SpellTraits>> entries() {
public Stream<Entry<Key, SpellTraits>> entries() {
return items().stream().map(item -> Map.entry(item, traits()));
}
}
interface Key extends Predicate<ItemConvertible> {
static Key of(String s) {
return s.startsWith("#") ? new Tag(TagKey.of(RegistryKeys.ITEM, Identifier.tryParse(s.substring(1)))) : new Id(Identifier.tryParse(s));
}
record Tag(TagKey<Item> tag) implements Key {
@SuppressWarnings("deprecation")
@Override
public boolean test(ItemConvertible item) {
return item.asItem().getRegistryEntry().isIn(tag);
}
}
record Id(Identifier id) implements Key {
@Override
public boolean test(ItemConvertible item) {
return Objects.equals(id, Registries.ITEM.getId(item.asItem()));
}
}
}
}
}