From 8884790584d452e28ce24e638a57a1d59e257c42 Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Mon, 23 Dec 2024 20:46:56 -0500 Subject: [PATCH] Remove Testing Trades Signed-off-by: Joseph T. McQuigg --- .../biomeswevegone/fabric/VanillaCompatFabric.java | 11 ----------- .../neoforge/VanillaCompatNeoForge.java | 7 ------- 2 files changed, 18 deletions(-) diff --git a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/VanillaCompatFabric.java b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/VanillaCompatFabric.java index b820119f..1a9ecb8a 100644 --- a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/VanillaCompatFabric.java +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/VanillaCompatFabric.java @@ -1,15 +1,10 @@ package net.potionstudios.biomeswevegone.fabric; -import com.google.common.collect.ImmutableMap; import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.fabricmc.fabric.api.loot.v3.LootTableEvents; import net.fabricmc.fabric.api.object.builder.v1.trade.TradeOfferHelper; import net.fabricmc.fabric.api.registry.*; -import net.minecraft.world.entity.npc.VillagerProfession; -import net.minecraft.world.entity.npc.VillagerTrades; -import net.minecraft.world.entity.npc.VillagerType; -import net.minecraft.world.item.Item; import net.minecraft.world.item.trading.MerchantOffer; import net.minecraft.world.level.storage.loot.BuiltInLootTables; import net.minecraft.world.level.storage.loot.LootPool; @@ -17,14 +12,12 @@ import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; import net.potionstudios.biomeswevegone.config.configs.BWGTradesConfig; import net.potionstudios.biomeswevegone.world.entity.npc.BWGVillagerTrades; -import net.potionstudios.biomeswevegone.world.entity.npc.BWGVillagerTypes; import net.potionstudios.biomeswevegone.world.item.BWGItems; import net.potionstudios.biomeswevegone.world.item.brewing.BWGBrewingRecipes; import net.potionstudios.biomeswevegone.world.item.tools.ToolInteractions; import net.potionstudios.biomeswevegone.world.level.block.BWGBlocks; import net.potionstudios.biomeswevegone.world.level.block.BlockFeatures; import net.potionstudios.biomeswevegone.config.configs.BWGWorldGenConfig; -import net.potionstudios.biomeswevegone.world.level.block.wood.BWGWood; import net.potionstudios.biomeswevegone.world.level.levelgen.biome.modifiers.BWGBiomeModifiers; /** @@ -86,10 +79,6 @@ private static void registerTrades() { }) ) ); - - TradeOfferHelper.registerVillagerOffers(VillagerProfession.ARMORER, 1, factory -> { - factory.add(((trader, random) -> new VillagerTrades.EmeraldsForVillagerTypeItem(1, 12, 30, ImmutableMap.builder().put(BWGVillagerTypes.SKYRIS.get(), BWGWood.SKYRIS.boatItem().get()).build()).getOffer(trader, random))); - }); } private static void registerWanderingTrades() { diff --git a/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/VanillaCompatNeoForge.java b/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/VanillaCompatNeoForge.java index c5275cd1..7ae0f40a 100644 --- a/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/VanillaCompatNeoForge.java +++ b/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/VanillaCompatNeoForge.java @@ -1,15 +1,12 @@ package net.potionstudios.biomeswevegone.neoforge; -import com.google.common.collect.ImmutableMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.core.BlockPos; import net.minecraft.data.worldgen.placement.VegetationPlacements; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.npc.VillagerTrades; -import net.minecraft.world.entity.npc.VillagerType; import net.minecraft.world.item.AxeItem; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ShovelItem; import net.minecraft.world.item.trading.MerchantOffer; import net.minecraft.world.level.block.Blocks; @@ -26,12 +23,10 @@ import net.potionstudios.biomeswevegone.util.BoneMealHandler; import net.potionstudios.biomeswevegone.config.configs.BWGTradesConfig; import net.potionstudios.biomeswevegone.world.entity.npc.BWGVillagerTrades; -import net.potionstudios.biomeswevegone.world.entity.npc.BWGVillagerType; import net.potionstudios.biomeswevegone.world.item.brewing.BWGBrewingRecipes; import net.potionstudios.biomeswevegone.world.item.tools.ToolInteractions; import net.potionstudios.biomeswevegone.world.level.block.BWGBlocks; import net.potionstudios.biomeswevegone.world.level.block.BlockFeatures; -import net.potionstudios.biomeswevegone.world.level.block.wood.BWGWood; import net.potionstudios.biomeswevegone.world.level.levelgen.biome.BWGBiomes; import net.potionstudios.biomeswevegone.world.level.levelgen.feature.placed.BWGOverworldVegationPlacedFeatures; @@ -92,8 +87,6 @@ private static void onVillagerTrade(final VillagerTradesEvent event) { List tradeList = trades.get(level.intValue()); for (MerchantOffer offer : offers) tradeList.add((trader, random) -> offer); }); - - event.getTrades().get(1).add((trader, random) -> new VillagerTrades.EmeraldsForVillagerTypeItem(1, 12, 30, ImmutableMap.builder().put(BWGVillagerType.SKYRIS.get(), BWGWood.SKYRIS.boatItem().get()).build()).getOffer(trader, random)); } }