From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Wed, 22 Apr 2020 23:29:20 +0200 Subject: [PATCH] Add villager reputation API diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java index 7a7c92f1a026116958ad24312df358a703834369..1e503b075983343d2b12a5a9216fdad879bf1b7c 100644 --- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java +++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java @@ -27,7 +27,7 @@ import net.minecraft.util.VisibleForDebug; public class GossipContainer { public static final int DISCARD_THRESHOLD = 2; - private final Map gossips = Maps.newHashMap(); + private final Map gossips = Maps.newHashMap(); public Map getReputations() { return this.gossips; } // Paper - add getter for reputations @VisibleForDebug public Map> getGossipEntries() { @@ -226,6 +226,43 @@ public class GossipContainer { public void remove(GossipType gossipType) { this.entries.removeInt(gossipType); } + + // Paper start - Add villager reputation API + private static final GossipType[] TYPES = GossipType.values(); + public com.destroystokyo.paper.entity.villager.Reputation getPaperReputation() { + Map map = new java.util.EnumMap<>(com.destroystokyo.paper.entity.villager.ReputationType.class); + for (Object2IntMap.Entry type : this.entries.object2IntEntrySet()) { + map.put(toApi(type.getKey()), type.getIntValue()); + } + + return new com.destroystokyo.paper.entity.villager.Reputation(map); + } + + public void assignFromPaperReputation(com.destroystokyo.paper.entity.villager.Reputation rep) { + for (GossipType type : TYPES) { + com.destroystokyo.paper.entity.villager.ReputationType api = toApi(type); + + if (rep.hasReputationSet(api)) { + int reputation = rep.getReputation(api); + if (reputation == 0) { + this.entries.removeInt(type); + } else { + this.entries.put(type, reputation); + } + } + } + } + + private static com.destroystokyo.paper.entity.villager.ReputationType toApi(GossipType type) { + return switch (type) { + case MAJOR_NEGATIVE -> com.destroystokyo.paper.entity.villager.ReputationType.MAJOR_NEGATIVE; + case MINOR_NEGATIVE -> com.destroystokyo.paper.entity.villager.ReputationType.MINOR_NEGATIVE; + case MINOR_POSITIVE -> com.destroystokyo.paper.entity.villager.ReputationType.MINOR_POSITIVE; + case MAJOR_POSITIVE -> com.destroystokyo.paper.entity.villager.ReputationType.MAJOR_POSITIVE; + case TRADING -> com.destroystokyo.paper.entity.villager.ReputationType.TRADING; + }; + } + // Paper end } static class GossipEntry { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java index 1a8a49bd269ed52879866ff3853e131d04aa8bba..d1f5e1292246e0fb252d3d3409bbf37cc8166bbc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java @@ -17,6 +17,13 @@ import org.bukkit.entity.Villager; import org.bukkit.entity.ZombieVillager; import org.bukkit.event.entity.CreatureSpawnEvent; +// Paper start +import com.destroystokyo.paper.entity.villager.Reputation; +import com.google.common.collect.Maps; +import java.util.Map; +import java.util.UUID; +// Paper end + public class CraftVillager extends CraftAbstractVillager implements Villager { public CraftVillager(CraftServer server, net.minecraft.world.entity.npc.Villager entity) { @@ -146,4 +153,45 @@ public class CraftVillager extends CraftAbstractVillager implements Villager { public static VillagerProfession bukkitToNmsProfession(Profession bukkit) { return Registry.VILLAGER_PROFESSION.get(CraftNamespacedKey.toMinecraft(bukkit.getKey())); } + + // Paper start - Add villager reputation API + @Override + public Reputation getReputation(UUID uniqueId) { + net.minecraft.world.entity.ai.gossip.GossipContainer.EntityGossips rep = getHandle().getGossips().getReputations().get(uniqueId); + if (rep == null) { + return new Reputation(new java.util.EnumMap<>(com.destroystokyo.paper.entity.villager.ReputationType.class)); + } + + return rep.getPaperReputation(); + } + + @Override + public Map getReputations() { + return getHandle().getGossips().getReputations().entrySet() + .stream() + .collect(java.util.stream.Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().getPaperReputation())); + } + + @Override + public void setReputation(UUID uniqueId, Reputation reputation) { + net.minecraft.world.entity.ai.gossip.GossipContainer.EntityGossips nmsReputation = + getHandle().getGossips().getReputations().computeIfAbsent( + uniqueId, + key -> new net.minecraft.world.entity.ai.gossip.GossipContainer.EntityGossips() + ); + nmsReputation.assignFromPaperReputation(reputation); + } + + @Override + public void setReputations(Map reputations) { + for (Map.Entry entry : reputations.entrySet()) { + setReputation(entry.getKey(), entry.getValue()); + } + } + + @Override + public void clearReputations() { + getHandle().getGossips().getReputations().clear(); + } + // Paper end }