mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Update to 1.17
Update to Official classnames Patchwork Make the game compile and run Merge in the new HUD overlay API Merge in the new render properties API PEEL Use Gradle 7.2 snapshot to fix eclipse integration bug in 7.1, Would use 7.0 but FG needs 7.1 for some reason. New FML installer Update to 1.17.1 Co-authored-by: LexManos <[email protected]> Co-authored-by: SizableShrimp <[email protected]> Co-authored-by: cpw <[email protected]> Co-authored-by: Curle <[email protected]> Co-authored-by: Unnoen <[email protected]> Co-authored-by: covers1624 <[email protected]> Co-authored-by: DaemonUmbra <[email protected]> Co-authored-by: gigaherz <[email protected]> Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
1 parent
064ae6961b
commit
be5446b91c
1990 files changed
+35661
-37544
No files matched your search
@@ -26,26 +26,26 @@ import java.util.Map;
|
||||
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
import net.minecraft.entity.merchant.villager.VillagerProfession;
|
||||
import net.minecraft.entity.merchant.villager.VillagerTrades;
|
||||
import net.minecraft.entity.merchant.villager.VillagerTrades.ITrade;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.world.entity.npc.VillagerProfession;
|
||||
import net.minecraft.world.entity.npc.VillagerTrades;
|
||||
import net.minecraft.world.entity.npc.VillagerTrades.ItemListing;
|
||||
import net.minecraft.core.NonNullList;
|
||||
import net.minecraftforge.event.village.VillagerTradesEvent;
|
||||
import net.minecraftforge.event.village.WandererTradesEvent;
|
||||
import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
|
||||
import net.minecraftforge.fmlserverevents.FMLServerAboutToStartEvent;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
|
||||
public class VillagerTradingManager
|
||||
{
|
||||
|
||||
private static final Map<VillagerProfession, Int2ObjectMap<ITrade[]>> VANILLA_TRADES = new HashMap<>();
|
||||
private static final Int2ObjectMap<ITrade[]> WANDERER_TRADES = new Int2ObjectOpenHashMap<>();
|
||||
private static final Map<VillagerProfession, Int2ObjectMap<ItemListing[]>> VANILLA_TRADES = new HashMap<>();
|
||||
private static final Int2ObjectMap<ItemListing[]> WANDERER_TRADES = new Int2ObjectOpenHashMap<>();
|
||||
|
||||
static
|
||||
{
|
||||
VillagerTrades.TRADES.entrySet().forEach(e ->
|
||||
{
|
||||
Int2ObjectMap<ITrade[]> copy = new Int2ObjectOpenHashMap<>();
|
||||
Int2ObjectMap<ItemListing[]> copy = new Int2ObjectOpenHashMap<>();
|
||||
e.getValue().int2ObjectEntrySet().forEach(ent -> copy.put(ent.getIntKey(), Arrays.copyOf(ent.getValue(), ent.getValue().length)));
|
||||
VANILLA_TRADES.put(e.getKey(), copy);
|
||||
});
|
||||
@@ -63,13 +63,13 @@ public class VillagerTradingManager
|
||||
*/
|
||||
private static void postWandererEvent()
|
||||
{
|
||||
List<ITrade> generic = NonNullList.create();
|
||||
List<ITrade> rare = NonNullList.create();
|
||||
List<ItemListing> generic = NonNullList.create();
|
||||
List<ItemListing> rare = NonNullList.create();
|
||||
Arrays.stream(WANDERER_TRADES.get(1)).forEach(generic::add);
|
||||
Arrays.stream(WANDERER_TRADES.get(2)).forEach(rare::add);
|
||||
MinecraftForge.EVENT_BUS.post(new WandererTradesEvent(generic, rare));
|
||||
VillagerTrades.WANDERING_TRADER_TRADES.put(1, generic.toArray(new ITrade[0]));
|
||||
VillagerTrades.WANDERING_TRADER_TRADES.put(2, rare.toArray(new ITrade[0]));
|
||||
VillagerTrades.WANDERING_TRADER_TRADES.put(1, generic.toArray(new ItemListing[0]));
|
||||
VillagerTrades.WANDERING_TRADER_TRADES.put(2, rare.toArray(new ItemListing[0]));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -79,8 +79,8 @@ public class VillagerTradingManager
|
||||
{
|
||||
for (VillagerProfession prof : ForgeRegistries.PROFESSIONS)
|
||||
{
|
||||
Int2ObjectMap<ITrade[]> trades = VANILLA_TRADES.getOrDefault(prof, new Int2ObjectOpenHashMap<>());
|
||||
Int2ObjectMap<List<ITrade>> mutableTrades = new Int2ObjectOpenHashMap<>();
|
||||
Int2ObjectMap<ItemListing[]> trades = VANILLA_TRADES.getOrDefault(prof, new Int2ObjectOpenHashMap<>());
|
||||
Int2ObjectMap<List<ItemListing>> mutableTrades = new Int2ObjectOpenHashMap<>();
|
||||
for (int i = 1; i < 6; i++)
|
||||
{
|
||||
mutableTrades.put(i, NonNullList.create());
|
||||
@@ -90,8 +90,8 @@ public class VillagerTradingManager
|
||||
Arrays.stream(e.getValue()).forEach(mutableTrades.get(e.getIntKey())::add);
|
||||
});
|
||||
MinecraftForge.EVENT_BUS.post(new VillagerTradesEvent(mutableTrades, prof));
|
||||
Int2ObjectMap<ITrade[]> newTrades = new Int2ObjectOpenHashMap<>();
|
||||
mutableTrades.int2ObjectEntrySet().forEach(e -> newTrades.put(e.getIntKey(), e.getValue().toArray(new ITrade[0])));
|
||||
Int2ObjectMap<ItemListing[]> newTrades = new Int2ObjectOpenHashMap<>();
|
||||
mutableTrades.int2ObjectEntrySet().forEach(e -> newTrades.put(e.getIntKey(), e.getValue().toArray(new ItemListing[0])));
|
||||
VillagerTrades.TRADES.put(prof, newTrades);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user