From 98e06736ee2fe9265958bed0078d178a18525e0e Mon Sep 17 00:00:00 2001 From: canitzp <12819060+canitzp@users.noreply.github.com> Date: Mon, 17 May 2021 22:16:00 +0200 Subject: [PATCH] Fix TradeRegistryImpl throwing an AssertionError at runtime (#87) --- .../architectury/registry/trade/fabric/TradeRegistryImpl.java | 2 +- .../architectury/registry/trade/forge/TradeRegistryImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric/src/main/java/me/shedaniel/architectury/registry/trade/fabric/TradeRegistryImpl.java b/fabric/src/main/java/me/shedaniel/architectury/registry/trade/fabric/TradeRegistryImpl.java index a897e2b4..b2802972 100644 --- a/fabric/src/main/java/me/shedaniel/architectury/registry/trade/fabric/TradeRegistryImpl.java +++ b/fabric/src/main/java/me/shedaniel/architectury/registry/trade/fabric/TradeRegistryImpl.java @@ -26,7 +26,7 @@ import net.minecraft.world.entity.npc.VillagerTrades; import java.util.Collections; public class TradeRegistryImpl { - private static void registerVillagerTrade0(VillagerProfession profession, int level, VillagerTrades.ItemListing... trades) { + public static void registerVillagerTrade0(VillagerProfession profession, int level, VillagerTrades.ItemListing... trades) { TradeOfferHelper.registerVillagerOffers(profession, level, allTradesList -> Collections.addAll(allTradesList, trades)); } diff --git a/forge/src/main/java/me/shedaniel/architectury/registry/trade/forge/TradeRegistryImpl.java b/forge/src/main/java/me/shedaniel/architectury/registry/trade/forge/TradeRegistryImpl.java index fcecfab2..8cc7b2bf 100644 --- a/forge/src/main/java/me/shedaniel/architectury/registry/trade/forge/TradeRegistryImpl.java +++ b/forge/src/main/java/me/shedaniel/architectury/registry/trade/forge/TradeRegistryImpl.java @@ -38,7 +38,7 @@ public class TradeRegistryImpl { private static final List WANDERER_TRADER_TRADES_GENERIC = new ArrayList<>(); private static final List WANDERER_TRADER_TRADES_RARE = new ArrayList<>(); - private static void registerVillagerTrade0(VillagerProfession profession, int level, VillagerTrades.ItemListing... trades) { + public static void registerVillagerTrade0(VillagerProfession profession, int level, VillagerTrades.ItemListing... trades) { Int2ObjectMap> tradesForProfession = TRADES_TO_ADD.computeIfAbsent(profession, $ -> new Int2ObjectOpenHashMap<>()); List tradesForLevel = tradesForProfession.computeIfAbsent(level, $ -> new ArrayList<>()); Collections.addAll(tradesForLevel, trades);