aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0414-Add-villager-reputation-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0414-Add-villager-reputation-API.patch')
-rw-r--r--patches/server/0414-Add-villager-reputation-API.patch127
1 files changed, 127 insertions, 0 deletions
diff --git a/patches/server/0414-Add-villager-reputation-API.patch b/patches/server/0414-Add-villager-reputation-API.patch
new file mode 100644
index 0000000000..4c38780334
--- /dev/null
+++ b/patches/server/0414-Add-villager-reputation-API.patch
@@ -0,0 +1,127 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mariell Hoversholm <[email protected]>
+Date: Wed, 22 Apr 2020 23:29:20 +0200
+Subject: [PATCH] Add villager reputation API
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/entity/villager/ReputationConstructor.java b/src/main/java/com/destroystokyo/paper/entity/villager/ReputationConstructor.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..0f10c333d88f2e1c56a6c7f22d421084adfd3789
+--- /dev/null
++++ b/src/main/java/com/destroystokyo/paper/entity/villager/ReputationConstructor.java
+@@ -0,0 +1,9 @@
++package com.destroystokyo.paper.entity.villager;
++// Must have own package due to package-level constructor.
++
++public final class ReputationConstructor {
++ // Abuse the package-level constructor.
++ public static Reputation construct(int[] values) {
++ return new Reputation(values);
++ }
++}
+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..0de65462956fa734b6405614e047161696e596fb 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<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
+
+ @VisibleForDebug
+ public Map<UUID, Object2IntMap<GossipType>> getGossipEntries() {
+@@ -226,6 +226,28 @@ public class GossipContainer {
+ public void remove(GossipType gossipType) {
+ this.entries.removeInt(gossipType);
+ }
++
++ // Paper start - Add villager reputation API
++ private static final com.destroystokyo.paper.entity.villager.ReputationType[] REPUTATION_TYPES = com.destroystokyo.paper.entity.villager.ReputationType.values();
++ public com.destroystokyo.paper.entity.villager.Reputation getPaperReputation() {
++ int[] reputation = new int[REPUTATION_TYPES.length];
++ reputation[com.destroystokyo.paper.entity.villager.ReputationType.MAJOR_NEGATIVE.ordinal()] = entries.getOrDefault(GossipType.MAJOR_NEGATIVE, 0);
++ reputation[com.destroystokyo.paper.entity.villager.ReputationType.MAJOR_POSITIVE.ordinal()] = entries.getOrDefault(GossipType.MAJOR_POSITIVE, 0);
++ reputation[com.destroystokyo.paper.entity.villager.ReputationType.MINOR_NEGATIVE.ordinal()] = entries.getOrDefault(GossipType.MINOR_NEGATIVE, 0);
++ reputation[com.destroystokyo.paper.entity.villager.ReputationType.MINOR_POSITIVE.ordinal()] = entries.getOrDefault(GossipType.MINOR_POSITIVE, 0);
++ reputation[com.destroystokyo.paper.entity.villager.ReputationType.TRADING.ordinal()] = entries.getOrDefault(GossipType.TRADING, 0);
++ return com.destroystokyo.paper.entity.villager.ReputationConstructor.construct(reputation);
++ }
++
++ public void assignFromPaperReputation(com.destroystokyo.paper.entity.villager.Reputation rep) {
++ int val;
++ if ((val = rep.getReputation(com.destroystokyo.paper.entity.villager.ReputationType.MAJOR_NEGATIVE)) != 0) this.entries.put(GossipType.MAJOR_NEGATIVE, val);
++ if ((val = rep.getReputation(com.destroystokyo.paper.entity.villager.ReputationType.MAJOR_POSITIVE)) != 0) this.entries.put(GossipType.MAJOR_POSITIVE, val);
++ if ((val = rep.getReputation(com.destroystokyo.paper.entity.villager.ReputationType.MINOR_NEGATIVE)) != 0) this.entries.put(GossipType.MINOR_NEGATIVE, val);
++ if ((val = rep.getReputation(com.destroystokyo.paper.entity.villager.ReputationType.MINOR_POSITIVE)) != 0) this.entries.put(GossipType.MINOR_POSITIVE, val);
++ if ((val = rep.getReputation(com.destroystokyo.paper.entity.villager.ReputationType.TRADING)) != 0) this.entries.put(GossipType.TRADING, val);
++ }
++ // 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..f0b910df1ee471b4d72d97c6197ab14f2854976e 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(Maps.newHashMap());
++ }
++
++ return rep.getPaperReputation();
++ }
++
++ @Override
++ public Map<UUID, Reputation> 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<UUID, Reputation> reputations) {
++ for (Map.Entry<UUID, Reputation> entry : reputations.entrySet()) {
++ setReputation(entry.getKey(), entry.getValue());
++ }
++ }
++
++ @Override
++ public void clearReputations() {
++ getHandle().getGossips().getReputations().clear();
++ }
++ // Paper end
+ }