More Trade Config

Signed-off-by: Joseph T. McQuigg <[email protected]>
Potion-Studios · Dec 24, 2024 · 737687a · 737687a
1 parent ed1e99c
commit 737687a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/config/configs/BWGTradesConfig.java b/Common/src/main/java/net/potionstudios/biomeswevegone/config/configs/BWGTradesConfig.java
@@ -7,6 +7,12 @@ public class BWGTradesConfig {
 
 	public static final BWGTradesConfig INSTANCE = ConfigLoader.loadConfig(BWGTradesConfig.class, "trades");
 
+	public BWGTrades trades = new BWGTrades();
+
+	public static class BWGTrades {
+		public ConfigUtils.CommentValue<Boolean> disableTrades = ConfigUtils.CommentValue.of("Disable All BWG Trades, If this is set to true none of the values below will matter", false);
+	}
+
 	public BWGVillagerTradesConfig villagerTrades = new BWGVillagerTradesConfig();
 
 	public static class BWGVillagerTradesConfig {

diff --git a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/VanillaCompatFabric.java b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/VanillaCompatFabric.java
@@ -35,8 +35,11 @@ public static void init() {
         ToolInteractions.registerTillables((block, pair) -> TillableBlockRegistry.register(block, pair.getFirst(), pair.getSecond()));
         registerBiomeModifiers();
         registerLootModifiers();
-        registerTrades();
-        registerWanderingTrades();
+        if (!BWGTradesConfig.INSTANCE.trades.disableTrades.value()) {
+            registerTrades();
+            if (BWGTradesConfig.INSTANCE.wanderingTraderTrades.enableBWGItemsTrades.value())
+                registerWanderingTrades();
+        }
         FabricBrewingRecipeRegistryBuilder.BUILD.register(builder -> BWGBrewingRecipes.buildBrewingRecipes(builder::addMix));
     }
 

diff --git a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/BiomesWeveGoneForge.java b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/BiomesWeveGoneForge.java
@@ -15,7 +15,6 @@
 import net.potionstudios.biomeswevegone.forge.loot.LootModifiersRegister;
 import net.potionstudios.biomeswevegone.forge.client.BiomesWeveGoneClientForge;
 import net.potionstudios.biomeswevegone.world.entity.BWGEntities;
-import net.potionstudios.biomeswevegone.world.entity.npc.BWGVillagerTrades;
 import net.potionstudios.biomeswevegone.world.level.levelgen.biome.BWGOverworldSurfaceRules;
 import net.potionstudios.biomeswevegone.world.level.levelgen.biome.BWGTerraBlenderRegion;
 import terrablender.api.SurfaceRuleManager;
@@ -63,8 +62,6 @@ private void onInitialize(final FMLCommonSetupEvent event) {
      */
     private void onPostInitialize(final FMLLoadCompleteEvent event) {
         event.enqueueWork(BiomesWeveGone::postInit);
-        BWGVillagerTrades.makeTrades();
-        BWGVillagerTrades.makeWanderingTrades();
     }
 
     /**

diff --git a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/VanillaCompatForge.java b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/VanillaCompatForge.java
@@ -52,8 +52,14 @@ public static void init() {
     public static void registerVanillaCompatEvents(final IEventBus bus) {
         bus.addListener(VanillaCompatForge::registerTillables);
         bus.addListener(VanillaCompatForge::registerFuels);
-        bus.addListener(VanillaCompatForge::onVillagerTrade);
-        if (BWGTradesConfig.INSTANCE.wanderingTraderTrades.enableBWGItemsTrades.value()) bus.addListener(VanillaCompatForge::onWanderingTrade);
+        if (!BWGTradesConfig.INSTANCE.trades.disableTrades.value()) {
+            BWGVillagerTrades.makeTrades();
+            bus.addListener(VanillaCompatForge::onVillagerTrade);
+            if (BWGTradesConfig.INSTANCE.wanderingTraderTrades.enableBWGItemsTrades.value()) {
+                BWGVillagerTrades.makeWanderingTrades();
+                bus.addListener(VanillaCompatForge::onWanderingTrade);
+            }
+        }
         bus.addListener(VanillaCompatForge::registerBrewingRecipes);
         bus.addListener(VanillaCompatForge::onBoneMealUse);
         bus.addListener(VanillaCompatForge::onEnderManAnger);

diff --git a/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/VanillaCompatNeoForge.java b/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/VanillaCompatNeoForge.java
@@ -49,8 +49,14 @@ public static void init() {
 
     public static void registerVanillaCompatEvents(final IEventBus bus) {
         bus.addListener(VanillaCompatNeoForge::registerTillables);
-        bus.addListener(VanillaCompatNeoForge::onVillagerTrade);
-        if (BWGTradesConfig.INSTANCE.wanderingTraderTrades.enableBWGItemsTrades.value()) bus.addListener(VanillaCompatNeoForge::onWanderingTrade);
+        if (!BWGTradesConfig.INSTANCE.trades.disableTrades.value()) {
+            BWGVillagerTrades.makeTrades();
+            bus.addListener(VanillaCompatNeoForge::onVillagerTrade);
+            if (BWGTradesConfig.INSTANCE.wanderingTraderTrades.enableBWGItemsTrades.value()) {
+                BWGVillagerTrades.makeWanderingTrades();
+                bus.addListener(VanillaCompatNeoForge::onWanderingTrade);
+            }
+        }
         bus.addListener(VanillaCompatNeoForge::onBoneMealUse);
         bus.addListener(VanillaCompatNeoForge::registerBrewingRecipes);
         bus.addListener(VanillaCompatNeoForge::onEnderManAnger);