2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
|
|
Date: Wed, 22 Apr 2020 23:29:20 +0200
|
|
|
|
Subject: [PATCH] Add villager reputation API
|
|
|
|
|
2022-11-19 23:53:20 +00:00
|
|
|
== AT ==
|
|
|
|
public net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips
|
|
|
|
public net.minecraft.world.entity.ai.gossip.GossipContainer$EntityGossips <init>()V
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
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
|
2022-11-19 23:53:20 +00:00
|
|
|
index 76dfb546ddddb14497269d22ac1c8f84a0a9c15c..92beb137d86ae89d90b1963a024c0be308d81a42 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
|
2022-05-29 19:54:25 +00:00
|
|
|
@@ -27,7 +27,7 @@ import net.minecraft.util.VisibleForDebug;
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
public class GossipContainer {
|
2021-06-14 05:32:56 +00:00
|
|
|
public static final int DISCARD_THRESHOLD = 2;
|
2021-06-11 12:02:28 +00:00
|
|
|
- private final Map<UUID, GossipContainer.EntityGossips> gossips = Maps.newHashMap();
|
|
|
|
+ private final Map<UUID, GossipContainer.EntityGossips> gossips = Maps.newHashMap(); public Map<UUID, GossipContainer.EntityGossips> getReputations() { return this.gossips; } // Paper - add getter for reputations
|
|
|
|
|
2021-06-14 05:32:56 +00:00
|
|
|
@VisibleForDebug
|
|
|
|
public Map<UUID, Object2IntMap<GossipType>> getGossipEntries() {
|
2022-11-12 17:41:22 +00:00
|
|
|
@@ -226,6 +226,43 @@ public class GossipContainer {
|
2021-06-11 12:02:28 +00:00
|
|
|
public void remove(GossipType gossipType) {
|
|
|
|
this.entries.removeInt(gossipType);
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start - Add villager reputation API
|
2022-11-12 17:41:22 +00:00
|
|
|
+ private static final GossipType[] TYPES = GossipType.values();
|
2021-06-11 12:02:28 +00:00
|
|
|
+ public com.destroystokyo.paper.entity.villager.Reputation getPaperReputation() {
|
2022-11-12 17:41:22 +00:00
|
|
|
+ Map<com.destroystokyo.paper.entity.villager.ReputationType, Integer> map = new java.util.EnumMap<>(com.destroystokyo.paper.entity.villager.ReputationType.class);
|
|
|
|
+ for (Object2IntMap.Entry<GossipType> type : this.entries.object2IntEntrySet()) {
|
|
|
|
+ map.put(toApi(type.getKey()), type.getIntValue());
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return new com.destroystokyo.paper.entity.villager.Reputation(map);
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void assignFromPaperReputation(com.destroystokyo.paper.entity.villager.Reputation rep) {
|
2022-11-12 17:41:22 +00:00
|
|
|
+ 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;
|
|
|
|
+ };
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
|
|
|
+ // 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
|
2022-11-12 17:41:22 +00:00
|
|
|
index 1a8a49bd269ed52879866ff3853e131d04aa8bba..d1f5e1292246e0fb252d3d3409bbf37cc8166bbc 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVillager.java
|
2022-04-30 16:27:41 +00:00
|
|
|
@@ -17,6 +17,13 @@ import org.bukkit.entity.Villager;
|
2022-04-16 08:29:50 +00:00
|
|
|
import org.bukkit.entity.ZombieVillager;
|
2022-04-30 16:27:41 +00:00
|
|
|
import org.bukkit.event.entity.CreatureSpawnEvent;
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
+// 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) {
|
2022-04-30 16:27:41 +00:00
|
|
|
@@ -146,4 +153,45 @@ public class CraftVillager extends CraftAbstractVillager implements Villager {
|
2021-06-11 12:02:28 +00:00
|
|
|
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) {
|
2021-06-17 20:20:03 +00:00
|
|
|
+ net.minecraft.world.entity.ai.gossip.GossipContainer.EntityGossips rep = getHandle().getGossips().getReputations().get(uniqueId);
|
2021-06-11 12:02:28 +00:00
|
|
|
+ if (rep == null) {
|
2022-11-12 17:41:22 +00:00
|
|
|
+ return new Reputation(new java.util.EnumMap<>(com.destroystokyo.paper.entity.villager.ReputationType.class));
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return rep.getPaperReputation();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Map<UUID, Reputation> getReputations() {
|
2021-06-17 20:20:03 +00:00
|
|
|
+ return getHandle().getGossips().getReputations().entrySet()
|
2021-06-11 12:02:28 +00:00
|
|
|
+ .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 =
|
2021-06-17 20:20:03 +00:00
|
|
|
+ getHandle().getGossips().getReputations().computeIfAbsent(
|
2021-06-11 12:02:28 +00:00
|
|
|
+ uniqueId,
|
|
|
|
+ key -> new net.minecraft.world.entity.ai.gossip.GossipContainer.EntityGossips()
|
|
|
|
+ );
|
|
|
|
+ nmsReputation.assignFromPaperReputation(reputation);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setReputations(Map<UUID, Reputation> reputations) {
|
|
|
|
+ for (Map.Entry<UUID, Reputation> entry : reputations.entrySet()) {
|
|
|
|
+ setReputation(entry.getKey(), entry.getValue());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void clearReputations() {
|
2021-06-17 20:20:03 +00:00
|
|
|
+ getHandle().getGossips().getReputations().clear();
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|