From 6ef6102417ce3e06e8c14f26bb2f664fa6b3b90e Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Sun, 8 Dec 2024 11:22:28 -0500 Subject: [PATCH] Move Config Classes to Config Package Signed-off-by: Joseph T. McQuigg --- CHANGELOG.md | 1 + .../{world/entity/npc => config/configs}/BWGTradesConfig.java | 2 +- .../levelgen/biome => config/configs}/BWGWorldGenConfig.java | 3 ++- .../biomeswevegone/world/entity/npc/BWGVillagerTrades.java | 1 + .../world/level/levelgen/biome/BWGTerraBlenderRegion.java | 1 + .../biomeswevegone/fabric/VanillaCompatFabric.java | 4 ++-- .../biomeswevegone/forge/VanillaCompatForge.java | 2 +- .../biomeswevegone/neoforge/VanillaCompatNeoForge.java | 2 +- 8 files changed, 10 insertions(+), 6 deletions(-) rename Common/src/main/java/net/potionstudios/biomeswevegone/{world/entity/npc => config/configs}/BWGTradesConfig.java (98%) rename Common/src/main/java/net/potionstudios/biomeswevegone/{world/level/levelgen/biome => config/configs}/BWGWorldGenConfig.java (97%) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8ad6a5a3..3e14a52a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Fix Cattail Sprout not being consumed when placed on a Campfire - Decrease Cypress, and Palo Verde Tree File Sizes - Refactor Platform FarmLandBlock to have Platform Name +- Move Config Classes to Config Package # 2.2.5 - Make Pale Pumpkin Set Compostable diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/npc/BWGTradesConfig.java b/Common/src/main/java/net/potionstudios/biomeswevegone/config/configs/BWGTradesConfig.java similarity index 98% rename from Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/npc/BWGTradesConfig.java rename to Common/src/main/java/net/potionstudios/biomeswevegone/config/configs/BWGTradesConfig.java index 59b704644..a559e2b77 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/npc/BWGTradesConfig.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/config/configs/BWGTradesConfig.java @@ -1,4 +1,4 @@ -package net.potionstudios.biomeswevegone.world.entity.npc; +package net.potionstudios.biomeswevegone.config.configs; import com.google.common.base.Suppliers; import com.mojang.datafixers.util.Pair; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGWorldGenConfig.java b/Common/src/main/java/net/potionstudios/biomeswevegone/config/configs/BWGWorldGenConfig.java similarity index 97% rename from Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGWorldGenConfig.java rename to Common/src/main/java/net/potionstudios/biomeswevegone/config/configs/BWGWorldGenConfig.java index ddca585c6..639fffe44 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGWorldGenConfig.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/config/configs/BWGWorldGenConfig.java @@ -1,4 +1,4 @@ -package net.potionstudios.biomeswevegone.world.level.levelgen.biome; +package net.potionstudios.biomeswevegone.config.configs; import com.google.common.base.Suppliers; import com.mojang.datafixers.util.Pair; @@ -18,6 +18,7 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; import net.potionstudios.biomeswevegone.PlatformHandler; +import net.potionstudios.biomeswevegone.world.level.levelgen.biome.BWGBiomes; import org.jetbrains.annotations.NotNull; import java.io.IOException; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/npc/BWGVillagerTrades.java b/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/npc/BWGVillagerTrades.java index aa6188ff1..ffc038569 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/npc/BWGVillagerTrades.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/world/entity/npc/BWGVillagerTrades.java @@ -7,6 +7,7 @@ import net.minecraft.world.item.trading.ItemCost; import net.minecraft.world.item.trading.MerchantOffer; import net.minecraft.world.level.ItemLike; +import net.potionstudios.biomeswevegone.config.configs.BWGTradesConfig; import net.potionstudios.biomeswevegone.world.item.BWGItems; import net.potionstudios.biomeswevegone.world.level.block.BWGBlocks; diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGTerraBlenderRegion.java b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGTerraBlenderRegion.java index b72edc22a..967a9315d 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGTerraBlenderRegion.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/biome/BWGTerraBlenderRegion.java @@ -10,6 +10,7 @@ import net.minecraft.world.level.biome.Biomes; import net.minecraft.world.level.biome.Climate; import net.potionstudios.biomeswevegone.BiomesWeveGone; +import net.potionstudios.biomeswevegone.config.configs.BWGWorldGenConfig; import net.potionstudios.biomeswevegone.util.BWGUtil; import net.potionstudios.biomeswevegone.world.level.levelgen.biome.selector.BWGBiomeSelectors; import net.potionstudios.biomeswevegone.world.level.levelgen.biome.selector.TerraBlenderBiomeSelectors; 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 3d4d67922..1626ca39b 100644 --- a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/VanillaCompatFabric.java +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/VanillaCompatFabric.java @@ -9,14 +9,14 @@ import net.minecraft.world.level.storage.loot.LootPool; import net.minecraft.world.level.storage.loot.entries.LootItem; import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; -import net.potionstudios.biomeswevegone.world.entity.npc.BWGTradesConfig; +import net.potionstudios.biomeswevegone.config.configs.BWGTradesConfig; import net.potionstudios.biomeswevegone.world.entity.npc.BWGVillagerTrades; 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.world.level.levelgen.biome.BWGWorldGenConfig; +import net.potionstudios.biomeswevegone.config.configs.BWGWorldGenConfig; import net.potionstudios.biomeswevegone.world.level.levelgen.biome.modifiers.BWGBiomeModifiers; /** diff --git a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/VanillaCompatForge.java b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/VanillaCompatForge.java index 6f4bd2d49..f2c46df29 100644 --- a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/VanillaCompatForge.java +++ b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/VanillaCompatForge.java @@ -20,7 +20,7 @@ import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.IEventBus; import net.potionstudios.biomeswevegone.util.BoneMealHandler; -import net.potionstudios.biomeswevegone.world.entity.npc.BWGTradesConfig; +import net.potionstudios.biomeswevegone.config.configs.BWGTradesConfig; import net.potionstudios.biomeswevegone.world.entity.npc.BWGVillagerTrades; import net.potionstudios.biomeswevegone.world.item.brewing.BWGBrewingRecipes; import net.potionstudios.biomeswevegone.world.item.tools.ToolInteractions; 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 587bb0727..c281c1763 100644 --- a/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/VanillaCompatNeoForge.java +++ b/NeoForge/src/main/java/net/potionstudios/biomeswevegone/neoforge/VanillaCompatNeoForge.java @@ -19,7 +19,7 @@ import net.neoforged.neoforge.event.level.BlockEvent; import net.neoforged.neoforge.event.village.VillagerTradesEvent; import net.potionstudios.biomeswevegone.util.BoneMealHandler; -import net.potionstudios.biomeswevegone.world.entity.npc.BWGTradesConfig; +import net.potionstudios.biomeswevegone.config.configs.BWGTradesConfig; import net.potionstudios.biomeswevegone.world.entity.npc.BWGVillagerTrades; import net.potionstudios.biomeswevegone.world.item.brewing.BWGBrewingRecipes; import net.potionstudios.biomeswevegone.world.item.tools.ToolInteractions;