Patch VillagerTrades.EmeraldsForVillagerTypeItem to allow modders to …

…make Custom Villager Types
neoforged · Jan 19, 2025 · 4401d58 · 4401d58
1 parent 7227aa1
commit 4401d58
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/patches/net/minecraft/world/entity/npc/VillagerTrades.java.patch b/patches/net/minecraft/world/entity/npc/VillagerTrades.java.patch
@@ -0,0 +1,22 @@
+--- a/net/minecraft/world/entity/npc/VillagerTrades.java
++++ b/net/minecraft/world/entity/npc/VillagerTrades.java
+@@ -1484,9 +_,6 @@
+         private final int villagerXp;
+
+         public EmeraldsForVillagerTypeItem(int p_35669_, int p_35670_, int p_35671_, Map<VillagerType, Item> p_35672_) {
+-            BuiltInRegistries.VILLAGER_TYPE.stream().filter(p_35680_ -> !p_35672_.containsKey(p_35680_)).findAny().ifPresent(p_339515_ -> {
+-                throw new IllegalStateException("Missing trade for villager type: " + BuiltInRegistries.VILLAGER_TYPE.getKey(p_339515_));
+-            });
+             this.trades = p_35672_;
+             this.cost = p_35669_;
+             this.maxUses = p_35670_;
+@@ -1498,6 +_,9 @@
+         public MerchantOffer getOffer(Entity p_219685_, RandomSource p_219686_) {
+             if (p_219685_ instanceof VillagerDataHolder villagerdataholder) {
+                 ItemCost itemcost = new ItemCost(this.trades.get(villagerdataholder.getVillagerData().getType()), this.cost);
++                if (itemcost.itemStack().isEmpty()) {
++                    return null;
++                }
+                 return new MerchantOffer(itemcost, new ItemStack(Items.EMERALD), this.maxUses, this.villagerXp, 0.05F);
+             } else {
+                 return null;