diff --git a/src/main/java/org/betterx/bclib/BCLib.java b/src/main/java/org/betterx/bclib/BCLib.java index 5909fccb..f239b08b 100644 --- a/src/main/java/org/betterx/bclib/BCLib.java +++ b/src/main/java/org/betterx/bclib/BCLib.java @@ -11,13 +11,16 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.impl.biome.NetherBiomeData; import net.fabricmc.loader.api.FabricLoader; -import org.betterx.bclib.api.WorldDataAPI; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; -import org.betterx.bclib.api.dataexchange.handler.autosync.*; -import org.betterx.bclib.api.features.blockpredicates.Types; -import org.betterx.bclib.api.features.placement.PlacementModifiers; -import org.betterx.bclib.api.surface.rules.Conditions; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.WorldDataAPI; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.*; +import org.betterx.bclib.api.v2.generator.BCLibEndBiomeSource; +import org.betterx.bclib.api.v2.generator.BCLibNetherBiomeSource; +import org.betterx.bclib.api.v2.generator.GeneratorOptions; +import org.betterx.bclib.api.v2.levelgen.features.blockpredicates.Types; +import org.betterx.bclib.api.v2.levelgen.features.placement.PlacementModifiers; +import org.betterx.bclib.api.v2.levelgen.surface.rules.Conditions; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.commands.CommandRegistry; import org.betterx.bclib.config.Configs; import org.betterx.bclib.presets.worldgen.BCLWorldPresets; @@ -26,10 +29,7 @@ import org.betterx.bclib.recipes.CraftingRecipes; import org.betterx.bclib.registry.BaseBlockEntities; import org.betterx.bclib.registry.BaseRegistry; import org.betterx.bclib.util.Logger; -import org.betterx.bclib.world.generator.BCLibEndBiomeSource; -import org.betterx.bclib.world.generator.BCLibNetherBiomeSource; -import org.betterx.bclib.world.generator.GeneratorOptions; -import org.betterx.bclib.world.structures.TemplatePiece; +import org.betterx.bclib.api.v2.levelgen.structures.TemplatePiece; import java.util.List; diff --git a/src/main/java/org/betterx/bclib/BCLibPatch.java b/src/main/java/org/betterx/bclib/BCLibPatch.java index bc9d8c84..c5455e26 100644 --- a/src/main/java/org/betterx/bclib/BCLibPatch.java +++ b/src/main/java/org/betterx/bclib/BCLibPatch.java @@ -12,13 +12,13 @@ import net.minecraft.world.level.dimension.LevelStem; import net.minecraft.world.level.levelgen.WorldGenSettings; import com.mojang.serialization.Dynamic; -import org.betterx.bclib.api.datafixer.DataFixerAPI; -import org.betterx.bclib.api.datafixer.ForcedLevelPatch; -import org.betterx.bclib.api.datafixer.MigrationProfile; +import org.betterx.bclib.api.v2.datafixer.DataFixerAPI; +import org.betterx.bclib.api.v2.datafixer.ForcedLevelPatch; +import org.betterx.bclib.api.v2.datafixer.MigrationProfile; +import org.betterx.bclib.api.v2.generator.GeneratorOptions; +import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; import org.betterx.bclib.config.Configs; -import org.betterx.bclib.api.worldgen.WorldGenUtil; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.generator.GeneratorOptions; import java.util.Optional; @@ -45,7 +45,7 @@ final class BiomeSourcePatch extends ForcedLevelPatch { @Override protected Boolean runLevelDatPatch(CompoundTag root, MigrationProfile profile) { //make sure we have a working generators file before attempting to patch - WorldGenUtil.migrateGeneratorSettings(); + LevelGenUtil.migrateGeneratorSettings(); final CompoundTag worldGenSettings = root.getCompound("Data").getCompound("WorldGenSettings"); final CompoundTag dimensions = worldGenSettings.getCompound("dimensions"); @@ -115,10 +115,10 @@ final class BiomeSourcePatch extends ForcedLevelPatch { .resultOrPartial(BCLib.LOGGER::error); Optional netherGenerator = oLevelStem.map(l -> l.generator()); - int biomeSourceVersion = WorldGenUtil.getBiomeVersionForGenerator(netherGenerator.orElse(null)); - int targetVersion = WorldGenUtil.getBiomeVersionForCurrentWorld(dimensionKey); + int biomeSourceVersion = LevelGenUtil.getBiomeVersionForGenerator(netherGenerator.orElse(null)); + int targetVersion = LevelGenUtil.getBiomeVersionForCurrentWorld(dimensionKey); if (biomeSourceVersion != targetVersion) { - Optional> refLevelStem = WorldGenUtil.referenceStemForVersion( + Optional> refLevelStem = LevelGenUtil.referenceStemForVersion( dimensionKey, targetVersion, registryAccess, diff --git a/src/main/java/org/betterx/bclib/api/BonemealAPI.java b/src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/BonemealAPI.java rename to src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java index 09217a3a..5f113a42 100644 --- a/src/main/java/org/betterx/bclib/api/BonemealAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/BonemealAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api; +package org.betterx.bclib.api.v2; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/bclib/api/ComposterAPI.java b/src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java similarity index 94% rename from src/main/java/org/betterx/bclib/api/ComposterAPI.java rename to src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java index bb76f9e1..d25e075a 100644 --- a/src/main/java/org/betterx/bclib/api/ComposterAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/ComposterAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api; +package org.betterx.bclib.api.v2; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; diff --git a/src/main/java/org/betterx/bclib/api/LifeCycleAPI.java b/src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java similarity index 86% rename from src/main/java/org/betterx/bclib/api/LifeCycleAPI.java rename to src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java index ce507e0b..2ac54992 100644 --- a/src/main/java/org/betterx/bclib/api/LifeCycleAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/LifeCycleAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api; +package org.betterx.bclib.api.v2; import net.minecraft.client.gui.screens.worldselection.WorldGenSettingsComponent; import net.minecraft.core.Registry; @@ -16,10 +16,10 @@ import net.minecraft.world.level.levelgen.WorldGenSettings; import net.minecraft.world.level.storage.LevelStorageSource; import net.minecraft.world.level.storage.ServerLevelData; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; -import org.betterx.bclib.api.datafixer.DataFixerAPI; -import org.betterx.bclib.api.worldgen.WorldGenUtil; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.datafixer.DataFixerAPI; +import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; +import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; import org.betterx.bclib.mixin.common.RegistryOpsAccessor; import java.util.ArrayList; @@ -37,13 +37,13 @@ public class LifeCycleAPI { private static void worldCreationStarted(RegistryAccess access) { - BiomeAPI.initRegistry(access); + InternalBiomeAPI.initRegistry(access); } public static void newWorldSetup(LevelStorageSource.LevelStorageAccess levelStorageAccess, WorldGenSettings settings) { DataExchangeAPI.prepareServerside(); - BiomeAPI.prepareNewLevel(); + InternalBiomeAPI.prepareNewLevel(); DataFixerAPI.createWorldData(levelStorageAccess, settings); _runBeforeLevelLoad(); @@ -53,14 +53,14 @@ public class LifeCycleAPI { WorldGenSettings worldGenSettings, LevelStorageSource levelSource) { DataExchangeAPI.prepareServerside(); - BiomeAPI.prepareNewLevel(); + InternalBiomeAPI.prepareNewLevel(); DataFixerAPI.createWorldData(levelSource, levelID, worldGenSettings); _runBeforeLevelLoad(); } public static void newWorldSetup(LevelStorageSource.LevelStorageAccess levelStorageAccess) { - BiomeAPI.prepareNewLevel(); + InternalBiomeAPI.prepareNewLevel(); DataFixerAPI.fixData(levelStorageAccess, false, (didFix) -> {/* not called when showUI==false */}); _runBeforeLevelLoad(); @@ -68,9 +68,9 @@ public class LifeCycleAPI { public static WorldGenSettings worldLoadStarted(WorldGenSettings settings, Optional> registryOps) { if (registryOps.orElse(null) instanceof RegistryOpsAccessor acc) { - BiomeAPI.initRegistry(acc.bcl_getRegistryAccess()); + InternalBiomeAPI.initRegistry(acc.bcl_getRegistryAccess()); } - settings = WorldGenUtil.fixSettingsInCurrentWorld(registryOps, settings); + settings = LevelGenUtil.fixSettingsInCurrentWorld(registryOps, settings); return settings; } @@ -154,16 +154,16 @@ public class LifeCycleAPI { List list, boolean bl2) { onLoadLevel.forEach(c -> c.onLoad(world, - minecraftServer, - executor, - levelStorageAccess, - serverLevelData, - resourceKey, - chunkProgressListener, - bl, - l, - list, - bl2)); + minecraftServer, + executor, + levelStorageAccess, + serverLevelData, + resourceKey, + chunkProgressListener, + bl, + l, + list, + bl2)); final long seed = world.getSeed(); final Registry biomeRegistry = world.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY); diff --git a/src/main/java/org/betterx/bclib/api/ModIntegrationAPI.java b/src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/ModIntegrationAPI.java rename to src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java index 66a1aff5..2f35016b 100644 --- a/src/main/java/org/betterx/bclib/api/ModIntegrationAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/ModIntegrationAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api; +package org.betterx.bclib.api.v2; import net.fabricmc.loader.api.FabricLoader; diff --git a/src/main/java/org/betterx/bclib/api/PostInitAPI.java b/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java similarity index 95% rename from src/main/java/org/betterx/bclib/api/PostInitAPI.java rename to src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java index 84085d52..05a6fbe1 100644 --- a/src/main/java/org/betterx/bclib/api/PostInitAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/PostInitAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api; +package org.betterx.bclib.api.v2; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Registry; @@ -12,9 +12,9 @@ import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import com.google.common.collect.Lists; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.tag.NamedMineableTags; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; +import org.betterx.bclib.api.v2.tag.NamedMineableTags; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.blocks.BaseBarrelBlock; import org.betterx.bclib.blocks.BaseChestBlock; import org.betterx.bclib.blocks.BaseFurnaceBlock; @@ -70,7 +70,7 @@ public class PostInitAPI { } blockTags = null; itemTags = null; - BiomeAPI.loadFabricAPIBiomes(); + InternalBiomeAPI.loadFabricAPIBiomes(); Configs.BIOMES_CONFIG.saveChanges(); } diff --git a/src/main/java/org/betterx/bclib/api/ShovelAPI.java b/src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java similarity index 95% rename from src/main/java/org/betterx/bclib/api/ShovelAPI.java rename to src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java index b56b5a01..621c2ccc 100644 --- a/src/main/java/org/betterx/bclib/api/ShovelAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/ShovelAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api; +package org.betterx.bclib.api.v2; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/org/betterx/bclib/api/WorldDataAPI.java b/src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/WorldDataAPI.java rename to src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java index 909589f7..1a7050c6 100644 --- a/src/main/java/org/betterx/bclib/api/WorldDataAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/WorldDataAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api; +package org.betterx.bclib.api.v2; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; @@ -10,7 +10,7 @@ import net.fabricmc.loader.api.ModContainer; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.datafixer.DataFixerAPI; +import org.betterx.bclib.api.v2.datafixer.DataFixerAPI; import org.betterx.bclib.util.ModUtil; import java.io.File; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/BaseDataHandler.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/dataexchange/BaseDataHandler.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java index e005cfde..52733544 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/BaseDataHandler.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/BaseDataHandler.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange; +package org.betterx.bclib.api.v2.dataexchange; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientPacketListener; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/Connector.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java similarity index 72% rename from src/main/java/org/betterx/bclib/api/dataexchange/Connector.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java index 8e43679c..d0d818d8 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/Connector.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/Connector.java @@ -1,6 +1,6 @@ -package org.betterx.bclib.api.dataexchange; +package org.betterx.bclib.api.v2.dataexchange; -import org.betterx.bclib.api.dataexchange.handler.DataExchange; +import org.betterx.bclib.api.v2.dataexchange.handler.DataExchange; import java.util.Set; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/ConnectorClientside.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java similarity index 95% rename from src/main/java/org/betterx/bclib/api/dataexchange/ConnectorClientside.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java index edfae0d0..3279edb8 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/ConnectorClientside.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorClientside.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange; +package org.betterx.bclib.api.v2.dataexchange; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientPacketListener; @@ -10,7 +10,7 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.networking.v1.PacketSender; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.handler.DataExchange; +import org.betterx.bclib.api.v2.dataexchange.handler.DataExchange; /** * This is an internal class that handles a Clienetside players Connection to a Server diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/ConnectorServerside.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/dataexchange/ConnectorServerside.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java index 336ae883..30966ec9 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/ConnectorServerside.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/ConnectorServerside.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange; +package org.betterx.bclib.api.v2.dataexchange; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.MinecraftServer; @@ -9,7 +9,7 @@ import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.handler.DataExchange; +import org.betterx.bclib.api.v2.dataexchange.handler.DataExchange; /** * This is an internal class that handles a Serverside Connection to a Client-Player diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/DataExchangeAPI.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/dataexchange/DataExchangeAPI.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java index ffdcab46..b8916701 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/DataExchangeAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataExchangeAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange; +package org.betterx.bclib.api.v2.dataexchange; import net.minecraft.network.FriendlyByteBuf; @@ -7,9 +7,9 @@ import net.fabricmc.api.Environment; import com.google.common.collect.Lists; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.handler.DataExchange; -import org.betterx.bclib.api.dataexchange.handler.autosync.AutoSync; -import org.betterx.bclib.api.dataexchange.handler.autosync.AutoSyncID; +import org.betterx.bclib.api.v2.dataexchange.handler.DataExchange; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.AutoSync; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.AutoSyncID; import org.betterx.bclib.config.Config; import org.betterx.bclib.util.ModUtil; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/DataHandler.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/dataexchange/DataHandler.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java index 620a458c..901a430e 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/DataHandler.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandler.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange; +package org.betterx.bclib.api.v2.dataexchange; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientPacketListener; @@ -18,8 +18,7 @@ import net.fabricmc.fabric.api.networking.v1.PlayerLookup; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.handler.autosync.Chunker; -import org.betterx.bclib.api.dataexchange.handler.autosync.Chunker.PacketChunkSender; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.Chunker; import java.util.Collection; import java.util.List; @@ -113,7 +112,7 @@ public abstract class DataHandler extends BaseDataHandler { Collection players, FriendlyByteBuf buf) { if (buf.readableBytes() > Chunker.MAX_PACKET_SIZE) { - final PacketChunkSender sender = new PacketChunkSender(buf, identifier); + final Chunker.PacketChunkSender sender = new Chunker.PacketChunkSender(buf, identifier); sender.sendChunks(players); } else { for (ServerPlayer player : players) { diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/DataHandlerDescriptor.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/dataexchange/DataHandlerDescriptor.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java index 14de38d1..03d34211 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/DataHandlerDescriptor.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/DataHandlerDescriptor.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange; +package org.betterx.bclib.api.v2.dataexchange; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/FileHash.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/dataexchange/FileHash.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java index ee0ff075..d74dc075 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/FileHash.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/FileHash.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange; +package org.betterx.bclib.api.v2.dataexchange; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/SyncFileHash.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java similarity index 94% rename from src/main/java/org/betterx/bclib/api/dataexchange/SyncFileHash.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java index cf1e40d0..6a0aa09b 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/SyncFileHash.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/SyncFileHash.java @@ -1,9 +1,9 @@ -package org.betterx.bclib.api.dataexchange; +package org.betterx.bclib.api.v2.dataexchange; import net.minecraft.network.FriendlyByteBuf; -import org.betterx.bclib.api.dataexchange.handler.autosync.AutoSync; -import org.betterx.bclib.api.dataexchange.handler.autosync.AutoSyncID; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.AutoSync; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.AutoSyncID; import java.io.File; import java.util.Objects; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/DataExchange.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/DataExchange.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java index 773a5cbd..e5f787c8 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/DataExchange.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/DataExchange.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange.handler; +package org.betterx.bclib.api.v2.dataexchange.handler; import net.minecraft.resources.ResourceLocation; @@ -7,7 +7,7 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; -import org.betterx.bclib.api.dataexchange.*; +import org.betterx.bclib.api.v2.dataexchange.*; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/AutoFileSyncEntry.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/AutoFileSyncEntry.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java index f3d228e8..e40fdf00 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/AutoFileSyncEntry.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoFileSyncEntry.java @@ -1,10 +1,10 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.minecraft.network.FriendlyByteBuf; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.DataHandler; -import org.betterx.bclib.api.dataexchange.SyncFileHash; +import org.betterx.bclib.api.v2.dataexchange.DataHandler; +import org.betterx.bclib.api.v2.dataexchange.SyncFileHash; import org.betterx.bclib.util.ModUtil; import org.betterx.bclib.util.ModUtil.ModInfo; import org.betterx.bclib.util.Pair; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/AutoSync.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/AutoSync.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java index 5802c2a1..00cd0115 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/AutoSync.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSync.java @@ -1,10 +1,10 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.fabricmc.loader.api.FabricLoader; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; -import org.betterx.bclib.api.dataexchange.SyncFileHash; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.dataexchange.SyncFileHash; import org.betterx.bclib.config.Configs; import org.betterx.bclib.config.ServerConfig; import org.betterx.bclib.util.PathUtil; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/AutoSyncID.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/AutoSyncID.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java index c7085bb5..3ee1437a 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/AutoSyncID.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/AutoSyncID.java @@ -1,8 +1,8 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.minecraft.network.FriendlyByteBuf; -import org.betterx.bclib.api.dataexchange.DataHandler; +import org.betterx.bclib.api.v2.dataexchange.DataHandler; import org.betterx.bclib.config.Config; import org.betterx.bclib.util.ModUtil; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/Chunker.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/Chunker.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java index e54186bd..15e6c4d6 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/Chunker.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/Chunker.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; @@ -11,10 +11,10 @@ import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.BaseDataHandler; -import org.betterx.bclib.api.dataexchange.DataHandler; -import org.betterx.bclib.api.dataexchange.DataHandlerDescriptor; -import org.betterx.bclib.api.dataexchange.handler.DataExchange; +import org.betterx.bclib.api.v2.dataexchange.BaseDataHandler; +import org.betterx.bclib.api.v2.dataexchange.DataHandler; +import org.betterx.bclib.api.v2.dataexchange.DataHandlerDescriptor; +import org.betterx.bclib.api.v2.dataexchange.handler.DataExchange; import java.util.*; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/ChunkerProgress.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java similarity index 83% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/ChunkerProgress.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java index 43d6696e..1cadd03f 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/ChunkerProgress.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/ChunkerProgress.java @@ -1,11 +1,11 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.minecraft.util.ProgressListener; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.gui.screens.ProgressScreen; +import org.betterx.bclib.client.gui.screens.ProgressScreen; @Environment(EnvType.CLIENT) public class ChunkerProgress { diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/FileContentWrapper.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/FileContentWrapper.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java index 2a2c835d..669fc955 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/FileContentWrapper.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/FileContentWrapper.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import org.betterx.bclib.BCLib; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/HelloClient.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java similarity index 79% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/HelloClient.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java index 48397b67..1789f3fb 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/HelloClient.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloClient.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; @@ -12,15 +12,15 @@ import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.loader.api.metadata.ModEnvironment; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; -import org.betterx.bclib.api.dataexchange.DataHandler; -import org.betterx.bclib.api.dataexchange.DataHandlerDescriptor; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.dataexchange.DataHandler; +import org.betterx.bclib.api.v2.dataexchange.DataHandlerDescriptor; +import org.betterx.bclib.client.gui.screens.ModListScreen; +import org.betterx.bclib.client.gui.screens.ProgressScreen; +import org.betterx.bclib.client.gui.screens.SyncFilesScreen; +import org.betterx.bclib.client.gui.screens.WarnBCLibVersionMismatch; import org.betterx.bclib.config.Configs; import org.betterx.bclib.config.ServerConfig; -import org.betterx.bclib.gui.screens.ModListScreen; -import org.betterx.bclib.gui.screens.ProgressScreen; -import org.betterx.bclib.gui.screens.SyncFilesScreen; -import org.betterx.bclib.gui.screens.WarnBCLibVersionMismatch; import org.betterx.bclib.util.ModUtil; import org.betterx.bclib.util.ModUtil.ModInfo; import org.betterx.bclib.util.PathUtil; @@ -48,10 +48,10 @@ public class HelloClient extends DataHandler.FromServer { } public static final DataHandlerDescriptor DESCRIPTOR = new DataHandlerDescriptor(new ResourceLocation(BCLib.MOD_ID, - "hello_client"), - HelloClient::new, - false, - false); + "hello_client"), + HelloClient::new, + false, + false); public HelloClient() { super(DESCRIPTOR.IDENTIFIER); @@ -87,14 +87,14 @@ public class HelloClient extends DataHandler.FromServer { mods = new ArrayList<>(inmods.size()); mods.addAll(inmods); mods.addAll(ModUtil - .getMods() - .entrySet() - .stream() - .filter(entry -> entry.getValue().metadata.getEnvironment() != ModEnvironment.SERVER && !inmods.contains( - entry.getKey())) - .map(entry -> entry.getKey()) - .collect(Collectors.toList()) - ); + .getMods() + .entrySet() + .stream() + .filter(entry -> entry.getValue().metadata.getEnvironment() != ModEnvironment.SERVER && !inmods.contains( + entry.getKey())) + .map(entry -> entry.getKey()) + .collect(Collectors.toList()) + ); } mods = mods @@ -265,7 +265,7 @@ public class HelloClient extends DataHandler.FromServer { if (!localSubFile.hash.equals(subFile.hash)) { BCLib.LOGGER.info(" * " + subFile.relPath + " (changed)"); filesToRequest.add(new AutoSyncID.ForDirectFileRequest(desc.folderID, - new File(subFile.relPath))); + new File(subFile.relPath))); } else { BCLib.LOGGER.info(" * " + subFile.relPath); } @@ -273,7 +273,7 @@ public class HelloClient extends DataHandler.FromServer { //the file is missing locally BCLib.LOGGER.info(" * " + subFile.relPath + " (missing on client)"); filesToRequest.add(new AutoSyncID.ForDirectFileRequest(desc.folderID, - new File(subFile.relPath))); + new File(subFile.relPath))); } }); @@ -310,9 +310,9 @@ public class HelloClient extends DataHandler.FromServer { filesToRequest.add(new AutoSyncID(e.serverHash.modID, e.serverHash.uniqueID)); } else { filesToRequest.add(new AutoSyncID.WithContentOverride(e.serverHash.modID, - e.serverHash.uniqueID, - contentWrapper, - e.localMatch.fileName)); + e.serverHash.uniqueID, + contentWrapper, + e.localMatch.fileName)); } } @@ -390,11 +390,11 @@ public class HelloClient extends DataHandler.FromServer { return; } else if (serverPublishedModInfo && mismatchingMods.size() > 0 && Configs.CLIENT_CONFIG.isShowingModInfo()) { client.setScreen(new ModListScreen(client.screen, - Component.translatable("title.bclib.modmissmatch"), - Component.translatable("message.bclib.modmissmatch"), - CommonComponents.GUI_PROCEED, - ModUtil.getMods(), - modVersion)); + Component.translatable("title.bclib.modmissmatch"), + Component.translatable("message.bclib.modmissmatch"), + CommonComponents.GUI_PROCEED, + ModUtil.getMods(), + modVersion)); return; } } @@ -436,39 +436,39 @@ public class HelloClient extends DataHandler.FromServer { } client.setScreen(new SyncFilesScreen(modFiles, - configFiles, - singleFiles, - folderFiles, - filesToRemove.size(), - modVersion, - (downloadMods, downloadConfigs, downloadFiles, removeFiles) -> { - if (downloadMods || downloadConfigs || downloadFiles) { - BCLib.LOGGER.info("Updating local Files:"); - List localChanges = new ArrayList<>( - files.toArray().length); - List requestFiles = new ArrayList<>(files.toArray().length); + configFiles, + singleFiles, + folderFiles, + filesToRemove.size(), + modVersion, + (downloadMods, downloadConfigs, downloadFiles, removeFiles) -> { + if (downloadMods || downloadConfigs || downloadFiles) { + BCLib.LOGGER.info("Updating local Files:"); + List localChanges = new ArrayList<>( + files.toArray().length); + List requestFiles = new ArrayList<>(files.toArray().length); - files.forEach(aid -> { - if (aid.isConfigFile() && downloadConfigs) { - processOfferedFile(requestFiles, aid); - } else if (aid instanceof AutoSyncID.ForModFileRequest && downloadMods) { - processOfferedFile(requestFiles, aid); - } else if (downloadFiles) { - processOfferedFile(requestFiles, aid); - } - }); + files.forEach(aid -> { + if (aid.isConfigFile() && downloadConfigs) { + processOfferedFile(requestFiles, aid); + } else if (aid instanceof AutoSyncID.ForModFileRequest && downloadMods) { + processOfferedFile(requestFiles, aid); + } else if (downloadFiles) { + processOfferedFile(requestFiles, aid); + } + }); - requestFileDownloads(requestFiles); - } - if (removeFiles) { - filesToRemove.forEach(aid -> { - BCLib.LOGGER.info(" - " + aid.relFile + " (removing)"); - aid.relFile.delete(); - }); - } + requestFileDownloads(requestFiles); + } + if (removeFiles) { + filesToRemove.forEach(aid -> { + BCLib.LOGGER.info(" - " + aid.relFile + " (removing)"); + aid.relFile.delete(); + }); + } - this.onCloseSyncFilesScreen(); - })); + this.onCloseSyncFilesScreen(); + })); } @Environment(EnvType.CLIENT) @@ -499,8 +499,8 @@ public class HelloClient extends DataHandler.FromServer { BCLib.LOGGER.info("Starting download of Files:" + files.size()); final ProgressScreen progress = new ProgressScreen(null, - Component.translatable("title.bclib.filesync.progress"), - Component.translatable("message.bclib.filesync.progress")); + Component.translatable("title.bclib.filesync.progress"), + Component.translatable("message.bclib.filesync.progress")); progress.progressStart(Component.translatable("message.bclib.filesync.progress.stage.empty")); ChunkerProgress.setProgressScreen(progress); diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/HelloServer.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java similarity index 93% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/HelloServer.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java index 77b958b2..da770d46 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/HelloServer.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/HelloServer.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -10,9 +10,9 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.networking.v1.PacketSender; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; -import org.betterx.bclib.api.dataexchange.DataHandler; -import org.betterx.bclib.api.dataexchange.DataHandlerDescriptor; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.dataexchange.DataHandler; +import org.betterx.bclib.api.v2.dataexchange.DataHandlerDescriptor; import org.betterx.bclib.config.Configs; import org.betterx.bclib.util.ModUtil; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/RequestFiles.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java similarity index 94% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/RequestFiles.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java index 25e8169d..f9f476f0 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/RequestFiles.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/RequestFiles.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; @@ -10,8 +10,8 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.networking.v1.PacketSender; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.DataHandler; -import org.betterx.bclib.api.dataexchange.DataHandlerDescriptor; +import org.betterx.bclib.api.v2.dataexchange.DataHandler; +import org.betterx.bclib.api.v2.dataexchange.DataHandlerDescriptor; import org.betterx.bclib.config.Configs; import java.util.ArrayList; diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/SendFiles.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java similarity index 91% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/SendFiles.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java index 549698f7..639d2b9d 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/SendFiles.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SendFiles.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.minecraft.client.Minecraft; import net.minecraft.network.FriendlyByteBuf; @@ -9,10 +9,10 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.networking.v1.PacketSender; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.DataHandler; -import org.betterx.bclib.api.dataexchange.DataHandlerDescriptor; +import org.betterx.bclib.api.v2.dataexchange.DataHandler; +import org.betterx.bclib.api.v2.dataexchange.DataHandlerDescriptor; +import org.betterx.bclib.client.gui.screens.ConfirmRestartScreen; import org.betterx.bclib.config.Configs; -import org.betterx.bclib.gui.screens.ConfirmRestartScreen; import org.betterx.bclib.util.Pair; import org.betterx.bclib.util.PathUtil; import org.betterx.bclib.util.Triple; @@ -27,10 +27,10 @@ import java.util.stream.Collectors; public class SendFiles extends DataHandler.FromServer { public static final DataHandlerDescriptor DESCRIPTOR = new DataHandlerDescriptor(new ResourceLocation(BCLib.MOD_ID, - "send_files"), - SendFiles::new, - false, - false); + "send_files"), + SendFiles::new, + false, + false); protected List files; private String token; @@ -173,7 +173,7 @@ public class SendFiles extends DataHandler.FromServer { } count++; name = prefix + mase.modID + "_" + mase.version.replace(".", "_") + "__" + String.format("%03d", - count) + ".jar"; + count) + ".jar"; } while (path.toFile().exists()); } diff --git a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/SyncFolderDescriptor.java b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/SyncFolderDescriptor.java rename to src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java index da0a8b73..43b8e5ce 100644 --- a/src/main/java/org/betterx/bclib/api/dataexchange/handler/autosync/SyncFolderDescriptor.java +++ b/src/main/java/org/betterx/bclib/api/v2/dataexchange/handler/autosync/SyncFolderDescriptor.java @@ -1,11 +1,11 @@ -package org.betterx.bclib.api.dataexchange.handler.autosync; +package org.betterx.bclib.api.v2.dataexchange.handler.autosync; import net.minecraft.network.FriendlyByteBuf; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.DataHandler; -import org.betterx.bclib.api.dataexchange.FileHash; -import org.betterx.bclib.api.dataexchange.handler.autosync.AutoSyncID.ForDirectFileRequest; +import org.betterx.bclib.api.v2.dataexchange.DataHandler; +import org.betterx.bclib.api.v2.dataexchange.FileHash; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.AutoSyncID.ForDirectFileRequest; import org.betterx.bclib.config.Configs; import org.betterx.bclib.util.PathUtil; diff --git a/src/main/java/org/betterx/bclib/api/datafixer/DataFixerAPI.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/datafixer/DataFixerAPI.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java index 73c787f9..a9c1f6b6 100644 --- a/src/main/java/org/betterx/bclib/api/datafixer/DataFixerAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/datafixer/DataFixerAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.datafixer; +package org.betterx.bclib.api.v2.datafixer; import net.minecraft.Util; import net.minecraft.client.Minecraft; @@ -17,14 +17,14 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.WorldDataAPI; +import org.betterx.bclib.api.v2.WorldDataAPI; +import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; +import org.betterx.bclib.client.gui.screens.AtomicProgressListener; +import org.betterx.bclib.client.gui.screens.ConfirmFixScreen; +import org.betterx.bclib.client.gui.screens.LevelFixErrorScreen; +import org.betterx.bclib.client.gui.screens.LevelFixErrorScreen.Listener; +import org.betterx.bclib.client.gui.screens.ProgressScreen; import org.betterx.bclib.config.Configs; -import org.betterx.bclib.gui.screens.AtomicProgressListener; -import org.betterx.bclib.gui.screens.ConfirmFixScreen; -import org.betterx.bclib.gui.screens.LevelFixErrorScreen; -import org.betterx.bclib.gui.screens.LevelFixErrorScreen.Listener; -import org.betterx.bclib.gui.screens.ProgressScreen; -import org.betterx.bclib.api.worldgen.WorldGenUtil; import org.betterx.bclib.util.Logger; import java.io.*; @@ -181,7 +181,7 @@ public class DataFixerAPI { public static void createWorldData(LevelStorageAccess access, WorldGenSettings settings) { initializeWorldData(access, true); - WorldGenUtil.initializeWorldData(settings); + LevelGenUtil.initializeWorldData(settings); WorldDataAPI.saveFile(BCLib.MOD_ID); } diff --git a/src/main/java/org/betterx/bclib/api/datafixer/ForcedLevelPatch.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/datafixer/ForcedLevelPatch.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java index c81b31c0..a85393e7 100644 --- a/src/main/java/org/betterx/bclib/api/datafixer/ForcedLevelPatch.java +++ b/src/main/java/org/betterx/bclib/api/v2/datafixer/ForcedLevelPatch.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.datafixer; +package org.betterx.bclib.api.v2.datafixer; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; diff --git a/src/main/java/org/betterx/bclib/api/datafixer/MigrationProfile.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/datafixer/MigrationProfile.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java index ee548a69..86992a1b 100644 --- a/src/main/java/org/betterx/bclib/api/datafixer/MigrationProfile.java +++ b/src/main/java/org/betterx/bclib/api/v2/datafixer/MigrationProfile.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.datafixer; +package org.betterx.bclib.api.v2.datafixer; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -6,7 +6,7 @@ import net.minecraft.nbt.NbtIo; import net.minecraft.nbt.Tag; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.WorldDataAPI; +import org.betterx.bclib.api.v2.WorldDataAPI; import org.betterx.bclib.interfaces.PatchBiFunction; import org.betterx.bclib.interfaces.PatchFunction; import org.betterx.bclib.util.ModUtil; diff --git a/src/main/java/org/betterx/bclib/api/datafixer/Patch.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/datafixer/Patch.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java index a06aebaa..ab3786f1 100644 --- a/src/main/java/org/betterx/bclib/api/datafixer/Patch.java +++ b/src/main/java/org/betterx/bclib/api/v2/datafixer/Patch.java @@ -1,9 +1,9 @@ -package org.betterx.bclib.api.datafixer; +package org.betterx.bclib.api.v2.datafixer; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; -import org.betterx.bclib.api.WorldDataAPI; +import org.betterx.bclib.api.v2.WorldDataAPI; import org.betterx.bclib.interfaces.PatchBiFunction; import org.betterx.bclib.interfaces.PatchFunction; import org.betterx.bclib.util.ModUtil; diff --git a/src/main/java/org/betterx/bclib/api/datafixer/PatchDidiFailException.java b/src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java similarity index 81% rename from src/main/java/org/betterx/bclib/api/datafixer/PatchDidiFailException.java rename to src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java index 44e77f9a..053d29fe 100644 --- a/src/main/java/org/betterx/bclib/api/datafixer/PatchDidiFailException.java +++ b/src/main/java/org/betterx/bclib/api/v2/datafixer/PatchDidiFailException.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.datafixer; +package org.betterx.bclib.api.v2.datafixer; public class PatchDidiFailException extends Exception { public PatchDidiFailException() { diff --git a/src/main/java/org/betterx/bclib/world/generator/BCLBiomeSource.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java similarity index 97% rename from src/main/java/org/betterx/bclib/world/generator/BCLBiomeSource.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java index f3cfec37..4a4ea999 100644 --- a/src/main/java/org/betterx/bclib/world/generator/BCLBiomeSource.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/BCLBiomeSource.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.generator; +package org.betterx.bclib.api.v2.generator; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -7,7 +7,7 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeSource; import com.google.common.collect.Sets; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/org/betterx/bclib/api/worldgen/BCLChunkGenerator.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java similarity index 95% rename from src/main/java/org/betterx/bclib/api/worldgen/BCLChunkGenerator.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java index 007580c5..65dbfd85 100644 --- a/src/main/java/org/betterx/bclib/api/worldgen/BCLChunkGenerator.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/BCLChunkGenerator.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.worldgen; +package org.betterx.bclib.api.v2.generator; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -18,8 +18,8 @@ import net.minecraft.world.level.levelgen.synth.NormalNoise; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.surface.SurfaceRuleUtil; +import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleUtil; import org.betterx.bclib.interfaces.NoiseGeneratorSettingsProvider; import org.betterx.bclib.interfaces.SurfaceRuleProvider; @@ -69,7 +69,7 @@ public class BCLChunkGenerator extends NoiseBasedChunkGenerator { ChunkGenerator loadedChunkGenerator) { BCLib.LOGGER.debug("Checking Noise Settings for " + dimensionKey.location().toString()); final BiomeSource loadedBiomeSource = loadedChunkGenerator.getBiomeSource(); - BiomeAPI.applyModifications(loadedBiomeSource, dimensionKey); + InternalBiomeAPI.applyModifications(loadedBiomeSource, dimensionKey); if (loadedChunkGenerator instanceof NoiseBasedChunkGenerator nbc) { if (((Object) nbc.generatorSettings().value()) instanceof SurfaceRuleProvider srp) { diff --git a/src/main/java/org/betterx/bclib/world/generator/BCLibEndBiomeSource.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java similarity index 77% rename from src/main/java/org/betterx/bclib/world/generator/BCLibEndBiomeSource.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java index fbd052ab..53d1a073 100644 --- a/src/main/java/org/betterx/bclib/world/generator/BCLibEndBiomeSource.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibEndBiomeSource.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.generator; +package org.betterx.bclib.api.v2.generator; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -19,15 +19,15 @@ import net.fabricmc.fabric.impl.biome.TheEndBiomeData; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.generator.map.hex.HexBiomeMap; +import org.betterx.bclib.api.v2.generator.map.square.SquareBiomeMap; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.config.ConfigKeeper.StringArrayEntry; import org.betterx.bclib.config.Configs; import org.betterx.bclib.interfaces.BiomeMap; import org.betterx.bclib.interfaces.TheEndBiomeDataAccessor; import org.betterx.bclib.noise.OpenSimplexNoise; -import org.betterx.bclib.world.generator.map.hex.HexBiomeMap; -import org.betterx.bclib.world.generator.map.square.SquareBiomeMap; import java.awt.*; import java.util.ArrayList; @@ -54,9 +54,9 @@ public class BCLibEndBiomeSource extends BCLBiomeSource { .stable() .forGetter(source -> Optional.of(source.biomeSourceVersion))) .apply(instance, - instance.stable(BCLibEndBiomeSource::new) - ) - ); + instance.stable(BCLibEndBiomeSource::new) + ) + ); private final Holder centerBiome; private final Holder barrens; private final Point pos; @@ -91,8 +91,8 @@ public class BCLibEndBiomeSource extends BCLBiomeSource { endVoidBiomePicker = new BiomePicker(biomeRegistry); List includeVoid = Configs.BIOMES_CONFIG.getEntry("force_include", - "end_void_biomes", - StringArrayEntry.class).getValue(); + "end_void_biomes", + StringArrayEntry.class).getValue(); this.possibleBiomes().forEach(biome -> { ResourceLocation key = biome.unwrapKey().orElseThrow().location(); String group = key.getNamespace() + "." + key.getPath(); @@ -138,53 +138,53 @@ public class BCLibEndBiomeSource extends BCLBiomeSource { protected BCLBiomeSource cloneForDatapack(Set> datapackBiomes) { datapackBiomes.addAll(getBclBiomes(this.biomeRegistry)); return new BCLibEndBiomeSource(this.biomeRegistry, - datapackBiomes.stream().toList(), - this.currentSeed, - Optional.of(biomeSourceVersion), - true); + datapackBiomes.stream().toList(), + this.currentSeed, + Optional.of(biomeSourceVersion), + true); } private static List> getBclBiomes(Registry biomeRegistry) { List include = Configs.BIOMES_CONFIG.getEntry("force_include", - "end_land_biomes", - StringArrayEntry.class).getValue(); + "end_land_biomes", + StringArrayEntry.class).getValue(); include.addAll(Configs.BIOMES_CONFIG.getEntry("force_include", - "end_void_biomes", - StringArrayEntry.class).getValue()); + "end_void_biomes", + StringArrayEntry.class).getValue()); if (TheEndBiomeData.createOverrides(biomeRegistry) instanceof TheEndBiomeDataAccessor acc) { return getBiomes(biomeRegistry, - new ArrayList<>(0), - include, - (biome, location) -> - BCLibEndBiomeSource.isValidNonVanillaEndBiome(biome, location) || - acc.bcl_isNonVanillaAndCanGenerateInEnd(biome.unwrapKey().orElseThrow()) + new ArrayList<>(0), + include, + (biome, location) -> + BCLibEndBiomeSource.isValidNonVanillaEndBiome(biome, location) || + acc.bcl_isNonVanillaAndCanGenerateInEnd(biome.unwrapKey().orElseThrow()) - ); + ); } else { return getBiomes(biomeRegistry, - new ArrayList<>(0), - include, - BCLibEndBiomeSource::isValidNonVanillaEndBiome); + new ArrayList<>(0), + include, + BCLibEndBiomeSource::isValidNonVanillaEndBiome); } } private static List> getBiomes(Registry biomeRegistry) { List include = Configs.BIOMES_CONFIG.getEntry("force_include", - "end_land_biomes", - StringArrayEntry.class).getValue(); + "end_land_biomes", + StringArrayEntry.class).getValue(); include.addAll(Configs.BIOMES_CONFIG.getEntry("force_include", - "end_void_biomes", - StringArrayEntry.class).getValue()); + "end_void_biomes", + StringArrayEntry.class).getValue()); if (TheEndBiomeData.createOverrides(biomeRegistry) instanceof TheEndBiomeDataAccessor acc) { return getBiomes(biomeRegistry, - new ArrayList<>(0), - include, - (biome, location) -> - BCLibEndBiomeSource.isValidEndBiome(biome, location) || acc.bcl_canGenerateInEnd( - biome.unwrapKey().orElseThrow()) + new ArrayList<>(0), + include, + (biome, location) -> + BCLibEndBiomeSource.isValidEndBiome(biome, location) || acc.bcl_canGenerateInEnd( + biome.unwrapKey().orElseThrow()) - ); + ); } else { return getBiomes(biomeRegistry, new ArrayList<>(0), include, BCLibEndBiomeSource::isValidEndBiome); } @@ -231,20 +231,20 @@ public class BCLibEndBiomeSource extends BCLBiomeSource { @Override protected void onInitMap(long seed) { - if ((biomeSourceVersion != BCLBiomeSource.BIOME_SOURCE_VERSION_HEX)) { + if ((biomeSourceVersion != BIOME_SOURCE_VERSION_HEX)) { this.mapLand = new SquareBiomeMap(seed, - GeneratorOptions.getBiomeSizeEndLand(), - endLandBiomePicker); + GeneratorOptions.getBiomeSizeEndLand(), + endLandBiomePicker); this.mapVoid = new SquareBiomeMap(seed, - GeneratorOptions.getBiomeSizeEndVoid(), - endVoidBiomePicker); + GeneratorOptions.getBiomeSizeEndVoid(), + endVoidBiomePicker); } else { this.mapLand = new HexBiomeMap(seed, - GeneratorOptions.getBiomeSizeEndLand(), - endLandBiomePicker); + GeneratorOptions.getBiomeSizeEndLand(), + endLandBiomePicker); this.mapVoid = new HexBiomeMap(seed, - GeneratorOptions.getBiomeSizeEndVoid(), - endVoidBiomePicker); + GeneratorOptions.getBiomeSizeEndVoid(), + endVoidBiomePicker); } WorldgenRandom chunkRandom = new WorldgenRandom(new LegacyRandomSource(seed)); @@ -273,7 +273,7 @@ public class BCLibEndBiomeSource extends BCLBiomeSource { noise, (biomeX >> 1) + 1, (biomeZ >> 1) + 1 - ) + (float) SMALL_NOISE.eval(biomeX, biomeZ) * 5; + ) + (float) SMALL_NOISE.eval(biomeX, biomeZ) * 5; if (height > -20F && height < -5F) { return barrens; diff --git a/src/main/java/org/betterx/bclib/world/generator/BCLibNetherBiomeSource.java b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java similarity index 95% rename from src/main/java/org/betterx/bclib/world/generator/BCLibNetherBiomeSource.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java index 2ddee4ac..37601c03 100644 --- a/src/main/java/org/betterx/bclib/world/generator/BCLibNetherBiomeSource.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/BCLibNetherBiomeSource.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.generator; +package org.betterx.bclib.api.v2.generator; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -15,14 +15,14 @@ import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import org.apache.commons.lang3.function.TriFunction; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.generator.map.MapStack; +import org.betterx.bclib.api.v2.generator.map.hex.HexBiomeMap; +import org.betterx.bclib.api.v2.generator.map.square.SquareBiomeMap; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.config.ConfigKeeper.StringArrayEntry; import org.betterx.bclib.config.Configs; import org.betterx.bclib.interfaces.BiomeMap; -import org.betterx.bclib.world.generator.map.MapStack; -import org.betterx.bclib.world.generator.map.hex.HexBiomeMap; -import org.betterx.bclib.world.generator.map.square.SquareBiomeMap; import java.util.List; import java.util.Optional; @@ -183,7 +183,7 @@ public class BCLibNetherBiomeSource extends BCLBiomeSource { @Override protected void onInitMap(long seed) { - TriFunction mapConstructor = (biomeSourceVersion != BCLBiomeSource.BIOME_SOURCE_VERSION_HEX) + TriFunction mapConstructor = (biomeSourceVersion != BIOME_SOURCE_VERSION_HEX) ? SquareBiomeMap::new : HexBiomeMap::new; if (worldHeight > 128 && GeneratorOptions.useVerticalBiomes()) { diff --git a/src/main/java/org/betterx/bclib/world/generator/BiomePicker.java b/src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java similarity index 97% rename from src/main/java/org/betterx/bclib/world/generator/BiomePicker.java rename to src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java index 1c49e57e..f8beed27 100644 --- a/src/main/java/org/betterx/bclib/world/generator/BiomePicker.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/BiomePicker.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.generator; +package org.betterx.bclib.api.v2.generator; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -7,7 +7,7 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.WorldgenRandom; import com.google.common.collect.Lists; -import org.betterx.bclib.api.biomes.BCLBiome; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; import org.betterx.bclib.util.WeighTree; import org.betterx.bclib.util.WeightedList; diff --git a/src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java b/src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java new file mode 100644 index 00000000..8bfb3789 --- /dev/null +++ b/src/main/java/org/betterx/bclib/api/v2/generator/BiomeType.java @@ -0,0 +1,5 @@ +package org.betterx.bclib.api.v2.generator; + +public enum BiomeType { + LAND, VOID +} diff --git a/src/main/java/org/betterx/bclib/world/generator/GeneratorOptions.java b/src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java similarity index 98% rename from src/main/java/org/betterx/bclib/world/generator/GeneratorOptions.java rename to src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java index a8603ef7..ceb7da88 100644 --- a/src/main/java/org/betterx/bclib/world/generator/GeneratorOptions.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/GeneratorOptions.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.generator; +package org.betterx.bclib.api.v2.generator; import net.minecraft.util.Mth; diff --git a/src/main/java/org/betterx/bclib/world/generator/map/MapStack.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java similarity index 94% rename from src/main/java/org/betterx/bclib/world/generator/map/MapStack.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java index 1c924fb7..213606a8 100644 --- a/src/main/java/org/betterx/bclib/world/generator/map/MapStack.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/map/MapStack.java @@ -1,13 +1,13 @@ -package org.betterx.bclib.world.generator.map; +package org.betterx.bclib.api.v2.generator.map; import net.minecraft.util.Mth; import org.apache.commons.lang3.function.TriFunction; +import org.betterx.bclib.api.v2.generator.BiomePicker; import org.betterx.bclib.interfaces.BiomeChunk; import org.betterx.bclib.interfaces.BiomeMap; import org.betterx.bclib.interfaces.TriConsumer; import org.betterx.bclib.noise.OpenSimplexNoise; -import org.betterx.bclib.world.generator.BiomePicker; import java.util.Random; @@ -67,7 +67,7 @@ public class MapStack implements BiomeMap { mapIndex = maxIndex; } else { mapIndex = Mth.floor((y + noise.eval(x * 0.03, - z * 0.03) * layerDistortion) / worldHeight * maxIndex + 0.5F); + z * 0.03) * layerDistortion) / worldHeight * maxIndex + 0.5F); mapIndex = Mth.clamp(mapIndex, 0, maxIndex); } diff --git a/src/main/java/org/betterx/bclib/world/generator/map/hex/HexBiomeChunk.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java similarity index 98% rename from src/main/java/org/betterx/bclib/world/generator/map/hex/HexBiomeChunk.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java index beb2f199..d8272631 100644 --- a/src/main/java/org/betterx/bclib/world/generator/map/hex/HexBiomeChunk.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeChunk.java @@ -1,9 +1,9 @@ -package org.betterx.bclib.world.generator.map.hex; +package org.betterx.bclib.api.v2.generator.map.hex; import net.minecraft.world.level.levelgen.WorldgenRandom; +import org.betterx.bclib.api.v2.generator.BiomePicker; import org.betterx.bclib.interfaces.BiomeChunk; -import org.betterx.bclib.world.generator.BiomePicker; import java.util.Arrays; diff --git a/src/main/java/org/betterx/bclib/world/generator/map/hex/HexBiomeMap.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java similarity index 98% rename from src/main/java/org/betterx/bclib/world/generator/map/hex/HexBiomeMap.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java index 741ed66c..d106c151 100644 --- a/src/main/java/org/betterx/bclib/world/generator/map/hex/HexBiomeMap.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/map/hex/HexBiomeMap.java @@ -1,16 +1,16 @@ -package org.betterx.bclib.world.generator.map.hex; +package org.betterx.bclib.api.v2.generator.map.hex; import net.minecraft.util.RandomSource; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.levelgen.WorldgenRandom; import com.google.common.collect.Maps; +import org.betterx.bclib.api.v2.generator.BiomePicker; import org.betterx.bclib.interfaces.BiomeChunk; import org.betterx.bclib.interfaces.BiomeMap; import org.betterx.bclib.interfaces.TriConsumer; import org.betterx.bclib.noise.OpenSimplexNoise; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.generator.BiomePicker; import java.util.Map; import java.util.Random; diff --git a/src/main/java/org/betterx/bclib/world/generator/map/square/SquareBiomeChunk.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java similarity index 94% rename from src/main/java/org/betterx/bclib/world/generator/map/square/SquareBiomeChunk.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java index 1747e236..8f8f7bcd 100644 --- a/src/main/java/org/betterx/bclib/world/generator/map/square/SquareBiomeChunk.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeChunk.java @@ -1,9 +1,9 @@ -package org.betterx.bclib.world.generator.map.square; +package org.betterx.bclib.api.v2.generator.map.square; import net.minecraft.world.level.levelgen.WorldgenRandom; +import org.betterx.bclib.api.v2.generator.BiomePicker; import org.betterx.bclib.interfaces.BiomeChunk; -import org.betterx.bclib.world.generator.BiomePicker; public class SquareBiomeChunk implements BiomeChunk { private static final int BIT_OFFSET = 4; diff --git a/src/main/java/org/betterx/bclib/world/generator/map/square/SquareBiomeMap.java b/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java similarity index 96% rename from src/main/java/org/betterx/bclib/world/generator/map/square/SquareBiomeMap.java rename to src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java index 18d4868e..13e50d27 100644 --- a/src/main/java/org/betterx/bclib/world/generator/map/square/SquareBiomeMap.java +++ b/src/main/java/org/betterx/bclib/api/v2/generator/map/square/SquareBiomeMap.java @@ -1,16 +1,16 @@ -package org.betterx.bclib.world.generator.map.square; +package org.betterx.bclib.api.v2.generator.map.square; import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.levelgen.LegacyRandomSource; import net.minecraft.world.level.levelgen.WorldgenRandom; import com.google.common.collect.Maps; +import org.betterx.bclib.api.v2.generator.BiomePicker; import org.betterx.bclib.interfaces.BiomeChunk; import org.betterx.bclib.interfaces.BiomeMap; import org.betterx.bclib.interfaces.TriConsumer; import org.betterx.bclib.noise.OpenSimplexNoise; import org.betterx.bclib.util.MHelper; -import org.betterx.bclib.world.generator.BiomePicker; import java.util.Map; @@ -125,7 +125,7 @@ public class SquareBiomeMap implements BiomeMap { } ChunkPos cpos = new ChunkPos(MHelper.floor(x / SquareBiomeChunk.WIDTH), - MHelper.floor(z / SquareBiomeChunk.WIDTH)); + MHelper.floor(z / SquareBiomeChunk.WIDTH)); SquareBiomeChunk chunk = maps.get(cpos); if (chunk == null) { synchronized (random) { diff --git a/src/main/java/org/betterx/bclib/api/worldgen/WorldGenUtil.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java similarity index 87% rename from src/main/java/org/betterx/bclib/api/worldgen/WorldGenUtil.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java index ca84cd8f..c1958e75 100644 --- a/src/main/java/org/betterx/bclib/api/worldgen/WorldGenUtil.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/LevelGenUtil.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.worldgen; +package org.betterx.bclib.api.v2.levelgen; import net.minecraft.core.Holder; import net.minecraft.core.MappedRegistry; @@ -25,21 +25,22 @@ import com.mojang.datafixers.util.Pair; import com.mojang.serialization.Dynamic; import com.mojang.serialization.Lifecycle; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.WorldDataAPI; +import org.betterx.bclib.api.v2.WorldDataAPI; +import org.betterx.bclib.api.v2.generator.BCLBiomeSource; +import org.betterx.bclib.api.v2.generator.BCLChunkGenerator; +import org.betterx.bclib.api.v2.generator.BCLibEndBiomeSource; +import org.betterx.bclib.api.v2.generator.BCLibNetherBiomeSource; import org.betterx.bclib.mixin.common.RegistryOpsAccessor; import org.betterx.bclib.presets.worldgen.BCLWorldPresetSettings; import org.betterx.bclib.presets.worldgen.BCLWorldPresets; import org.betterx.bclib.presets.worldgen.WorldPresetSettings; import org.betterx.bclib.util.ModUtil; -import org.betterx.bclib.world.generator.BCLBiomeSource; -import org.betterx.bclib.world.generator.BCLibEndBiomeSource; -import org.betterx.bclib.world.generator.BCLibNetherBiomeSource; import java.util.Map; import java.util.Optional; import org.jetbrains.annotations.NotNull; -public class WorldGenUtil { +public class LevelGenUtil { private static final String TAG_VERSION = "version"; private static final String TAG_BN_GEN_VERSION = "generator_version"; private static String TAG_GENERATOR = "generator"; @@ -122,10 +123,10 @@ public class WorldGenUtil { boolean generateStructures, boolean generateBonusChest) { return createWorldFromPreset(BCLWorldPresets.DEFAULT.orElseThrow(), - registryAccess, - seed, - generateStructures, - generateBonusChest); + registryAccess, + seed, + generateStructures, + generateBonusChest); } public static Pair defaultWorldDataSupplier(RegistryAccess.Frozen frozen) { @@ -147,7 +148,7 @@ public class WorldGenUtil { int biomeSourceVersion, RegistryAccess registryAccess, WorldGenSettings worldGenSettings - ) { + ) { Optional> oLevelStem = referenceStemForVersion( dimensionKey, biomeSourceVersion, @@ -155,12 +156,12 @@ public class WorldGenUtil { worldGenSettings.seed(), worldGenSettings.generateStructures(), worldGenSettings.generateStructures() - ); + ); return replaceGenerator(dimensionKey, - dimensionTypeKey, - registryAccess, - worldGenSettings, - oLevelStem.map(l -> l.value().generator()).orElseThrow()); + dimensionTypeKey, + registryAccess, + worldGenSettings, + oLevelStem.map(l -> l.value().generator()).orElseThrow()); } public static WorldGenSettings replaceGenerator( @@ -169,31 +170,31 @@ public class WorldGenUtil { RegistryAccess registryAccess, WorldGenSettings worldGenSettings, ChunkGenerator generator - ) { + ) { Registry dimensionTypeRegistry = registryAccess.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY); Registry newDimensions = withDimension(dimensionKey, - dimensionTypeKey, - dimensionTypeRegistry, - worldGenSettings.dimensions(), - generator); + dimensionTypeKey, + dimensionTypeRegistry, + worldGenSettings.dimensions(), + generator); return new WorldGenSettings(worldGenSettings.seed(), - worldGenSettings.generateStructures(), - worldGenSettings.generateBonusChest(), - newDimensions); + worldGenSettings.generateStructures(), + worldGenSettings.generateBonusChest(), + newDimensions); } public static WorldGenSettings replaceStem( ResourceKey dimensionKey, WorldGenSettings worldGenSettings, LevelStem levelStem - ) { + ) { Registry newDimensions = withDimension(dimensionKey, - worldGenSettings.dimensions(), - levelStem); + worldGenSettings.dimensions(), + levelStem); return new WorldGenSettings(worldGenSettings.seed(), - worldGenSettings.generateStructures(), - worldGenSettings.generateBonusChest(), - newDimensions); + worldGenSettings.generateStructures(), + worldGenSettings.generateBonusChest(), + newDimensions); } public static Registry withDimension(ResourceKey dimensionKey, @@ -213,17 +214,17 @@ public class WorldGenUtil { Registry inputDimensions, LevelStem levelStem) { MappedRegistry writableRegistry = new MappedRegistry<>(Registry.LEVEL_STEM_REGISTRY, - Lifecycle.experimental(), - null); + Lifecycle.experimental(), + null); writableRegistry.register(dimensionKey, - levelStem, - Lifecycle.stable()); + levelStem, + Lifecycle.stable()); for (Map.Entry, LevelStem> entry : inputDimensions.entrySet()) { ResourceKey resourceKey = entry.getKey(); if (resourceKey == dimensionKey) continue; writableRegistry.register(resourceKey, - entry.getValue(), - inputDimensions.lifecycle(entry.getValue())); + entry.getValue(), + inputDimensions.lifecycle(entry.getValue())); } return writableRegistry; } @@ -240,7 +241,7 @@ public class WorldGenUtil { long seed, boolean generateStructures, boolean generateBonusChest - ) { + ) { final WorldGenSettings referenceSettings; if (biomeSourceVersion == BCLBiomeSource.BIOME_SOURCE_VERSION_VANILLA) { referenceSettings = net.minecraft.world.level.levelgen.presets.WorldPresets.createNormalWorldFromPreset( diff --git a/src/main/java/org/betterx/bclib/api/biomes/BCLBiome.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/biomes/BCLBiome.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java index 9cabf79f..f5147264 100644 --- a/src/main/java/org/betterx/bclib/api/biomes/BCLBiome.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.biomes; +package org.betterx.bclib.api.v2.levelgen.biomes; import net.minecraft.data.BuiltinRegistries; import net.minecraft.resources.ResourceKey; @@ -14,8 +14,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.surface.SurfaceRuleUtil; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleUtil; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.util.WeightedList; import java.util.List; diff --git a/src/main/java/org/betterx/bclib/api/biomes/BCLBiomeBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/biomes/BCLBiomeBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java index b33a9ed4..ef6301d9 100644 --- a/src/main/java/org/betterx/bclib/api/biomes/BCLBiomeBuilder.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeBuilder.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.biomes; +package org.betterx.bclib.api.v2.levelgen.biomes; import net.minecraft.core.Holder; import net.minecraft.core.HolderSet; @@ -29,9 +29,9 @@ import net.fabricmc.fabric.api.biome.v1.BiomeModifications; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.betterx.bclib.api.features.BCLFeature; -import org.betterx.bclib.api.structures.BCLStructure; -import org.betterx.bclib.api.surface.SurfaceRuleBuilder; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; +import org.betterx.bclib.api.v2.levelgen.structures.BCLStructure; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; import org.betterx.bclib.entity.BCLEntityWrapper; import org.betterx.bclib.mixin.common.BiomeGenerationSettingsAccessor; import org.betterx.bclib.util.CollectionsUtil; diff --git a/src/main/java/org/betterx/bclib/api/biomes/BCLBiomeSettings.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/biomes/BCLBiomeSettings.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java index d867dbaf..5cff291a 100644 --- a/src/main/java/org/betterx/bclib/api/biomes/BCLBiomeSettings.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiomeSettings.java @@ -1,9 +1,9 @@ -package org.betterx.bclib.api.biomes; +package org.betterx.bclib.api.v2.levelgen.biomes; import net.minecraft.world.level.biome.Biome; +import org.betterx.bclib.api.v2.generator.BiomePicker; import org.betterx.bclib.config.Configs; -import org.betterx.bclib.world.generator.BiomePicker; public class BCLBiomeSettings { public static Builder createBCL() { diff --git a/src/main/java/org/betterx/bclib/api/biomes/BiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java similarity index 74% rename from src/main/java/org/betterx/bclib/api/biomes/BiomeAPI.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java index 5fe73391..3f9e503e 100644 --- a/src/main/java/org/betterx/bclib/api/biomes/BiomeAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BiomeAPI.java @@ -1,11 +1,13 @@ -package org.betterx.bclib.api.biomes; +package org.betterx.bclib.api.v2.levelgen.biomes; import net.minecraft.client.Minecraft; -import net.minecraft.core.*; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Holder; +import net.minecraft.core.HolderSet; +import net.minecraft.core.Registry; import net.minecraft.data.BuiltinRegistries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.BiomeTags; import net.minecraft.util.random.WeightedRandomList; import net.minecraft.world.entity.EntityType; @@ -16,16 +18,13 @@ import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.WorldGenLevel; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.BiomeGenerationSettings; -import net.minecraft.world.level.biome.BiomeSource; import net.minecraft.world.level.biome.Biomes; import net.minecraft.world.level.biome.MobSpawnSettings.SpawnerData; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkAccess; -import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.chunk.PalettedContainerRO; import net.minecraft.world.level.dimension.LevelStem; import net.minecraft.world.level.levelgen.GenerationStep.Decoration; -import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.placement.PlacedFeature; @@ -40,28 +39,22 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.apache.commons.lang3.mutable.MutableInt; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.features.BCLFeature; -import org.betterx.bclib.api.tag.CommonBiomeTags; -import org.betterx.bclib.api.tag.TagAPI; -import org.betterx.bclib.interfaces.BiomeSourceAccessor; -import org.betterx.bclib.interfaces.NoiseGeneratorSettingsProvider; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; +import org.betterx.bclib.api.v2.tag.CommonBiomeTags; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.interfaces.SurfaceMaterialProvider; -import org.betterx.bclib.interfaces.SurfaceRuleProvider; import org.betterx.bclib.mixin.common.BiomeGenerationSettingsAccessor; import org.betterx.bclib.mixin.common.MobSpawnSettingsAccessor; import org.betterx.bclib.util.CollectionsUtil; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Optional; import java.util.Set; import java.util.function.BiConsumer; import java.util.function.Supplier; import java.util.stream.Collectors; -import java.util.stream.Stream; import org.jetbrains.annotations.Nullable; public class BiomeAPI { @@ -79,7 +72,7 @@ public class BiomeAPI { public static final BiomeType OTHER_END_LAND = new BiomeType("OTHER_END_LAND", END_LAND); public static final BiomeType OTHER_END_VOID = new BiomeType("OTHER_END_VOID", END_VOID); - private static final Map BIOME_TYPE_MAP = Maps.newHashMap(); + static final Map BIOME_TYPE_MAP = Maps.newHashMap(); public final BiomeType parentOrNull; private final String debugName; @@ -113,15 +106,6 @@ public class BiomeAPI { public static final BCLBiome EMPTY_BIOME = new BCLBiome(Biomes.THE_VOID.location()); private static final Map ID_MAP = Maps.newHashMap(); - private static final Map CLIENT = Maps.newHashMap(); - private static Registry biomeRegistry; - private static RegistryAccess registryAccess; - - private static final Map, Integer> FEATURE_ORDER = Maps.newHashMap(); - private static final MutableInt FEATURE_ORDER_ID = new MutableInt(0); - - private static final Map, List>>> MODIFICATIONS = Maps.newHashMap(); - private static final Map>>> TAG_ADDERS = Maps.newHashMap(); public static final BCLBiome NETHER_WASTES_BIOME = registerNetherBiome(getFromRegistry(Biomes.NETHER_WASTES).value()); public static final BCLBiome CRIMSON_FOREST_BIOME = registerNetherBiome(getFromRegistry(Biomes.CRIMSON_FOREST).value()); @@ -141,53 +125,6 @@ public class BiomeAPI { public static final BCLBiome SMALL_END_ISLANDS = registerEndVoidBiome(getFromRegistry(new ResourceLocation( "small_end_islands"))); - private static void initFeatureOrder() { - if (!FEATURE_ORDER.isEmpty()) { - return; - } - - BuiltinRegistries.BIOME - .entrySet() - .stream() - .filter(entry -> entry - .getKey() - .location() - .getNamespace() - .equals("minecraft")) - .map(Entry::getValue) - .map(biome -> (BiomeGenerationSettingsAccessor) biome.getGenerationSettings()) - .map(BiomeGenerationSettingsAccessor::bclib_getFeatures) - .forEach(stepFeatureSuppliers -> stepFeatureSuppliers.forEach(step -> step.forEach(feature -> { - FEATURE_ORDER.computeIfAbsent(feature, f -> FEATURE_ORDER_ID.getAndIncrement()); - }))); - } - - /** - * Initialize registry for current server. - * - * @param access - The new, active {@link RegistryAccess} for the current session. - */ - public static void initRegistry(RegistryAccess access) { - if (access != registryAccess) { - BiomeAPI.registryAccess = access; - Registry biomeRegistry = access.registry(Registry.BIOME_REGISTRY).orElse(null); - - if (biomeRegistry != BiomeAPI.biomeRegistry) { - BiomeAPI.biomeRegistry = biomeRegistry; - CLIENT.clear(); - } - } - } - - /** - * For internal use only. - *

- * This method gets called before a world is loaded/created to flush cashes we build. - */ - public static void prepareNewLevel() { - - } - /** * Register {@link BCLBiome} instance and its {@link Biome} if necessary. * @@ -251,7 +188,7 @@ public class BiomeAPI { public static BCLBiome registerNetherBiome(BCLBiome bclBiome) { registerBiome(bclBiome, BiomeType.BCL_NETHER); - ResourceKey key = BiomeAPI.getBiomeKey(bclBiome.getBiome()); + ResourceKey key = getBiomeKey(bclBiome.getBiome()); if (bclBiome.allowFabricRegistration()) { bclBiome.forEachClimateParameter(p -> NetherBiomeData.addNetherBiome(key, p)); } @@ -282,7 +219,7 @@ public class BiomeAPI { registerBiome(biome, BiomeType.BCL_END_LAND); float weight = biome.getGenChance(); - ResourceKey key = BiomeAPI.getBiomeKey(biome.getBiome()); + ResourceKey key = getBiomeKey(biome.getBiome()); if (biome.allowFabricRegistration()) { TheEndBiomeData.addEndBiomeReplacement(Biomes.END_HIGHLANDS, key, weight); TheEndBiomeData.addEndBiomeReplacement(Biomes.END_MIDLANDS, key, weight); @@ -331,7 +268,7 @@ public class BiomeAPI { registerBiome(biome, BiomeType.END_VOID); float weight = biome.getGenChance(); - ResourceKey key = BiomeAPI.getBiomeKey(biome.getBiome()); + ResourceKey key = getBiomeKey(biome.getBiome()); if (biome.allowFabricRegistration()) { TheEndBiomeData.addEndBiomeReplacement(Biomes.SMALL_END_ISLANDS, key, weight); } @@ -375,7 +312,7 @@ public class BiomeAPI { * @return {@link BCLBiome} or {@code BiomeAPI.EMPTY_BIOME}. */ public static BCLBiome getFromBiome(Holder biome) { - if (biomeRegistry == null) { + if (InternalBiomeAPI.biomeRegistry == null) { return EMPTY_BIOME; } return ID_MAP.getOrDefault(biome.unwrapKey().orElseThrow().location(), EMPTY_BIOME); @@ -389,14 +326,14 @@ public class BiomeAPI { */ @Environment(EnvType.CLIENT) public static BCLBiome getRenderBiome(Biome biome) { - BCLBiome endBiome = CLIENT.get(biome); + BCLBiome endBiome = InternalBiomeAPI.CLIENT.get(biome); if (endBiome == null) { Minecraft minecraft = Minecraft.getInstance(); ResourceLocation id = minecraft.level.registryAccess() .registryOrThrow(Registry.BIOME_REGISTRY) .getKey(biome); endBiome = id == null ? EMPTY_BIOME : ID_MAP.getOrDefault(id, EMPTY_BIOME); - CLIENT.put(biome, endBiome); + InternalBiomeAPI.CLIENT.put(biome, endBiome); } return endBiome; } @@ -409,8 +346,8 @@ public class BiomeAPI { */ @Nullable public static ResourceKey getBiomeKey(Biome biome) { - if (biomeRegistry != null) { - Optional> key = biomeRegistry.getResourceKey(biome); + if (InternalBiomeAPI.biomeRegistry != null) { + Optional> key = InternalBiomeAPI.biomeRegistry.getResourceKey(biome); if (key.isPresent()) return key.get(); } return BuiltinRegistries.BIOME @@ -426,8 +363,8 @@ public class BiomeAPI { */ public static ResourceLocation getBiomeID(Biome biome) { ResourceLocation id = null; - if (biomeRegistry != null) { - id = biomeRegistry.getKey(biome); + if (InternalBiomeAPI.biomeRegistry != null) { + id = InternalBiomeAPI.biomeRegistry.getKey(biome); } if (id == null) { id = BuiltinRegistries.BIOME.getKey(biome); @@ -468,17 +405,17 @@ public class BiomeAPI { } public static Holder getBiomeHolder(Biome biome) { - if (biomeRegistry != null) { - Optional> key = biomeRegistry.getResourceKey(biome); - if (key.isPresent()) return biomeRegistry.getOrCreateHolderOrThrow(key.get()); + if (InternalBiomeAPI.biomeRegistry != null) { + Optional> key = InternalBiomeAPI.biomeRegistry.getResourceKey(biome); + if (key.isPresent()) return InternalBiomeAPI.biomeRegistry.getOrCreateHolderOrThrow(key.get()); } return BuiltinRegistries.BIOME.getOrCreateHolderOrThrow(BiomeAPI.getBiomeKey(biome)); } public static Holder getBiomeHolder(ResourceLocation biome) { - if (biomeRegistry != null) { - return getBiomeHolder(biomeRegistry.get(biome)); + if (InternalBiomeAPI.biomeRegistry != null) { + return getBiomeHolder(InternalBiomeAPI.biomeRegistry.get(biome)); } return getBiomeHolder(BuiltinRegistries.BIOME.get(biome)); } @@ -523,38 +460,6 @@ public class BiomeAPI { return ID_MAP.containsKey(biomeID); } - /** - * Load biomes from Fabric API. For internal usage only. - */ - public static void loadFabricAPIBiomes() { - FabricBiomesData.NETHER_BIOMES.forEach((key) -> { - if (!hasBiome(key.location())) { - Optional> optional = BuiltinRegistries.BIOME.getHolder(key); - if (optional.isPresent()) { - registerNetherBiome(optional.get().value()); - } - } - }); - - FabricBiomesData.END_LAND_BIOMES.forEach((key, weight) -> { - if (!hasBiome(key.location())) { - Optional> optional = BuiltinRegistries.BIOME.getHolder(key); - if (optional.isPresent()) { - registerEndLandBiome(optional.get(), weight); - } - } - }); - - FabricBiomesData.END_VOID_BIOMES.forEach((key, weight) -> { - if (!hasBiome(key.location())) { - Optional> optional = BuiltinRegistries.BIOME.getHolder(key); - if (optional.isPresent()) { - registerEndVoidBiome(optional.get(), weight); - } - } - }); - } - @Nullable public static Holder getFromRegistry(ResourceLocation key) { return BuiltinRegistries.BIOME.getHolder(ResourceKey.create(Registry.BIOME_REGISTRY, key)).orElseThrow(); @@ -602,7 +507,8 @@ public class BiomeAPI { */ public static void registerBiomeModification(ResourceKey dimensionID, BiConsumer> modification) { - List>> modifications = MODIFICATIONS.computeIfAbsent(dimensionID, + List>> modifications = InternalBiomeAPI.MODIFICATIONS.computeIfAbsent( + dimensionID, k -> Lists.newArrayList()); modifications.add(modification); } @@ -635,46 +541,25 @@ public class BiomeAPI { } /** - * For internal use only - */ - public static void _runBiomeTagAdders() { - for (var mod : TAG_ADDERS.entrySet()) { - Stream s = null; - if (mod.getKey() == Level.NETHER) s = BiomeType.BIOME_TYPE_MAP.entrySet() - .stream() - .filter(e -> e.getValue() - .is(BiomeType.NETHER)) - .map(e -> e.getKey()); - else if (mod.getKey() == Level.END) s = BiomeType.BIOME_TYPE_MAP.entrySet() - .stream() - .filter(e -> e.getValue().is(BiomeType.END)) - .map(e -> e.getKey()); - if (s != null) { - s.forEach(id -> { - Holder biomeHolder = BiomeAPI.getBiomeHolder(id); - if (biomeHolder.isBound()) { - mod.getValue().forEach(c -> c.accept(id, biomeHolder)); - } - }); - } - } - } - - /** - * Registers new biome modification for specified dimension. Will work both for mod and datapack biomes. + * Registers new biome modification for specified dimension that is executed when all + * BiomeTags are finalized by the game during level load. Will work both for mod and + * datapack biomes. * * @param dimensionID {@link ResourceLocation} dimension ID, example: Level.OVERWORLD or "minecraft:overworld". * @param modification {@link BiConsumer} with {@link ResourceKey} biome ID and {@link Biome} parameters. */ public static void onFinishingBiomeTags(ResourceKey dimensionID, BiConsumer> modification) { - List>> modifications = TAG_ADDERS.computeIfAbsent(dimensionID, + List>> modifications = InternalBiomeAPI.TAG_ADDERS.computeIfAbsent( + dimensionID, k -> Lists.newArrayList()); modifications.add(modification); } /** - * Registers new biome modification for the Nether. Will work both for mod and datapack biomes. + * Registers new biome modification for the Nether dimension that is executed when all + * BiomeTags are finalized by the game during level load. Will work both for mod and + * datapack biomes. * * @param modification {@link BiConsumer} with {@link ResourceLocation} biome ID and {@link Biome} parameters. */ @@ -683,7 +568,9 @@ public class BiomeAPI { } /** - * Registers new biome modification for the End. Will work both for mod and datapack biomes. + * Registers new biome modification for the End that is executed when all + * BiomeTags are finalized by the game during level load. Will work both for mod and + * datapack biomes. * * @param modification {@link BiConsumer} with {@link ResourceLocation} biome ID and {@link Biome} parameters. */ @@ -691,91 +578,10 @@ public class BiomeAPI { onFinishingBiomeTags(Level.END, modification); } - /** - * Will apply biome modiffications to world, internal usage only. - * - * @param level - */ - @Deprecated(forRemoval = true) - public static void applyModificationsDeprecated(ServerLevel level) { - //TODO: Now Disabled, because we fix the settings when everything gets loaded - if (level != null) return; - - NoiseGeneratorSettings noiseGeneratorSettings = null; - final ChunkGenerator chunkGenerator = level.getChunkSource().getGenerator(); - final BiomeSource source = chunkGenerator.getBiomeSource(); - final Set> biomes = source.possibleBiomes(); - - if (chunkGenerator instanceof NoiseGeneratorSettingsProvider gen) - noiseGeneratorSettings = gen.bclib_getNoiseGeneratorSettings(); - - // Datapacks (like Amplified Nether)will change the GeneratorSettings upon load, so we will - // only use the default Setting for Nether/End if we were unable to find a settings object - if (noiseGeneratorSettings == null) { - if (level.dimension() == Level.NETHER) { - noiseGeneratorSettings = BuiltinRegistries.NOISE_GENERATOR_SETTINGS.get(NoiseGeneratorSettings.NETHER); - } else if (level.dimension() == Level.END) { - noiseGeneratorSettings = BuiltinRegistries.NOISE_GENERATOR_SETTINGS.get(NoiseGeneratorSettings.END); - } - } - - List>> modifications = MODIFICATIONS.get(level - .dimensionTypeRegistration() - .unwrapKey() - .orElseThrow()); - for (Holder biomeHolder : biomes) { - if (biomeHolder.isBound()) { - applyModificationsAndUpdateFeatures(modifications, biomeHolder); - } - } - - - if (noiseGeneratorSettings != null) { - final SurfaceRuleProvider provider = SurfaceRuleProvider.class.cast(noiseGeneratorSettings); - // Multiple Biomes can use the same generator. So we need to keep track of all Biomes that are - // Provided by all the BiomeSources that use the same generator. - // This happens for example when using the MiningDimensions, which reuses the generator for the - // Nethering Dimension - //MODIFIED_SURFACE_PROVIDERS.add(provider); - provider.bclib_addBiomeSource(source); - } else { - BCLib.LOGGER.warning("No generator for " + source); - } - - ((BiomeSourceAccessor) source).bclRebuildFeatures(); - } - - public static void applyModifications(BiomeSource source, ResourceKey dimension) { - BCLib.LOGGER.info("Apply Modifications for " + dimension.location() + " BiomeSource " + source); - /*if (dimension.location().equals(LevelStem.NETHER)){ - if (source instanceof BCLBiomeSource s) { - NetherBiomes.useLegacyGeneration = s.biomeSourceVersion==BCLBiomeSource.BIOME_SOURCE_VERSION_SQUARE; - } - }*/ - final Set> biomes = source.possibleBiomes(); - List>> modifications = MODIFICATIONS.get(dimension); - for (Holder biomeHolder : biomes) { - if (biomeHolder.isBound()) { - applyModificationsAndUpdateFeatures(modifications, biomeHolder); - } - } - } - - - private static void applyModificationsAndUpdateFeatures(List>> modifications, - Holder biome) { - ResourceLocation biomeID = getBiomeID(biome); - if (modifications != null) { - modifications.forEach(consumer -> { - consumer.accept(biomeID, biome); - }); - } - - sortBiomeFeatures(biome); - } /** - * Create a unique sort order for all Features of the Biome + * Create a unique sort order for all Features of the Biome. This method is automatically called for each Biome + * after all biome Modifications were executed. * * @param biome The {@link Biome} to sort the features for */ @@ -939,7 +745,7 @@ public class BiomeAPI { } private static void sortFeatures(List> features) { - initFeatureOrder(); + InternalBiomeAPI.initFeatureOrder(); Set> featuresWithoutDuplicates = Sets.newHashSet(); features.forEach(holder -> featuresWithoutDuplicates.add(holder)); @@ -950,12 +756,13 @@ public class BiomeAPI { } features.forEach(feature -> { - FEATURE_ORDER.computeIfAbsent(feature, f -> FEATURE_ORDER_ID.getAndIncrement()); + InternalBiomeAPI.FEATURE_ORDER.computeIfAbsent(feature, + f -> InternalBiomeAPI.FEATURE_ORDER_ID.getAndIncrement()); }); features.sort((f1, f2) -> { - int v1 = FEATURE_ORDER.getOrDefault(f1, 70000); - int v2 = FEATURE_ORDER.getOrDefault(f2, 70000); + int v1 = InternalBiomeAPI.FEATURE_ORDER.getOrDefault(f1, 70000); + int v2 = InternalBiomeAPI.FEATURE_ORDER.getOrDefault(f2, 70000); return Integer.compare(v1, v2); }); } diff --git a/src/main/java/org/betterx/bclib/api/biomes/FabricBiomesData.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/FabricBiomesData.java similarity index 91% rename from src/main/java/org/betterx/bclib/api/biomes/FabricBiomesData.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/FabricBiomesData.java index 266dd52b..d14c45a2 100644 --- a/src/main/java/org/betterx/bclib/api/biomes/FabricBiomesData.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/FabricBiomesData.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.biomes; +package org.betterx.bclib.api.v2.levelgen.biomes; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java new file mode 100644 index 00000000..38e798dd --- /dev/null +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/InternalBiomeAPI.java @@ -0,0 +1,229 @@ +package org.betterx.bclib.api.v2.levelgen.biomes; + +import net.minecraft.core.Holder; +import net.minecraft.core.Registry; +import net.minecraft.core.RegistryAccess; +import net.minecraft.data.BuiltinRegistries; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.biome.BiomeSource; +import net.minecraft.world.level.chunk.ChunkGenerator; +import net.minecraft.world.level.dimension.LevelStem; +import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; + +import com.google.common.collect.Maps; +import org.apache.commons.lang3.mutable.MutableInt; +import org.betterx.bclib.BCLib; +import org.betterx.bclib.interfaces.BiomeSourceAccessor; +import org.betterx.bclib.interfaces.NoiseGeneratorSettingsProvider; +import org.betterx.bclib.interfaces.SurfaceRuleProvider; +import org.betterx.bclib.mixin.common.BiomeGenerationSettingsAccessor; + +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.BiConsumer; +import java.util.stream.Stream; + +public class InternalBiomeAPI { + static final Map CLIENT = Maps.newHashMap(); + static final Map, Integer> FEATURE_ORDER = Maps.newHashMap(); + static final MutableInt FEATURE_ORDER_ID = new MutableInt(0); + static final Map, List>>> MODIFICATIONS = Maps.newHashMap(); + static final Map>>> TAG_ADDERS = Maps.newHashMap(); + static Registry biomeRegistry; + static RegistryAccess registryAccess; + + static void initFeatureOrder() { + if (!FEATURE_ORDER.isEmpty()) { + return; + } + + BuiltinRegistries.BIOME + .entrySet() + .stream() + .filter(entry -> entry + .getKey() + .location() + .getNamespace() + .equals("minecraft")) + .map(Map.Entry::getValue) + .map(biome -> (BiomeGenerationSettingsAccessor) biome.getGenerationSettings()) + .map(BiomeGenerationSettingsAccessor::bclib_getFeatures) + .forEach(stepFeatureSuppliers -> stepFeatureSuppliers.forEach(step -> step.forEach(feature -> { + FEATURE_ORDER.computeIfAbsent(feature, f -> FEATURE_ORDER_ID.getAndIncrement()); + }))); + } + + /** + * Initialize registry for current server. + * + * @param access - The new, active {@link RegistryAccess} for the current session. + */ + public static void initRegistry(RegistryAccess access) { + if (access != registryAccess) { + registryAccess = access; + Registry biomeRegistry = access.registry(Registry.BIOME_REGISTRY).orElse(null); + + if (biomeRegistry != InternalBiomeAPI.biomeRegistry) { + InternalBiomeAPI.biomeRegistry = biomeRegistry; + CLIENT.clear(); + } + } + } + + /** + * For internal use only. + *

+ * This method gets called before a world is loaded/created to flush cashes we build. + */ + public static void prepareNewLevel() { + + } + + /** + * Load biomes from Fabric API. For internal usage only. + */ + public static void loadFabricAPIBiomes() { + FabricBiomesData.NETHER_BIOMES.forEach((key) -> { + if (!BiomeAPI.hasBiome(key.location())) { + Optional> optional = BuiltinRegistries.BIOME.getHolder(key); + if (optional.isPresent()) { + BiomeAPI.registerNetherBiome(optional.get().value()); + } + } + }); + + FabricBiomesData.END_LAND_BIOMES.forEach((key, weight) -> { + if (!BiomeAPI.hasBiome(key.location())) { + Optional> optional = BuiltinRegistries.BIOME.getHolder(key); + if (optional.isPresent()) { + BiomeAPI.registerEndLandBiome(optional.get(), weight); + } + } + }); + + FabricBiomesData.END_VOID_BIOMES.forEach((key, weight) -> { + if (!BiomeAPI.hasBiome(key.location())) { + Optional> optional = BuiltinRegistries.BIOME.getHolder(key); + if (optional.isPresent()) { + BiomeAPI.registerEndVoidBiome(optional.get(), weight); + } + } + }); + } + + /** + * For internal use only + */ + public static void _runBiomeTagAdders() { + for (var mod : TAG_ADDERS.entrySet()) { + Stream s = null; + if (mod.getKey() == Level.NETHER) s = BiomeAPI.BiomeType.BIOME_TYPE_MAP.entrySet() + .stream() + .filter(e -> e.getValue() + .is(BiomeAPI.BiomeType.NETHER)) + .map(e -> e.getKey()); + else if (mod.getKey() == Level.END) s = BiomeAPI.BiomeType.BIOME_TYPE_MAP.entrySet() + .stream() + .filter(e -> e.getValue().is( + BiomeAPI.BiomeType.END)) + .map(e -> e.getKey()); + if (s != null) { + s.forEach(id -> { + Holder biomeHolder = BiomeAPI.getBiomeHolder(id); + if (biomeHolder.isBound()) { + mod.getValue().forEach(c -> c.accept(id, biomeHolder)); + } + }); + } + } + } + + /** + * Will apply biome modifications to world, internal usage only. + * + * @param level + */ + @Deprecated(forRemoval = true) + public static void applyModificationsDeprecated(ServerLevel level) { + //TODO: Now Disabled, because we fix the settings when everything gets loaded + if (level != null) return; + + NoiseGeneratorSettings noiseGeneratorSettings = null; + final ChunkGenerator chunkGenerator = level.getChunkSource().getGenerator(); + final BiomeSource source = chunkGenerator.getBiomeSource(); + final Set> biomes = source.possibleBiomes(); + + if (chunkGenerator instanceof NoiseGeneratorSettingsProvider gen) + noiseGeneratorSettings = gen.bclib_getNoiseGeneratorSettings(); + + // Datapacks (like Amplified Nether)will change the GeneratorSettings upon load, so we will + // only use the default Setting for Nether/End if we were unable to find a settings object + if (noiseGeneratorSettings == null) { + if (level.dimension() == Level.NETHER) { + noiseGeneratorSettings = BuiltinRegistries.NOISE_GENERATOR_SETTINGS.get(NoiseGeneratorSettings.NETHER); + } else if (level.dimension() == Level.END) { + noiseGeneratorSettings = BuiltinRegistries.NOISE_GENERATOR_SETTINGS.get(NoiseGeneratorSettings.END); + } + } + + List>> modifications = MODIFICATIONS.get(level + .dimensionTypeRegistration() + .unwrapKey() + .orElseThrow()); + for (Holder biomeHolder : biomes) { + if (biomeHolder.isBound()) { + applyModificationsAndUpdateFeatures(modifications, biomeHolder); + } + } + + + if (noiseGeneratorSettings != null) { + final SurfaceRuleProvider provider = SurfaceRuleProvider.class.cast(noiseGeneratorSettings); + // Multiple Biomes can use the same generator. So we need to keep track of all Biomes that are + // Provided by all the BiomeSources that use the same generator. + // This happens for example when using the MiningDimensions, which reuses the generator for the + // Nethering Dimension + //MODIFIED_SURFACE_PROVIDERS.add(provider); + provider.bclib_addBiomeSource(source); + } else { + BCLib.LOGGER.warning("No generator for " + source); + } + + ((BiomeSourceAccessor) source).bclRebuildFeatures(); + } + + public static void applyModifications(BiomeSource source, ResourceKey dimension) { + BCLib.LOGGER.info("Apply Modifications for " + dimension.location() + " BiomeSource " + source); + /*if (dimension.location().equals(LevelStem.NETHER)){ + if (source instanceof BCLBiomeSource s) { + NetherBiomes.useLegacyGeneration = s.biomeSourceVersion==BCLBiomeSource.BIOME_SOURCE_VERSION_SQUARE; + } + }*/ + final Set> biomes = source.possibleBiomes(); + List>> modifications = MODIFICATIONS.get(dimension); + for (Holder biomeHolder : biomes) { + if (biomeHolder.isBound()) { + applyModificationsAndUpdateFeatures(modifications, biomeHolder); + } + } + } + + private static void applyModificationsAndUpdateFeatures(List>> modifications, + Holder biome) { + ResourceLocation biomeID = BiomeAPI.getBiomeID(biome); + if (modifications != null) { + modifications.forEach(consumer -> { + consumer.accept(biomeID, biome); + }); + } + + BiomeAPI.sortBiomeFeatures(biome); + } +} diff --git a/src/main/java/org/betterx/bclib/api/biomes/VanillaBiomeSettings.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java similarity index 87% rename from src/main/java/org/betterx/bclib/api/biomes/VanillaBiomeSettings.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java index 72e683ad..33db568e 100644 --- a/src/main/java/org/betterx/bclib/api/biomes/VanillaBiomeSettings.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/VanillaBiomeSettings.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.biomes; +package org.betterx.bclib.api.v2.levelgen.biomes; public class VanillaBiomeSettings extends BCLBiomeSettings { diff --git a/src/main/java/org/betterx/bclib/api/features/BCLCommonFeatures.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/features/BCLCommonFeatures.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java index 6eb2b817..4df70305 100644 --- a/src/main/java/org/betterx/bclib/api/features/BCLCommonFeatures.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLCommonFeatures.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features; +package org.betterx.bclib.api.v2.levelgen.features; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/org/betterx/bclib/api/features/BCLFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/features/BCLFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java index 1cc14473..91665b10 100644 --- a/src/main/java/org/betterx/bclib/api/features/BCLFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features; +package org.betterx.bclib.api.v2.levelgen.features; import net.minecraft.core.Holder; import net.minecraft.core.Registry; @@ -17,7 +17,7 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.minecraft.world.level.levelgen.placement.PlacementModifier; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.features.config.*; +import org.betterx.bclib.api.v2.levelgen.features.config.*; import java.util.Map.Entry; import java.util.Optional; diff --git a/src/main/java/org/betterx/bclib/api/features/BCLFeatureBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/features/BCLFeatureBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java index 8f91daee..d69b378a 100644 --- a/src/main/java/org/betterx/bclib/api/features/BCLFeatureBuilder.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeatureBuilder.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features; +package org.betterx.bclib.api.v2.levelgen.features; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; @@ -18,7 +18,8 @@ import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvi import net.minecraft.world.level.levelgen.placement.*; import net.minecraft.world.level.material.Material; -import org.betterx.bclib.api.features.placement.*; +import org.betterx.bclib.api.v2.levelgen.features.placement.*; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import java.util.ArrayList; import java.util.List; @@ -324,7 +325,7 @@ public class BCLFeatureBuilder extends Feature { public PlaceBlockFeature(Codec codec) { diff --git a/src/main/java/org/betterx/bclib/api/features/ScatterFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/ScatterFeature.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/features/ScatterFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/ScatterFeature.java index 4358db3d..b6567249 100644 --- a/src/main/java/org/betterx/bclib/api/features/ScatterFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/ScatterFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features; +package org.betterx.bclib.api.v2.levelgen.features; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -21,8 +21,8 @@ import net.minecraft.world.level.levelgen.feature.configurations.SimpleRandomFea import net.minecraft.world.level.levelgen.placement.*; import com.mojang.serialization.Codec; -import org.betterx.bclib.api.features.config.ScatterFeatureConfig; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.levelgen.features.config.ScatterFeatureConfig; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import java.util.ArrayList; diff --git a/src/main/java/org/betterx/bclib/api/features/SequenceFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/SequenceFeature.java similarity index 78% rename from src/main/java/org/betterx/bclib/api/features/SequenceFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/SequenceFeature.java index c1759f88..bbce00a6 100644 --- a/src/main/java/org/betterx/bclib/api/features/SequenceFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/SequenceFeature.java @@ -1,9 +1,9 @@ -package org.betterx.bclib.api.features; +package org.betterx.bclib.api.v2.levelgen.features; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; -import org.betterx.bclib.api.features.config.SequenceFeatureConfig; +import org.betterx.bclib.api.v2.levelgen.features.config.SequenceFeatureConfig; public class SequenceFeature extends Feature { public SequenceFeature() { diff --git a/src/main/java/org/betterx/bclib/api/features/SurfaceFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/SurfaceFeature.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/features/SurfaceFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/SurfaceFeature.java index 7c674393..469a123c 100644 --- a/src/main/java/org/betterx/bclib/api/features/SurfaceFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/SurfaceFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features; +package org.betterx.bclib.api.v2.levelgen.features; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/org/betterx/bclib/api/features/TemplateFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/TemplateFeature.java similarity index 92% rename from src/main/java/org/betterx/bclib/api/features/TemplateFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/TemplateFeature.java index f3ae8e1a..ea43fff5 100644 --- a/src/main/java/org/betterx/bclib/api/features/TemplateFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/TemplateFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features; +package org.betterx.bclib.api.v2.levelgen.features; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; @@ -7,9 +7,9 @@ import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import com.mojang.serialization.Codec; -import org.betterx.bclib.api.features.config.TemplateFeatureConfig; -import org.betterx.bclib.world.structures.StructureNBT; -import org.betterx.bclib.world.structures.StructureWorldNBT; +import org.betterx.bclib.api.v2.levelgen.features.config.TemplateFeatureConfig; +import org.betterx.bclib.api.v2.levelgen.structures.StructureNBT; +import org.betterx.bclib.api.v2.levelgen.structures.StructureWorldNBT; public class TemplateFeature extends Feature { diff --git a/src/main/java/org/betterx/bclib/api/features/WeightedRandomSelectorFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/WeightedRandomSelectorFeature.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/features/WeightedRandomSelectorFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/WeightedRandomSelectorFeature.java index 521c4218..3b8fd55b 100644 --- a/src/main/java/org/betterx/bclib/api/features/WeightedRandomSelectorFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/WeightedRandomSelectorFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features; +package org.betterx.bclib.api.v2.levelgen.features; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/features/blockpredicates/IsFullShape.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/IsFullShape.java similarity index 95% rename from src/main/java/org/betterx/bclib/api/features/blockpredicates/IsFullShape.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/IsFullShape.java index f78ccf4a..f77d4db7 100644 --- a/src/main/java/org/betterx/bclib/api/features/blockpredicates/IsFullShape.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/IsFullShape.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.blockpredicates; +package org.betterx.bclib.api.v2.levelgen.features.blockpredicates; import net.minecraft.core.BlockPos; import net.minecraft.core.Vec3i; diff --git a/src/main/java/org/betterx/bclib/api/features/blockpredicates/Types.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java similarity index 91% rename from src/main/java/org/betterx/bclib/api/features/blockpredicates/Types.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java index 6ea9e088..71cc83ae 100644 --- a/src/main/java/org/betterx/bclib/api/features/blockpredicates/Types.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/blockpredicates/Types.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.blockpredicates; +package org.betterx.bclib.api.v2.levelgen.features.blockpredicates; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/bclib/api/features/config/ConditionFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java similarity index 95% rename from src/main/java/org/betterx/bclib/api/features/config/ConditionFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java index fdd37b42..60857246 100644 --- a/src/main/java/org/betterx/bclib/api/features/config/ConditionFeatureConfig.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ConditionFeatureConfig.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.config; +package org.betterx.bclib.api.v2.levelgen.features.config; import net.minecraft.core.Holder; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; @@ -8,7 +8,7 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import org.betterx.bclib.api.features.BCLFeature; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; import java.util.Optional; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/org/betterx/bclib/api/features/config/PlaceBlockFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/features/config/PlaceBlockFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java index b02af97e..3e0c7a4b 100644 --- a/src/main/java/org/betterx/bclib/api/features/config/PlaceBlockFeatureConfig.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceBlockFeatureConfig.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.config; +package org.betterx.bclib.api.v2.levelgen.features.config; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/features/config/PlaceFacingBlockConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/features/config/PlaceFacingBlockConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java index 9db8c9c9..36d7a56a 100644 --- a/src/main/java/org/betterx/bclib/api/features/config/PlaceFacingBlockConfig.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/PlaceFacingBlockConfig.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.config; +package org.betterx.bclib.api.v2.levelgen.features.config; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/org/betterx/bclib/api/features/config/ScatterFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/features/config/ScatterFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java index 060ebdb2..cf67de26 100644 --- a/src/main/java/org/betterx/bclib/api/features/config/ScatterFeatureConfig.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/ScatterFeatureConfig.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.config; +package org.betterx.bclib.api.v2.levelgen.features.config; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/features/config/SequenceFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java similarity index 92% rename from src/main/java/org/betterx/bclib/api/features/config/SequenceFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java index be504d19..9e583b40 100644 --- a/src/main/java/org/betterx/bclib/api/features/config/SequenceFeatureConfig.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/SequenceFeatureConfig.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.config; +package org.betterx.bclib.api.v2.levelgen.features.config; import net.minecraft.core.Holder; import net.minecraft.util.ExtraCodecs; @@ -8,7 +8,7 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import org.betterx.bclib.api.features.BCLFeature; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; import java.util.List; diff --git a/src/main/java/org/betterx/bclib/api/features/config/TemplateFeatureConfig.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java similarity index 87% rename from src/main/java/org/betterx/bclib/api/features/config/TemplateFeatureConfig.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java index dd20af13..c57cb3dd 100644 --- a/src/main/java/org/betterx/bclib/api/features/config/TemplateFeatureConfig.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/config/TemplateFeatureConfig.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.config; +package org.betterx.bclib.api.v2.levelgen.features.config; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ExtraCodecs; @@ -6,8 +6,8 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfigur import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import org.betterx.bclib.world.structures.StructurePlacementType; -import org.betterx.bclib.world.structures.StructureWorldNBT; +import org.betterx.bclib.api.v2.levelgen.structures.StructurePlacementType; +import org.betterx.bclib.api.v2.levelgen.structures.StructureWorldNBT; import java.util.List; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/All.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java similarity index 94% rename from src/main/java/org/betterx/bclib/api/features/placement/All.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java index 3c00f9f1..c82f3701 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/All.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/All.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/Extend.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/features/placement/Extend.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java index 33ab2247..8b41768f 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/Extend.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Extend.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/FindSolidInDirection.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/features/placement/FindSolidInDirection.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java index 94f7ea32..b451d276 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/FindSolidInDirection.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/FindSolidInDirection.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/Is.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/features/placement/Is.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java index c54ef570..47ff39b5 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/Is.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Is.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/IsBasin.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/features/placement/IsBasin.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java index 13ad7c6b..3da14a1d 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/IsBasin.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsBasin.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/IsEmptyAboveSampledFilter.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/features/placement/IsEmptyAboveSampledFilter.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java index 46f5feb9..7a2c027f 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/IsEmptyAboveSampledFilter.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/IsEmptyAboveSampledFilter.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; @@ -25,7 +25,7 @@ public class IsEmptyAboveSampledFilter extends PlacementFilter { .group( Codec.intRange(-32, 32).fieldOf("d1").orElse(4).forGetter((p) -> p.distance1), Codec.intRange(-32, 32).fieldOf("d2").orElse(2).forGetter((p) -> p.distance1) - ) + ) .apply(instance, IsEmptyAboveSampledFilter::new)); public static PlacementFilter emptyAbove4() { diff --git a/src/main/java/org/betterx/bclib/api/features/placement/MinEmptyFilter.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/features/placement/MinEmptyFilter.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java index 36757f3d..4320a566 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/MinEmptyFilter.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/MinEmptyFilter.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/Offset.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/features/placement/Offset.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java index afe36d36..88aecc9b 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/Offset.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Offset.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/OnEveryLayer.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/features/placement/OnEveryLayer.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java index 74656fa5..f23989b3 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/OnEveryLayer.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/OnEveryLayer.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/PlacementModifiers.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/features/placement/PlacementModifiers.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java index 1470038a..e881d497 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/PlacementModifiers.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/PlacementModifiers.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/Stencil.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/features/placement/Stencil.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java index 7eaf6400..a2327ebe 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/Stencil.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/Stencil.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.util.ExtraCodecs; diff --git a/src/main/java/org/betterx/bclib/api/features/placement/UnderEveryLayer.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/features/placement/UnderEveryLayer.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java index 25b01690..960a7570 100644 --- a/src/main/java/org/betterx/bclib/api/features/placement/UnderEveryLayer.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/placement/UnderEveryLayer.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.features.placement; +package org.betterx.bclib.api.v2.levelgen.features.placement; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/structures/BCLStructure.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/structures/BCLStructure.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java index 004913bd..1d1910c5 100644 --- a/src/main/java/org/betterx/bclib/api/structures/BCLStructure.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructure.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.structures; +package org.betterx.bclib.api.v2.levelgen.structures; import net.minecraft.core.*; import net.minecraft.data.BuiltinRegistries; @@ -14,7 +14,7 @@ import net.minecraft.world.level.levelgen.structure.placement.StructurePlacement import com.google.common.collect.Lists; import com.mojang.serialization.Codec; -import org.betterx.bclib.api.biomes.BCLBiomeBuilder; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiomeBuilder; import org.betterx.bclib.mixin.common.StructuresAccessor; import java.util.List; diff --git a/src/main/java/org/betterx/bclib/api/structures/BCLStructureBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/structures/BCLStructureBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java index ffe69875..805811b6 100644 --- a/src/main/java/org/betterx/bclib/api/structures/BCLStructureBuilder.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/BCLStructureBuilder.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.structures; +package org.betterx.bclib.api.v2.levelgen.structures; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; @@ -11,7 +11,7 @@ import net.minecraft.world.level.levelgen.structure.placement.RandomSpreadType; import net.minecraft.world.level.levelgen.structure.placement.StructurePlacement; import com.mojang.serialization.Codec; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.TagAPI; import java.util.function.Function; diff --git a/src/main/java/org/betterx/bclib/world/structures/StructureNBT.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java similarity index 98% rename from src/main/java/org/betterx/bclib/world/structures/StructureNBT.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java index 923dfd75..c0fcd886 100644 --- a/src/main/java/org/betterx/bclib/world/structures/StructureNBT.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureNBT.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.structures; +package org.betterx.bclib.api.v2.levelgen.structures; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; diff --git a/src/main/java/org/betterx/bclib/world/structures/StructurePlacementType.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java similarity index 90% rename from src/main/java/org/betterx/bclib/world/structures/StructurePlacementType.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java index adb48ad7..47cc84cc 100644 --- a/src/main/java/org/betterx/bclib/world/structures/StructurePlacementType.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructurePlacementType.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.structures; +package org.betterx.bclib.api.v2.levelgen.structures; import net.minecraft.util.StringRepresentable; diff --git a/src/main/java/org/betterx/bclib/world/structures/StructureWorld.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java similarity index 99% rename from src/main/java/org/betterx/bclib/world/structures/StructureWorld.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java index 59d36126..002b37d8 100644 --- a/src/main/java/org/betterx/bclib/world/structures/StructureWorld.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorld.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.structures; +package org.betterx.bclib.api.v2.levelgen.structures; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/org/betterx/bclib/world/structures/StructureWorldNBT.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java similarity index 98% rename from src/main/java/org/betterx/bclib/world/structures/StructureWorldNBT.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java index 58bc2b0f..a2c9c5c1 100644 --- a/src/main/java/org/betterx/bclib/world/structures/StructureWorldNBT.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/StructureWorldNBT.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.structures; +package org.betterx.bclib.api.v2.levelgen.structures; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos.MutableBlockPos; @@ -76,8 +76,8 @@ public class StructureWorldNBT extends StructureNBT { ) { return generateIfPlaceable(level, pos, - StructureNBT.getRandomRotation(random), - StructureNBT.getRandomMirror(random) + getRandomRotation(random), + getRandomMirror(random) ); } diff --git a/src/main/java/org/betterx/bclib/world/structures/TemplatePiece.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java similarity index 98% rename from src/main/java/org/betterx/bclib/world/structures/TemplatePiece.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java index 639a2e2b..842cb34a 100644 --- a/src/main/java/org/betterx/bclib/world/structures/TemplatePiece.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplatePiece.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.structures; +package org.betterx.bclib.api.v2.levelgen.structures; import net.minecraft.core.BlockPos; import net.minecraft.core.Registry; diff --git a/src/main/java/org/betterx/bclib/world/structures/TemplateStructure.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java similarity index 98% rename from src/main/java/org/betterx/bclib/world/structures/TemplateStructure.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java index 19161a96..8c2eb161 100644 --- a/src/main/java/org/betterx/bclib/world/structures/TemplateStructure.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/TemplateStructure.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.structures; +package org.betterx.bclib.api.v2.levelgen.structures; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; @@ -17,7 +17,6 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemp import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import org.betterx.bclib.api.structures.BCLStructure; import java.util.List; import java.util.Optional; diff --git a/src/main/java/org/betterx/bclib/world/processors/DestructionStructureProcessor.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java similarity index 92% rename from src/main/java/org/betterx/bclib/world/processors/DestructionStructureProcessor.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java index 9592e8c8..7783c6bd 100644 --- a/src/main/java/org/betterx/bclib/world/processors/DestructionStructureProcessor.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/DestructionStructureProcessor.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.processors; +package org.betterx.bclib.api.v2.levelgen.structures.templatesystem; import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelReader; @@ -28,7 +28,7 @@ public class DestructionStructureProcessor extends StructureProcessor { structureBlockInfo2.state, worldView, structureBlockInfo2.pos - ) && MHelper.RANDOM.nextInt(chance) == 0) { + ) && MHelper.RANDOM.nextInt(chance) == 0) { return null; } return structureBlockInfo2; diff --git a/src/main/java/org/betterx/bclib/world/processors/TerrainStructureProcessor.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java similarity index 93% rename from src/main/java/org/betterx/bclib/world/processors/TerrainStructureProcessor.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java index b453a194..eb4f98a0 100644 --- a/src/main/java/org/betterx/bclib/world/processors/TerrainStructureProcessor.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/structures/templatesystem/TerrainStructureProcessor.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.world.processors; +package org.betterx.bclib.api.v2.levelgen.structures.templatesystem; import net.minecraft.core.BlockPos; import net.minecraft.world.level.LevelReader; @@ -9,7 +9,7 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProc import net.minecraft.world.level.levelgen.structure.templatesystem.StructureProcessorType; import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate.StructureBlockInfo; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; public class TerrainStructureProcessor extends StructureProcessor { private final Block defaultBlock; diff --git a/src/main/java/org/betterx/bclib/api/surface/SurfaceRuleBuilder.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/surface/SurfaceRuleBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java index 70b0ab02..21a95e9b 100644 --- a/src/main/java/org/betterx/bclib/api/surface/SurfaceRuleBuilder.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleBuilder.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface; +package org.betterx.bclib.api.v2.levelgen.surface; import net.minecraft.resources.ResourceKey; import net.minecraft.world.level.biome.Biome; @@ -9,10 +9,10 @@ import net.minecraft.world.level.levelgen.placement.CaveSurface; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.surface.rules.Conditions; -import org.betterx.bclib.api.surface.rules.DoubleBlockSurfaceNoiseCondition; -import org.betterx.bclib.api.surface.rules.NoiseCondition; +import org.betterx.bclib.api.v2.levelgen.surface.rules.DoubleBlockSurfaceNoiseCondition; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.surface.rules.Conditions; +import org.betterx.bclib.api.v2.levelgen.surface.rules.NoiseCondition; import java.util.Collections; import java.util.List; diff --git a/src/main/java/org/betterx/bclib/api/surface/SurfaceRuleEntry.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java similarity index 92% rename from src/main/java/org/betterx/bclib/api/surface/SurfaceRuleEntry.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java index 4df2f8e6..323beb3f 100644 --- a/src/main/java/org/betterx/bclib/api/surface/SurfaceRuleEntry.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleEntry.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface; +package org.betterx.bclib.api.v2.levelgen.surface; import net.minecraft.world.entity.Mob; import net.minecraft.world.level.levelgen.SurfaceRules; diff --git a/src/main/java/org/betterx/bclib/api/surface/SurfaceRuleUtil.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleUtil.java similarity index 93% rename from src/main/java/org/betterx/bclib/api/surface/SurfaceRuleUtil.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleUtil.java index 455bfd43..fc9920d5 100644 --- a/src/main/java/org/betterx/bclib/api/surface/SurfaceRuleUtil.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/SurfaceRuleUtil.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface; +package org.betterx.bclib.api.v2.levelgen.surface; import net.minecraft.core.Holder; import net.minecraft.resources.ResourceLocation; @@ -11,7 +11,8 @@ import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; import org.betterx.bclib.mixin.common.NoiseGeneratorSettingsMixin; import java.util.HashSet; @@ -37,7 +38,7 @@ public class SurfaceRuleUtil { * will be added to the result *

* Note: This Method is used in the {@link NoiseGeneratorSettingsMixin} which in turn - * is called from {@link BiomeAPI#applyModificationsDeprecated(ServerLevel)}. + * is called from {@link InternalBiomeAPI#applyModificationsDeprecated(ServerLevel)}. * * @param sources The Set of {@link BiomeSource} we want to consider * @return A list of {@link RuleSource}-Objects that are needed to create those Biomes diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/Conditions.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/surface/rules/Conditions.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java index 52d1a4d6..ac1c0171 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/Conditions.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/Conditions.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; import net.minecraft.core.Registry; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/DoubleBlockSurfaceNoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java similarity index 71% rename from src/main/java/org/betterx/bclib/api/surface/rules/DoubleBlockSurfaceNoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java index 7213548f..6aa0ec7c 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/DoubleBlockSurfaceNoiseCondition.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/DoubleBlockSurfaceNoiseCondition.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; public class DoubleBlockSurfaceNoiseCondition { public static final ThresholdCondition CONDITION = Conditions.DOUBLE_BLOCK_SURFACE_NOISE; diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/NetherNoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/surface/rules/NetherNoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java index 910f821d..445b431f 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/NetherNoiseCondition.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NetherNoiseCondition.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; import com.mojang.serialization.Codec; import org.betterx.bclib.interfaces.NumericProvider; diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/NoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java similarity index 81% rename from src/main/java/org/betterx/bclib/api/surface/rules/NoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java index 835ef866..9340bfb2 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/NoiseCondition.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/NoiseCondition.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; import net.minecraft.world.level.levelgen.SurfaceRules; diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/RandomIntProvider.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java similarity index 93% rename from src/main/java/org/betterx/bclib/api/surface/rules/RandomIntProvider.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java index cb77002a..4d2748dc 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/RandomIntProvider.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/RandomIntProvider.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; import com.mojang.serialization.Codec; import org.betterx.bclib.interfaces.NumericProvider; diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/SurfaceNoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java similarity index 94% rename from src/main/java/org/betterx/bclib/api/surface/rules/SurfaceNoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java index e8b0088e..fc67e881 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/SurfaceNoiseCondition.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SurfaceNoiseCondition.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; import net.minecraft.world.level.levelgen.SurfaceRules.Condition; import net.minecraft.world.level.levelgen.SurfaceRules.Context; diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/SwitchRuleSource.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/surface/rules/SwitchRuleSource.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java index c864911c..c8d1f4a8 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/SwitchRuleSource.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/SwitchRuleSource.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; import net.minecraft.core.Registry; import net.minecraft.util.KeyDispatchDataCodec; diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/ThresholdCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/surface/rules/ThresholdCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java index 9604ba1b..84abb515 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/ThresholdCondition.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/ThresholdCondition.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; import net.minecraft.util.KeyDispatchDataCodec; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/VolumeNoiseCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/surface/rules/VolumeNoiseCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java index 4adc57f8..7e3c8fc4 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/VolumeNoiseCondition.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeNoiseCondition.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; import net.minecraft.util.KeyDispatchDataCodec; import net.minecraft.world.level.levelgen.SurfaceRules.Condition; diff --git a/src/main/java/org/betterx/bclib/api/surface/rules/VolumeThresholdCondition.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/surface/rules/VolumeThresholdCondition.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java index 4e8f3da7..6dcf5e1c 100644 --- a/src/main/java/org/betterx/bclib/api/surface/rules/VolumeThresholdCondition.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/surface/rules/VolumeThresholdCondition.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.surface.rules; +package org.betterx.bclib.api.v2.levelgen.surface.rules; import net.minecraft.util.KeyDispatchDataCodec; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/spawning/SpawnRuleBuilder.java b/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java similarity index 99% rename from src/main/java/org/betterx/bclib/api/spawning/SpawnRuleBuilder.java rename to src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java index 83ef28c1..65a82c35 100644 --- a/src/main/java/org/betterx/bclib/api/spawning/SpawnRuleBuilder.java +++ b/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleBuilder.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.spawning; +package org.betterx.bclib.api.v2.spawning; import net.minecraft.core.BlockPos; import net.minecraft.world.Difficulty; diff --git a/src/main/java/org/betterx/bclib/api/spawning/SpawnRuleEntry.java b/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/spawning/SpawnRuleEntry.java rename to src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java index 5d428d20..f90a8f30 100644 --- a/src/main/java/org/betterx/bclib/api/spawning/SpawnRuleEntry.java +++ b/src/main/java/org/betterx/bclib/api/v2/spawning/SpawnRuleEntry.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.spawning; +package org.betterx.bclib.api.v2.spawning; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/tag/CommonBiomeTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java similarity index 84% rename from src/main/java/org/betterx/bclib/api/tag/CommonBiomeTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java index ad2f720e..e375eda6 100644 --- a/src/main/java/org/betterx/bclib/api/tag/CommonBiomeTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBiomeTags.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.tag; +package org.betterx.bclib.api.v2.tag; import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; diff --git a/src/main/java/org/betterx/bclib/api/tag/CommonBlockTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/tag/CommonBlockTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java index 16761aa7..1a5a2715 100644 --- a/src/main/java/org/betterx/bclib/api/tag/CommonBlockTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.tag; +package org.betterx.bclib.api.v2.tag; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/bclib/api/tag/CommonItemTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/tag/CommonItemTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java index 6dfdaf75..8bc8753d 100644 --- a/src/main/java/org/betterx/bclib/api/tag/CommonItemTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/CommonItemTags.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.tag; +package org.betterx.bclib.api.v2.tag; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; diff --git a/src/main/java/org/betterx/bclib/api/tag/NamedBlockTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/tag/NamedBlockTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java index 230c4726..a2f67619 100644 --- a/src/main/java/org/betterx/bclib/api/tag/NamedBlockTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.tag; +package org.betterx.bclib.api.v2.tag; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/bclib/api/tag/NamedItemTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/tag/NamedItemTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java index 49d08d92..5659be08 100644 --- a/src/main/java/org/betterx/bclib/api/tag/NamedItemTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/NamedItemTags.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.tag; +package org.betterx.bclib.api.v2.tag; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/bclib/api/tag/NamedMineableTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java similarity index 95% rename from src/main/java/org/betterx/bclib/api/tag/NamedMineableTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java index 1d743852..637bdfd0 100644 --- a/src/main/java/org/betterx/bclib/api/tag/NamedMineableTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/NamedMineableTags.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.tag; +package org.betterx.bclib.api.v2.tag; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; diff --git a/src/main/java/org/betterx/bclib/api/tag/NamedToolTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java similarity index 94% rename from src/main/java/org/betterx/bclib/api/tag/NamedToolTags.java rename to src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java index 6956cfb6..9c74fdaa 100644 --- a/src/main/java/org/betterx/bclib/api/tag/NamedToolTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/NamedToolTags.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.tag; +package org.betterx.bclib.api.v2.tag; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; diff --git a/src/main/java/org/betterx/bclib/api/tag/TagAPI.java b/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/tag/TagAPI.java rename to src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java index 0520879e..152df2d7 100644 --- a/src/main/java/org/betterx/bclib/api/tag/TagAPI.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/TagAPI.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.tag; +package org.betterx.bclib.api.v2.tag; import net.minecraft.core.DefaultedRegistry; import net.minecraft.core.Registry; @@ -16,7 +16,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import com.google.common.collect.Maps; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.mixin.common.DiggerItemAccessor; import java.util.List; diff --git a/src/main/java/org/betterx/bclib/api/tag/TagType.java b/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java similarity index 97% rename from src/main/java/org/betterx/bclib/api/tag/TagType.java rename to src/main/java/org/betterx/bclib/api/v2/tag/TagType.java index 7e287101..284ec713 100644 --- a/src/main/java/org/betterx/bclib/api/tag/TagType.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.tag; +package org.betterx.bclib.api.v2.tag; import net.minecraft.core.DefaultedRegistry; import net.minecraft.core.Registry; @@ -14,7 +14,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; import java.util.List; import java.util.Map; @@ -205,7 +205,7 @@ public class TagType { } public void apply(Map> tagsMap) { - if (Registry.BIOME_REGISTRY.equals(registryKey)) BiomeAPI._runBiomeTagAdders(); + if (Registry.BIOME_REGISTRY.equals(registryKey)) InternalBiomeAPI._runBiomeTagAdders(); //this.isFrozen = true; this.forEach((id, ids) -> apply(tagsMap.computeIfAbsent(id, key -> Lists.newArrayList()), ids)); diff --git a/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java index 6a12373d..25543ddd 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseDoorBlock.java @@ -21,8 +21,8 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.NamedBlockTags; -import org.betterx.bclib.api.tag.NamedItemTags; +import org.betterx.bclib.api.v2.tag.NamedBlockTags; +import org.betterx.bclib.api.v2.tag.NamedItemTags; import org.betterx.bclib.client.models.BasePatterns; import org.betterx.bclib.client.models.ModelsHelper; import org.betterx.bclib.client.models.PatternsHelper; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java index 4c333f8e..374873c0 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseLeavesBlock.java @@ -19,8 +19,8 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Lists; -import org.betterx.bclib.api.tag.NamedBlockTags; -import org.betterx.bclib.api.tag.NamedItemTags; +import org.betterx.bclib.api.v2.tag.NamedBlockTags; +import org.betterx.bclib.api.v2.tag.NamedItemTags; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.BlockModelProvider; import org.betterx.bclib.interfaces.RenderLayerProvider; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java index a5cd8ca4..dc28cc44 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseStripableLogBlock.java @@ -16,8 +16,8 @@ import net.minecraft.world.phys.BlockHitResult; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.NamedMineableTags; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.NamedMineableTags; +import org.betterx.bclib.api.v2.tag.TagAPI; public class BaseStripableLogBlock extends BaseRotatedPillarBlock { private final Block striped; diff --git a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java index a555df0e..efe60586 100644 --- a/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/BaseTerrainBlock.java @@ -34,8 +34,8 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import com.google.common.collect.Maps; -import org.betterx.bclib.api.tag.NamedMineableTags; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.NamedMineableTags; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.client.models.BasePatterns; import org.betterx.bclib.client.models.ModelsHelper; import org.betterx.bclib.client.models.PatternsHelper; diff --git a/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java b/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java index b29c7cf7..b62aa975 100644 --- a/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/SimpleLeavesBlock.java @@ -10,8 +10,8 @@ import net.minecraft.world.level.material.MaterialColor; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.NamedBlockTags; -import org.betterx.bclib.api.tag.NamedItemTags; +import org.betterx.bclib.api.v2.tag.NamedBlockTags; +import org.betterx.bclib.api.v2.tag.NamedItemTags; import org.betterx.bclib.client.render.BCLRenderLayer; import org.betterx.bclib.interfaces.RenderLayerProvider; import org.betterx.bclib.interfaces.TagProvider; diff --git a/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java b/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java index ea3bd066..0518b9f5 100644 --- a/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java +++ b/src/main/java/org/betterx/bclib/blocks/StripableBarkBlock.java @@ -15,8 +15,8 @@ import net.minecraft.world.phys.BlockHitResult; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.NamedMineableTags; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.NamedMineableTags; +import org.betterx.bclib.api.v2.tag.TagAPI; public class StripableBarkBlock extends BaseBarkBlock { private final Block striped; diff --git a/src/main/java/org/betterx/bclib/client/BCLibClient.java b/src/main/java/org/betterx/bclib/client/BCLibClient.java index ec8b18a6..cc52d70d 100644 --- a/src/main/java/org/betterx/bclib/client/BCLibClient.java +++ b/src/main/java/org/betterx/bclib/client/BCLibClient.java @@ -7,9 +7,9 @@ import net.minecraft.resources.ResourceLocation; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.model.*; -import org.betterx.bclib.api.ModIntegrationAPI; -import org.betterx.bclib.api.PostInitAPI; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.ModIntegrationAPI; +import org.betterx.bclib.api.v2.PostInitAPI; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; import org.betterx.bclib.client.models.CustomModelBakery; import org.betterx.bclib.client.presets.WorldPresetsUI; import org.betterx.bclib.registry.BaseBlockEntityRenders; diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java similarity index 95% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java index 9b10067b..e7db8125 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridCell.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCell.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridCheckboxCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java similarity index 85% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridCheckboxCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java index cc430654..9e894bc5 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridCheckboxCell.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCheckboxCell.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.minecraft.client.gui.components.Checkbox; import net.minecraft.network.chat.Component; @@ -62,12 +62,12 @@ public class GridCheckboxCell extends GridCell implements GridWidgetWithEnabledS this.alpha = alpha; this.componentPlacer = (transform) -> { Checkbox cb = new SignalingCheckBox(transform.left, transform.top, transform.width, transform.height, - text, - checked, - (state) -> { - this.checked = state; - if (onChange != null) onChange.accept(state); - } + text, + checked, + (state) -> { + this.checked = state; + if (onChange != null) onChange.accept(state); + } ); cb.setAlpha(alpha); lastCheckbox = cb; diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridColumn.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java similarity index 64% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridColumn.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java index 185685e8..82557d9e 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridColumn.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridColumn.java @@ -1,11 +1,8 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.gui.gridlayout.GridLayout.GridValueType; -import org.betterx.bclib.gui.gridlayout.GridLayout.VerticalAlignment; - import java.util.List; @Environment(EnvType.CLIENT) @@ -19,15 +16,15 @@ public class GridColumn extends GridContainer { } public GridRow addRow() { - return addRow(VerticalAlignment.TOP); + return addRow(GridLayout.VerticalAlignment.TOP); } - public GridRow addRow(VerticalAlignment align) { + public GridRow addRow(GridLayout.VerticalAlignment align) { GridRow row = new GridRow(1.0, - widthType == GridValueType.INHERIT - ? GridValueType.INHERIT - : GridLayout.GridValueType.PERCENTAGE, - align); + widthType == GridLayout.GridValueType.INHERIT + ? GridLayout.GridValueType.INHERIT + : GridLayout.GridValueType.PERCENTAGE, + align); this.cells.add(row); return row; } @@ -38,15 +35,15 @@ public class GridColumn extends GridContainer { } public void addSpacerRow(int height) { - GridCell cell = new GridCell(1.0, height, GridValueType.PERCENTAGE, null, null); + GridCell cell = new GridCell(1.0, height, GridLayout.GridValueType.PERCENTAGE, null, null); this.cells.add(cell); } @Override public int calculateWidth(final int parentWidth) { - if (widthType == GridValueType.INHERIT) { + if (widthType == GridLayout.GridValueType.INHERIT) { return cells.stream() - .filter(row -> row.widthType == GridValueType.INHERIT) + .filter(row -> row.widthType == GridLayout.GridValueType.INHERIT) .map(row -> row.buildElement(0, 0, 1, 0, 0, null).width) .reduce(0, (p, c) -> Math.max(p, c)); @@ -61,7 +58,7 @@ public class GridColumn extends GridContainer { int height = 0; int top = inTop; - if (widthType == GridValueType.INHERIT) { + if (widthType == GridLayout.GridValueType.INHERIT) { width = calculateWidth(width); } diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridCustomRenderCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java similarity index 80% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridCustomRenderCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java index 8091d42c..e66a05e8 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridCustomRenderCell.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridCustomRenderCell.java @@ -1,10 +1,10 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import com.mojang.blaze3d.vertex.PoseStack; -import org.betterx.bclib.gui.gridlayout.GridLayout.GridValueType; +import org.betterx.bclib.client.gui.gridlayout.GridLayout.GridValueType; @Environment(EnvType.CLIENT) diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridImageCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java similarity index 64% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridImageCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java index 9db7fd0e..d4b51831 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridImageCell.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridImageCell.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.renderer.GameRenderer; @@ -9,13 +9,12 @@ import net.fabricmc.api.Environment; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import org.betterx.bclib.gui.gridlayout.GridLayout.GridValueType; @Environment(EnvType.CLIENT) public class GridImageCell extends GridCell { GridImageCell(ResourceLocation location, double width, - GridValueType widthType, + GridLayout.GridValueType widthType, double height, float alpha, int uvLeft, @@ -29,19 +28,19 @@ public class GridImageCell extends GridCell { RenderSystem.setShaderTexture(0, location); RenderSystem.enableBlend(); RenderSystem.blendFunc(GlStateManager.SourceFactor.SRC_ALPHA, - GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); + GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, alpha); GuiComponent.blit(poseStack, - transform.left, - transform.top, - transform.width, - transform.height, - uvLeft, - uvTop, - uvWidth, - uvHeight, - resourceWidth, - resourceHeight); + transform.left, + transform.top, + transform.width, + transform.height, + uvLeft, + uvTop, + uvWidth, + uvHeight, + resourceWidth, + resourceHeight); }); } } diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridLayout.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java similarity index 95% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridLayout.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java index b645eede..c5e4d133 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridLayout.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridLayout.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.minecraft.client.gui.components.AbstractWidget; @@ -6,7 +6,7 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import com.mojang.blaze3d.vertex.PoseStack; -import org.betterx.bclib.gui.gridlayout.GridLayout.GridValueType; +import org.betterx.bclib.client.gui.gridlayout.GridLayout.GridValueType; import org.betterx.bclib.interfaces.TriConsumer; import org.betterx.bclib.util.Pair; @@ -182,8 +182,8 @@ public class GridLayout extends GridColumn { .stream() .filter(element -> element.customRender != null) .forEach(element -> element.customRender.accept(poseStack, - element.transformWithPadding(sidePadding, topPadding), - element.renderContext)); + element.transformWithPadding(sidePadding, topPadding), + element.renderContext)); } diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridMessageCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java similarity index 89% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridMessageCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java index 2c31f73a..a665431d 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridMessageCell.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridMessageCell.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.MultiLineLabel; @@ -38,10 +38,10 @@ public class GridMessageCell extends GridCell { //MultiLineLabel label = (MultiLineLabel) context; if (contentAlignment == GridLayout.Alignment.CENTER) { lastLabel.renderCentered(poseStack, - transform.width / 2 + transform.left, - transform.top, - font.lineHeight, - color); + transform.width / 2 + transform.left, + transform.top, + font.lineHeight, + color); } else if (contentAlignment == GridLayout.Alignment.LEFT) { lastLabel.renderLeftAligned(poseStack, transform.left, transform.top, font.lineHeight, color); } diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridRow.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java similarity index 99% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridRow.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java index bf315885..c9fbe15e 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridRow.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridRow.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.Button; diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridScreen.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java similarity index 97% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridScreen.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java index 6daf4bce..980136fa 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridScreen.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.components.Widget; @@ -14,7 +14,6 @@ import net.fabricmc.api.Environment; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; -import org.betterx.bclib.gui.gridlayout.GridLayout.Alignment; import org.jetbrains.annotations.Nullable; @@ -83,7 +82,7 @@ public abstract class GridScreen extends Screen { } protected void addTitle() { - grid.addRow().addString(this.title, Alignment.CENTER, this); + grid.addRow().addString(this.title, GridLayout.Alignment.CENTER, this); grid.addSpacerRow(15); } diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridStringCell.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java similarity index 58% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridStringCell.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java index 5ef4a9dc..b86e7500 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridStringCell.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridStringCell.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.minecraft.client.gui.GuiComponent; import net.minecraft.network.chat.Component; @@ -6,17 +6,14 @@ import net.minecraft.network.chat.Component; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.gui.gridlayout.GridLayout.Alignment; -import org.betterx.bclib.gui.gridlayout.GridLayout.GridValueType; - @Environment(EnvType.CLIENT) public class GridStringCell extends GridCell { private Component text; GridStringCell(double width, - GridValueType widthType, + GridLayout.GridValueType widthType, int height, - Alignment contentAlignment, + GridLayout.Alignment contentAlignment, GridScreen parent, Component text) { this(width, widthType, height, contentAlignment, parent, text, GridLayout.COLOR_WHITE); @@ -24,23 +21,23 @@ public class GridStringCell extends GridCell { } GridStringCell(double width, - GridValueType widthType, + GridLayout.GridValueType widthType, int height, - Alignment contentAlignment, + GridLayout.Alignment contentAlignment, GridScreen parent, Component text, int color) { super(width, height, widthType, null, null); this.text = text; this.customRender = (poseStack, transform, context) -> { - if (contentAlignment == Alignment.CENTER) { + if (contentAlignment == GridLayout.Alignment.CENTER) { GuiComponent.drawCenteredString(poseStack, - parent.getFont(), - this.text, - transform.width / 2 + transform.left, - transform.top, - color); - } else if (contentAlignment == Alignment.LEFT) { + parent.getFont(), + this.text, + transform.width / 2 + transform.left, + transform.top, + color); + } else if (contentAlignment == GridLayout.Alignment.LEFT) { GuiComponent.drawString(poseStack, parent.getFont(), this.text, transform.left, transform.top, color); } }; diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridTransform.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java similarity index 92% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridTransform.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java index efd8dd28..0d04206b 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridTransform.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridTransform.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/org/betterx/bclib/gui/gridlayout/GridWidgetWithEnabledState.java b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java similarity index 69% rename from src/main/java/org/betterx/bclib/gui/gridlayout/GridWidgetWithEnabledState.java rename to src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java index f5ac3741..25962995 100644 --- a/src/main/java/org/betterx/bclib/gui/gridlayout/GridWidgetWithEnabledState.java +++ b/src/main/java/org/betterx/bclib/client/gui/gridlayout/GridWidgetWithEnabledState.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.gridlayout; +package org.betterx.bclib.client.gui.gridlayout; public interface GridWidgetWithEnabledState { boolean isEnabled(); diff --git a/src/main/java/org/betterx/bclib/gui/modmenu/EntryPoint.java b/src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java similarity index 86% rename from src/main/java/org/betterx/bclib/gui/modmenu/EntryPoint.java rename to src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java index 9ae352af..485ec9c5 100644 --- a/src/main/java/org/betterx/bclib/gui/modmenu/EntryPoint.java +++ b/src/main/java/org/betterx/bclib/client/gui/modmenu/EntryPoint.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.modmenu; +package org.betterx.bclib.client.gui.modmenu; import org.betterx.bclib.integration.modmenu.ModMenuIntegration; diff --git a/src/main/java/org/betterx/bclib/gui/modmenu/MainScreen.java b/src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java similarity index 88% rename from src/main/java/org/betterx/bclib/gui/modmenu/MainScreen.java rename to src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java index 9fa75b46..560d7ea0 100644 --- a/src/main/java/org/betterx/bclib/gui/modmenu/MainScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/modmenu/MainScreen.java @@ -1,15 +1,15 @@ -package org.betterx.bclib.gui.modmenu; +package org.betterx.bclib.client.gui.modmenu; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; +import org.betterx.bclib.client.gui.gridlayout.*; import org.betterx.bclib.config.ConfigKeeper; import org.betterx.bclib.config.Configs; import org.betterx.bclib.config.NamedPathConfig; import org.betterx.bclib.config.NamedPathConfig.ConfigTokenDescription; import org.betterx.bclib.config.NamedPathConfig.DependendConfigToken; -import org.betterx.bclib.gui.gridlayout.*; import java.util.HashMap; import java.util.Map; @@ -51,12 +51,12 @@ public class MainScreen extends GridScreen { row.addSpacer(option.leftPadding); } GridCheckboxCell cb = row.addCheckbox(getComponent(config, option, "title"), - config.getRaw(option.token), - font, - (state) -> { - config.set(option.token, state); - updateEnabledState(); - }); + config.getRaw(option.token), + font, + (state) -> { + config.set(option.token, state); + updateEnabledState(); + }); if (option.token instanceof DependendConfigToken) { dependentWidgets.put(cb, () -> option.token.dependenciesTrue(config)); diff --git a/src/main/java/org/betterx/bclib/gui/screens/AtomicProgressListener.java b/src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java similarity index 82% rename from src/main/java/org/betterx/bclib/gui/screens/AtomicProgressListener.java rename to src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java index e0203fa1..91754da1 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/AtomicProgressListener.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/AtomicProgressListener.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.network.chat.Component; diff --git a/src/main/java/org/betterx/bclib/gui/screens/BCLibScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java similarity index 89% rename from src/main/java/org/betterx/bclib/gui/screens/BCLibScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java index b9798025..4439a011 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/BCLibScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/BCLibScreen.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; @@ -8,9 +8,9 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.betterx.bclib.BCLib; -import org.betterx.bclib.gui.gridlayout.GridLayout; -import org.betterx.bclib.gui.gridlayout.GridRow; -import org.betterx.bclib.gui.gridlayout.GridScreen; +import org.betterx.bclib.client.gui.gridlayout.GridLayout; +import org.betterx.bclib.client.gui.gridlayout.GridRow; +import org.betterx.bclib.client.gui.gridlayout.GridScreen; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/org/betterx/bclib/gui/screens/ConfirmFixScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java similarity index 77% rename from src/main/java/org/betterx/bclib/gui/screens/ConfirmFixScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java index c3dc4c53..d016f98e 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/ConfirmFixScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmFixScreen.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.client.gui.screens.Screen; @@ -8,9 +8,9 @@ import net.minecraft.network.chat.Component; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.gui.gridlayout.GridCheckboxCell; -import org.betterx.bclib.gui.gridlayout.GridLayout; -import org.betterx.bclib.gui.gridlayout.GridRow; +import org.betterx.bclib.client.gui.gridlayout.GridCheckboxCell; +import org.betterx.bclib.client.gui.gridlayout.GridLayout; +import org.betterx.bclib.client.gui.gridlayout.GridRow; import org.jetbrains.annotations.Nullable; @@ -35,17 +35,17 @@ public class ConfirmFixScreen extends BCLibScreen { GridRow row = grid.addRow(); GridCheckboxCell backup = row.addCheckbox(Component.translatable("bclib.datafixer.backupWarning.backup"), - true, - BUTTON_HEIGHT, - this.font); + true, + BUTTON_HEIGHT, + this.font); grid.addSpacerRow(10); row = grid.addRow(); GridCheckboxCell fix = row.addCheckbox(Component.translatable("bclib.datafixer.backupWarning.fix"), - true, - BUTTON_HEIGHT, - this.font); + true, + BUTTON_HEIGHT, + this.font); grid.addSpacerRow(20); diff --git a/src/main/java/org/betterx/bclib/gui/screens/ConfirmRestartScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java similarity index 83% rename from src/main/java/org/betterx/bclib/gui/screens/ConfirmRestartScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java index a55cfb05..96f8ddf2 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/ConfirmRestartScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/ConfirmRestartScreen.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @@ -6,8 +6,8 @@ import net.minecraft.network.chat.Component; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.gui.gridlayout.GridLayout.Alignment; -import org.betterx.bclib.gui.gridlayout.GridRow; +import org.betterx.bclib.client.gui.gridlayout.GridLayout; +import org.betterx.bclib.client.gui.gridlayout.GridRow; @Environment(EnvType.CLIENT) @@ -29,7 +29,7 @@ public class ConfirmRestartScreen extends BCLibScreen { protected void initLayout() { final int BUTTON_HEIGHT = 20; - grid.addRow().addMessage(this.description, this.font, Alignment.CENTER); + grid.addRow().addMessage(this.description, this.font, GridLayout.Alignment.CENTER); grid.addSpacerRow(); diff --git a/src/main/java/org/betterx/bclib/gui/screens/LevelFixErrorScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java similarity index 89% rename from src/main/java/org/betterx/bclib/gui/screens/LevelFixErrorScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java index 127c17e4..256f151c 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/LevelFixErrorScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/LevelFixErrorScreen.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; @@ -7,9 +7,9 @@ import net.minecraft.network.chat.Component; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.gui.gridlayout.GridColumn; -import org.betterx.bclib.gui.gridlayout.GridLayout; -import org.betterx.bclib.gui.gridlayout.GridRow; +import org.betterx.bclib.client.gui.gridlayout.GridColumn; +import org.betterx.bclib.client.gui.gridlayout.GridLayout; +import org.betterx.bclib.client.gui.gridlayout.GridRow; @Environment(EnvType.CLIENT) public class LevelFixErrorScreen extends BCLibScreen { diff --git a/src/main/java/org/betterx/bclib/gui/screens/ModListScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java similarity index 95% rename from src/main/java/org/betterx/bclib/gui/screens/ModListScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java index 5ff82d27..09197547 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/ModListScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/ModListScreen.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; @@ -8,11 +8,11 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.loader.api.metadata.ModEnvironment; -import org.betterx.bclib.api.dataexchange.handler.autosync.HelloClient; -import org.betterx.bclib.gui.gridlayout.GridColumn; -import org.betterx.bclib.gui.gridlayout.GridLayout; -import org.betterx.bclib.gui.gridlayout.GridRow; -import org.betterx.bclib.gui.gridlayout.GridScreen; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.HelloClient; +import org.betterx.bclib.client.gui.gridlayout.GridColumn; +import org.betterx.bclib.client.gui.gridlayout.GridLayout; +import org.betterx.bclib.client.gui.gridlayout.GridRow; +import org.betterx.bclib.client.gui.gridlayout.GridScreen; import org.betterx.bclib.util.ModUtil; import org.betterx.bclib.util.PathUtil; import org.betterx.bclib.util.Triple; @@ -129,8 +129,8 @@ public class ModListScreen extends BCLibScreen { } items.add(new Triple<>(modid, - nfo.canDownload() ? STATE_MISSING : STATE_MISSING_NOT_OFFERED, - stateString)); + nfo.canDownload() ? STATE_MISSING : STATE_MISSING_NOT_OFFERED, + stateString)); }); } diff --git a/src/main/java/org/betterx/bclib/gui/screens/ProgressScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java similarity index 81% rename from src/main/java/org/betterx/bclib/gui/screens/ProgressScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java index e5dd28b7..83485400 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/ProgressScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/ProgressScreen.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.screens.Screen; @@ -11,7 +11,7 @@ import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import org.betterx.bclib.BCLib; -import org.betterx.bclib.gui.gridlayout.*; +import org.betterx.bclib.client.gui.gridlayout.*; import java.util.concurrent.atomic.AtomicInteger; import org.jetbrains.annotations.Nullable; @@ -55,36 +55,36 @@ class ProgressLogoRender extends GridCustomRenderCell { final int uvTopLogo = (int) (relativeY * LOGO_SIZE); RenderSystem.setShaderTexture(0, BCLibScreen.BCLIB_LOGO_LOCATION); GuiComponent.blit(poseStack, - xOffset + transform.left, - yOffset + transform.top, - width, - yBarImage, - 0, 0, LOGO_SIZE, uvTopLogo, - LOGO_SIZE, LOGO_SIZE - ); + xOffset + transform.left, + yOffset + transform.top, + width, + yBarImage, + 0, 0, LOGO_SIZE, uvTopLogo, + LOGO_SIZE, LOGO_SIZE + ); } if (yBarImage < height) { final int uvTopPixelated = (int) (relativeY * PIXELATED_SIZE); RenderSystem.setShaderTexture(0, ProgressScreen.BCLIB_LOGO_PIXELATED_LOCATION); GuiComponent.blit(poseStack, - xOffset + transform.left, - yOffset + transform.top + yBarImage, - width, - height - yBarImage, - 0, uvTopPixelated, PIXELATED_SIZE, PIXELATED_SIZE - uvTopPixelated, - PIXELATED_SIZE, PIXELATED_SIZE - ); + xOffset + transform.left, + yOffset + transform.top + yBarImage, + width, + height - yBarImage, + 0, uvTopPixelated, PIXELATED_SIZE, PIXELATED_SIZE - uvTopPixelated, + PIXELATED_SIZE, PIXELATED_SIZE + ); } if (percentage > 0 && percentage < 1.0) { GuiComponent.fill(poseStack, - transform.left, - yBar, - transform.left + transform.width, - yBar + 1, - 0x3FFFFFFF - ); + transform.left, + yBar, + transform.left + transform.width, + yBar + 1, + 0x3FFFFFFF + ); } } } @@ -92,7 +92,7 @@ class ProgressLogoRender extends GridCustomRenderCell { public class ProgressScreen extends GridScreen implements ProgressListener, AtomicProgressListener { static final ResourceLocation BCLIB_LOGO_PIXELATED_LOCATION = new ResourceLocation(BCLib.MOD_ID, - "iconpixelated.png"); + "iconpixelated.png"); public ProgressScreen(@Nullable Screen parent, Component title, Component description) { super(parent, title, 20, true); @@ -156,8 +156,8 @@ public class ProgressScreen extends GridScreen implements ProgressListener, Atom grid.addSpacerRow(20); row = grid.addRow(); stage = row.addMessage(stageComponent != null ? stageComponent : Component.literal(""), - font, - GridLayout.Alignment.CENTER); + font, + GridLayout.Alignment.CENTER); } @Override diff --git a/src/main/java/org/betterx/bclib/gui/screens/SyncFilesScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java similarity index 81% rename from src/main/java/org/betterx/bclib/gui/screens/SyncFilesScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java index f0373bba..dccdaef7 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/SyncFilesScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/SyncFilesScreen.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.CommonComponents; @@ -7,10 +7,10 @@ import net.minecraft.network.chat.Component; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.api.dataexchange.handler.autosync.HelloClient; -import org.betterx.bclib.gui.gridlayout.GridCheckboxCell; -import org.betterx.bclib.gui.gridlayout.GridLayout; -import org.betterx.bclib.gui.gridlayout.GridRow; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.HelloClient; +import org.betterx.bclib.client.gui.gridlayout.GridCheckboxCell; +import org.betterx.bclib.client.gui.gridlayout.GridLayout; +import org.betterx.bclib.client.gui.gridlayout.GridRow; import org.betterx.bclib.util.ModUtil; @Environment(EnvType.CLIENT) @@ -56,9 +56,9 @@ public class SyncFilesScreen extends BCLibScreen { final GridCheckboxCell mods; row = grid.addRow(); mods = row.addCheckbox(Component.translatable("message.bclib.syncfiles.mods"), - hasMods, - BUTTON_HEIGHT, - this.font); + hasMods, + BUTTON_HEIGHT, + this.font); mods.setEnabled(hasMods); row.addSpacer(); @@ -79,9 +79,9 @@ public class SyncFilesScreen extends BCLibScreen { final GridCheckboxCell configs; row = grid.addRow(); configs = row.addCheckbox(Component.translatable("message.bclib.syncfiles.configs"), - hasConfigFiles, - BUTTON_HEIGHT, - this.font); + hasConfigFiles, + BUTTON_HEIGHT, + this.font); configs.setEnabled(hasConfigFiles); grid.addSpacerRow(); @@ -90,17 +90,17 @@ public class SyncFilesScreen extends BCLibScreen { final GridCheckboxCell folder; folder = row.addCheckbox(Component.translatable("message.bclib.syncfiles.folders"), - hasFiles, - BUTTON_HEIGHT, - this.font); + hasFiles, + BUTTON_HEIGHT, + this.font); folder.setEnabled(hasFiles); row.addSpacer(); GridCheckboxCell delete; delete = row.addCheckbox(Component.translatable("message.bclib.syncfiles.delete"), - shouldDelete, - BUTTON_HEIGHT, - this.font); + shouldDelete, + BUTTON_HEIGHT, + this.font); delete.setEnabled(shouldDelete); @@ -117,7 +117,7 @@ public class SyncFilesScreen extends BCLibScreen { configs.isChecked(), folder.isChecked(), delete.isChecked() - ); + ); }); row.addFiller(); } diff --git a/src/main/java/org/betterx/bclib/gui/screens/WarnBCLibVersionMismatch.java b/src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java similarity index 89% rename from src/main/java/org/betterx/bclib/gui/screens/WarnBCLibVersionMismatch.java rename to src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java index 7ec3e49a..2670b312 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/WarnBCLibVersionMismatch.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/WarnBCLibVersionMismatch.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @@ -6,8 +6,8 @@ import net.minecraft.network.chat.Component; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.gui.gridlayout.GridLayout; -import org.betterx.bclib.gui.gridlayout.GridRow; +import org.betterx.bclib.client.gui.gridlayout.GridLayout; +import org.betterx.bclib.client.gui.gridlayout.GridRow; @Environment(EnvType.CLIENT) public class WarnBCLibVersionMismatch extends BCLibScreen { diff --git a/src/main/java/org/betterx/bclib/gui/screens/WorldSetupScreen.java b/src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java similarity index 92% rename from src/main/java/org/betterx/bclib/gui/screens/WorldSetupScreen.java rename to src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java index d91ac096..bebf69bb 100644 --- a/src/main/java/org/betterx/bclib/gui/screens/WorldSetupScreen.java +++ b/src/main/java/org/betterx/bclib/client/gui/screens/WorldSetupScreen.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.gui.screens; +package org.betterx.bclib.client.gui.screens; import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen; import net.minecraft.client.gui.screens.worldselection.WorldCreationContext; @@ -13,10 +13,10 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import org.betterx.bclib.BCLib; -import org.betterx.bclib.gui.gridlayout.GridCheckboxCell; -import org.betterx.bclib.gui.gridlayout.GridLayout; -import org.betterx.bclib.api.worldgen.WorldGenUtil; -import org.betterx.bclib.world.generator.BCLBiomeSource; +import org.betterx.bclib.api.v2.generator.BCLBiomeSource; +import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; +import org.betterx.bclib.client.gui.gridlayout.GridCheckboxCell; +import org.betterx.bclib.client.gui.gridlayout.GridLayout; import org.jetbrains.annotations.Nullable; @@ -39,14 +39,14 @@ public class WorldSetupScreen extends BCLibScreen { @Override protected void initLayout() { - final int netherVersion = WorldGenUtil.getBiomeVersionForGenerator(context + final int netherVersion = LevelGenUtil.getBiomeVersionForGenerator(context .worldGenSettings() .dimensions() .getOrCreateHolderOrThrow( LevelStem.NETHER) .value() .generator()); - final int endVersion = WorldGenUtil.getBiomeVersionForGenerator(context + final int endVersion = LevelGenUtil.getBiomeVersionForGenerator(context .worldGenSettings() .dimensions() .getOrCreateHolderOrThrow( @@ -149,7 +149,7 @@ public class WorldSetupScreen extends BCLibScreen { int biomeSourceVersion ) { createWorldScreen.worldGenSettingsComponent.updateSettings( - (registryAccess, worldGenSettings) -> WorldGenUtil.replaceGenerator( + (registryAccess, worldGenSettings) -> LevelGenUtil.replaceGenerator( dimensionKey, dimensionTypeKey, biomeSourceVersion, diff --git a/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java b/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java index 198fb205..a2edf3e1 100644 --- a/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java +++ b/src/main/java/org/betterx/bclib/client/models/CustomModelBakery.java @@ -16,7 +16,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.mojang.datafixers.util.Pair; -import org.betterx.bclib.api.ModIntegrationAPI; +import org.betterx.bclib.api.v2.ModIntegrationAPI; import org.betterx.bclib.client.render.EmissiveTextureInfo; import org.betterx.bclib.interfaces.BlockModelProvider; import org.betterx.bclib.interfaces.ItemModelProvider; diff --git a/src/main/java/org/betterx/bclib/client/presets/WorldPresetsUI.java b/src/main/java/org/betterx/bclib/client/presets/WorldPresetsUI.java index 3ac0d316..14d13bb0 100644 --- a/src/main/java/org/betterx/bclib/client/presets/WorldPresetsUI.java +++ b/src/main/java/org/betterx/bclib/client/presets/WorldPresetsUI.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.levelgen.presets.WorldPreset; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import org.betterx.bclib.gui.screens.WorldSetupScreen; +import org.betterx.bclib.client.gui.screens.WorldSetupScreen; import org.betterx.bclib.presets.worldgen.BCLWorldPresets; import java.util.Optional; diff --git a/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java b/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java index d76dc7ae..315bf1f3 100644 --- a/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java +++ b/src/main/java/org/betterx/bclib/client/render/CustomFogRenderer.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.material.FogType; import com.mojang.blaze3d.systems.RenderSystem; -import org.betterx.bclib.api.biomes.BCLBiome; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BCLBiome; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.config.Configs; import org.betterx.bclib.util.BackgroundInfo; import org.betterx.bclib.util.MHelper; diff --git a/src/main/java/org/betterx/bclib/commands/CommandRegistry.java b/src/main/java/org/betterx/bclib/commands/CommandRegistry.java index e49f096b..4af00b97 100644 --- a/src/main/java/org/betterx/bclib/commands/CommandRegistry.java +++ b/src/main/java/org/betterx/bclib/commands/CommandRegistry.java @@ -21,7 +21,7 @@ import com.mojang.brigadier.Command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.BlocksHelper; import java.util.HashMap; diff --git a/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java b/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java index e0b15a79..fc328ed3 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/ComplexMaterial.java @@ -11,7 +11,7 @@ import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.complexmaterials.entry.BlockEntry; import org.betterx.bclib.complexmaterials.entry.ItemEntry; import org.betterx.bclib.complexmaterials.entry.RecipeEntry; diff --git a/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java b/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java index c1003f94..c9cef4f0 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/WoodenComplexMaterial.java @@ -13,7 +13,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.tag.*; +import org.betterx.bclib.api.v2.tag.*; import org.betterx.bclib.blocks.*; import org.betterx.bclib.complexmaterials.entry.BlockEntry; import org.betterx.bclib.complexmaterials.entry.RecipeEntry; diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java index 02bbd8e9..3a005d0c 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/entry/BlockEntry.java @@ -7,7 +7,7 @@ import net.minecraft.world.level.block.Block; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.complexmaterials.ComplexMaterial; import org.betterx.bclib.registry.BlockRegistry; diff --git a/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java b/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java index 37f34d50..70129bb5 100644 --- a/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java +++ b/src/main/java/org/betterx/bclib/complexmaterials/entry/ItemEntry.java @@ -6,7 +6,7 @@ import net.minecraft.world.item.Item; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.complexmaterials.ComplexMaterial; import org.betterx.bclib.registry.ItemRegistry; diff --git a/src/main/java/org/betterx/bclib/config/ClientConfig.java b/src/main/java/org/betterx/bclib/config/ClientConfig.java index 5e16a52a..0f8ac866 100644 --- a/src/main/java/org/betterx/bclib/config/ClientConfig.java +++ b/src/main/java/org/betterx/bclib/config/ClientConfig.java @@ -1,7 +1,7 @@ package org.betterx.bclib.config; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.handler.autosync.AutoSync; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.AutoSync; public class ClientConfig extends NamedPathConfig { public static final ConfigToken SUPPRESS_EXPERIMENTAL_DIALOG = ConfigToken.Boolean(false, diff --git a/src/main/java/org/betterx/bclib/config/Config.java b/src/main/java/org/betterx/bclib/config/Config.java index ebb83c5f..0467f3ec 100644 --- a/src/main/java/org/betterx/bclib/config/Config.java +++ b/src/main/java/org/betterx/bclib/config/Config.java @@ -1,10 +1,10 @@ package org.betterx.bclib.config; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; -import org.betterx.bclib.api.dataexchange.SyncFileHash; -import org.betterx.bclib.api.dataexchange.handler.autosync.AutoSyncID; -import org.betterx.bclib.api.dataexchange.handler.autosync.FileContentWrapper; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.dataexchange.SyncFileHash; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.AutoSyncID; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.FileContentWrapper; import java.io.File; import java.util.ArrayList; diff --git a/src/main/java/org/betterx/bclib/config/ConfigKeeper.java b/src/main/java/org/betterx/bclib/config/ConfigKeeper.java index 84179fba..a5b27610 100644 --- a/src/main/java/org/betterx/bclib/config/ConfigKeeper.java +++ b/src/main/java/org/betterx/bclib/config/ConfigKeeper.java @@ -7,7 +7,7 @@ import com.google.common.reflect.TypeToken; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import org.betterx.bclib.api.dataexchange.handler.autosync.FileContentWrapper; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.FileContentWrapper; import org.betterx.bclib.util.JsonFactory; import org.betterx.bclib.util.Pair; diff --git a/src/main/java/org/betterx/bclib/config/ServerConfig.java b/src/main/java/org/betterx/bclib/config/ServerConfig.java index 9c644d8e..3e0f2c8e 100644 --- a/src/main/java/org/betterx/bclib/config/ServerConfig.java +++ b/src/main/java/org/betterx/bclib/config/ServerConfig.java @@ -1,7 +1,7 @@ package org.betterx.bclib.config; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.dataexchange.handler.autosync.AutoSync; +import org.betterx.bclib.api.v2.dataexchange.handler.autosync.AutoSync; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/betterx/bclib/integration/ModIntegration.java b/src/main/java/org/betterx/bclib/integration/ModIntegration.java index de57a8d7..e59ba219 100644 --- a/src/main/java/org/betterx/bclib/integration/ModIntegration.java +++ b/src/main/java/org/betterx/bclib/integration/ModIntegration.java @@ -18,8 +18,8 @@ import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.fabricmc.loader.api.FabricLoader; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.features.BCLFeature; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeature; +import org.betterx.bclib.api.v2.tag.TagAPI; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java b/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java index e640fbd6..6f9f4b77 100644 --- a/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java +++ b/src/main/java/org/betterx/bclib/integration/modmenu/ModMenuEntryPoint.java @@ -2,7 +2,7 @@ package org.betterx.bclib.integration.modmenu; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; -import org.betterx.bclib.gui.modmenu.MainScreen; +import org.betterx.bclib.client.gui.modmenu.MainScreen; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java b/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java index d71cc483..66752937 100644 --- a/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java +++ b/src/main/java/org/betterx/bclib/interfaces/BiomeChunk.java @@ -1,6 +1,6 @@ package org.betterx.bclib.interfaces; -import org.betterx.bclib.world.generator.BiomePicker; +import org.betterx.bclib.api.v2.generator.BiomePicker; public interface BiomeChunk { void setBiome(int x, int z, BiomePicker.ActualBiome biome); diff --git a/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java b/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java index 25d0f6d4..2dd82747 100644 --- a/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java +++ b/src/main/java/org/betterx/bclib/interfaces/BiomeMap.java @@ -1,6 +1,6 @@ package org.betterx.bclib.interfaces; -import org.betterx.bclib.world.generator.BiomePicker; +import org.betterx.bclib.api.v2.generator.BiomePicker; public interface BiomeMap { void setChunkProcessor(TriConsumer processor); diff --git a/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java b/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java index 06f42303..b9b654c1 100644 --- a/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java +++ b/src/main/java/org/betterx/bclib/interfaces/PatchBiFunction.java @@ -1,7 +1,7 @@ package org.betterx.bclib.interfaces; -import org.betterx.bclib.api.datafixer.MigrationProfile; -import org.betterx.bclib.api.datafixer.PatchDidiFailException; +import org.betterx.bclib.api.v2.datafixer.MigrationProfile; +import org.betterx.bclib.api.v2.datafixer.PatchDidiFailException; @FunctionalInterface public interface PatchBiFunction { diff --git a/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java b/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java index 35a863ee..c6e292f0 100644 --- a/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java +++ b/src/main/java/org/betterx/bclib/interfaces/PatchFunction.java @@ -1,7 +1,7 @@ package org.betterx.bclib.interfaces; -import org.betterx.bclib.api.datafixer.MigrationProfile; -import org.betterx.bclib.api.datafixer.PatchDidiFailException; +import org.betterx.bclib.api.v2.datafixer.MigrationProfile; +import org.betterx.bclib.api.v2.datafixer.PatchDidiFailException; @FunctionalInterface public interface PatchFunction { diff --git a/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java b/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java index 68fbe04f..37346e2e 100644 --- a/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java +++ b/src/main/java/org/betterx/bclib/interfaces/SurfaceMaterialProvider.java @@ -2,7 +2,7 @@ package org.betterx.bclib.interfaces; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.surface.SurfaceRuleBuilder; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleBuilder; public interface SurfaceMaterialProvider { BlockState getTopMaterial(); diff --git a/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java b/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java index 384223b2..d09c968d 100644 --- a/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java +++ b/src/main/java/org/betterx/bclib/items/tool/BaseShearsItem.java @@ -8,8 +8,8 @@ import net.minecraft.world.item.ShearsItem; import net.fabricmc.fabric.api.mininglevel.v1.FabricMineableTags; -import org.betterx.bclib.api.tag.CommonItemTags; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.CommonItemTags; +import org.betterx.bclib.api.v2.tag.TagAPI; public class BaseShearsItem extends ShearsItem { public BaseShearsItem(Properties properties) { diff --git a/src/main/java/org/betterx/bclib/mixin/client/CreateWorldScreenMixin.java b/src/main/java/org/betterx/bclib/mixin/client/CreateWorldScreenMixin.java index b1c7712d..28db4d77 100644 --- a/src/main/java/org/betterx/bclib/mixin/client/CreateWorldScreenMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/client/CreateWorldScreenMixin.java @@ -12,9 +12,9 @@ import net.minecraft.world.level.levelgen.presets.WorldPreset; import net.minecraft.world.level.storage.LevelStorageSource; import com.mojang.datafixers.util.Pair; -import org.betterx.bclib.api.LifeCycleAPI; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.worldgen.WorldGenUtil; +import org.betterx.bclib.api.v2.LifeCycleAPI; +import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; +import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; import org.betterx.bclib.presets.worldgen.BCLWorldPresets; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -38,7 +38,7 @@ public class CreateWorldScreenMixin { DataPackConfig dataPackConfig, WorldGenSettingsComponent worldGenSettingsComponent, CallbackInfo ci) { - BiomeAPI.initRegistry(worldGenSettingsComponent.registryHolder()); + InternalBiomeAPI.initRegistry(worldGenSettingsComponent.registryHolder()); } //Change the WorldPreset that is selected by default on the Create World Screen @@ -52,7 +52,7 @@ public class CreateWorldScreenMixin { private static WorldLoader.WorldDataSupplier bcl_NewDefaultSettings(WorldLoader.WorldDataSupplier worldDataSupplier) { return (resourceManager, dataPackConfig) -> { Pair res = worldDataSupplier.get(resourceManager, dataPackConfig); - return WorldGenUtil.defaultWorldDataSupplier(res.getSecond()); + return LevelGenUtil.defaultWorldDataSupplier(res.getSecond()); }; } diff --git a/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java b/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java index d9b73c6b..9bf60d5d 100644 --- a/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/client/GameMixin.java @@ -2,7 +2,7 @@ package org.betterx.bclib.mixin.client; import net.minecraft.client.Game; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java b/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java index 5ca9afa2..71a8fdb2 100644 --- a/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/client/ModelBakeryMixin.java @@ -7,7 +7,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.util.profiling.ProfilerFiller; -import org.betterx.bclib.api.ModIntegrationAPI; +import org.betterx.bclib.api.v2.ModIntegrationAPI; import org.betterx.bclib.client.models.CustomModelBakery; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java b/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java index b8bea188..299e8c8a 100644 --- a/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/client/MultiPackResourceManagerMixin.java @@ -7,7 +7,7 @@ import net.minecraft.server.packs.resources.Resource; import net.minecraft.server.packs.resources.ResourceManager; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.ModIntegrationAPI; +import org.betterx.bclib.api.v2.ModIntegrationAPI; import org.betterx.bclib.client.render.EmissiveTextureInfo; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java b/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java index a6563298..93a22050 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/BoneMealItemMixin.java @@ -12,8 +12,8 @@ import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.Property; -import org.betterx.bclib.api.BonemealAPI; -import org.betterx.bclib.api.biomes.BiomeAPI; +import org.betterx.bclib.api.v2.BonemealAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.BiomeAPI; import org.betterx.bclib.util.BlocksHelper; import org.betterx.bclib.util.MHelper; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java b/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java index 08f6466f..7fc3b4d7 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/ChunkGeneratorsMixin.java @@ -6,7 +6,7 @@ import net.minecraft.world.level.chunk.ChunkGenerators; import com.mojang.serialization.Codec; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.worldgen.BCLChunkGenerator; +import org.betterx.bclib.api.v2.generator.BCLChunkGenerator; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java b/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java index 0d130627..3dd07fdf 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/CraftingMenuMixin.java @@ -6,7 +6,7 @@ import net.minecraft.world.inventory.CraftingMenu; import net.minecraft.world.level.block.CraftingTableBlock; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java index b10698bc..1e363b85 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/EnchantingTableBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.EnchantmentTableBlock; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.betterx.bclib.util.MethodReplace; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/org/betterx/bclib/mixin/common/MainMixin.java b/src/main/java/org/betterx/bclib/mixin/common/MainMixin.java index 853299dd..5c075737 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/MainMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/MainMixin.java @@ -6,7 +6,7 @@ import net.minecraft.server.Main; import net.minecraft.world.level.storage.LevelStorageSource; import com.mojang.serialization.DynamicOps; -import org.betterx.bclib.api.LifeCycleAPI; +import org.betterx.bclib.api.v2.LifeCycleAPI; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyArg; diff --git a/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java b/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java index 610b1070..9f769d78 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/MinecraftServerMixin.java @@ -5,7 +5,6 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.Services; import net.minecraft.server.WorldStem; import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.progress.ChunkProgressListener; import net.minecraft.server.level.progress.ChunkProgressListenerFactory; import net.minecraft.server.packs.repository.PackRepository; import net.minecraft.world.level.Level; @@ -13,7 +12,7 @@ import net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess; import net.minecraft.world.level.storage.WorldData; import com.mojang.datafixers.DataFixer; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; import org.betterx.bclib.recipes.BCLRecipeManager; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/betterx/bclib/mixin/common/NoiseGeneratorSettingsMixin.java b/src/main/java/org/betterx/bclib/mixin/common/NoiseGeneratorSettingsMixin.java index 8eba2e40..4d3e34a3 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/NoiseGeneratorSettingsMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/NoiseGeneratorSettingsMixin.java @@ -5,7 +5,7 @@ import net.minecraft.world.level.levelgen.NoiseGeneratorSettings; import net.minecraft.world.level.levelgen.SurfaceRules; import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource; -import org.betterx.bclib.api.surface.SurfaceRuleUtil; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleUtil; import org.betterx.bclib.interfaces.SurfaceRuleProvider; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java b/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java index bede826a..8fe1b744 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/PistonBaseBlockMixin.java @@ -6,7 +6,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.piston.PistonBaseBlock; import net.minecraft.world.level.block.state.BlockState; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java b/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java index 97731672..939846ef 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/PortalShapeMixin.java @@ -6,7 +6,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour.StatePredicate; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.portal.PortalShape; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/src/main/java/org/betterx/bclib/mixin/common/PrimaryLevelDataMixin.java b/src/main/java/org/betterx/bclib/mixin/common/PrimaryLevelDataMixin.java index e5fff02a..9aca0ded 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/PrimaryLevelDataMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/PrimaryLevelDataMixin.java @@ -11,8 +11,8 @@ import net.minecraft.world.level.storage.PrimaryLevelData; import com.mojang.datafixers.DataFixer; import com.mojang.serialization.Dynamic; import com.mojang.serialization.Lifecycle; -import org.betterx.bclib.api.LifeCycleAPI; -import org.betterx.bclib.api.worldgen.BCLChunkGenerator; +import org.betterx.bclib.api.v2.LifeCycleAPI; +import org.betterx.bclib.api.v2.generator.BCLChunkGenerator; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java b/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java index 4c401d21..9b96657a 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/ServerLevelMixin.java @@ -13,10 +13,10 @@ import net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess; import net.minecraft.world.level.storage.ServerLevelData; import net.minecraft.world.level.storage.WritableLevelData; -import org.betterx.bclib.api.LifeCycleAPI; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.world.generator.BCLBiomeSource; -import org.betterx.bclib.world.generator.BCLibNetherBiomeSource; +import org.betterx.bclib.api.v2.LifeCycleAPI; +import org.betterx.bclib.api.v2.generator.BCLBiomeSource; +import org.betterx.bclib.api.v2.generator.BCLibNetherBiomeSource; +import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -68,7 +68,7 @@ public abstract class ServerLevelMixin extends Level { list, bl2); - BiomeAPI.applyModificationsDeprecated(ServerLevel.class.cast(this)); + InternalBiomeAPI.applyModificationsDeprecated(ServerLevel.class.cast(this)); if (level.dimension() == Level.NETHER) { BCLibNetherBiomeSource.setWorldHeight(level.getChunkSource().getGenerator().getGenDepth()); diff --git a/src/main/java/org/betterx/bclib/mixin/common/TagLoaderMixin.java b/src/main/java/org/betterx/bclib/mixin/common/TagLoaderMixin.java index c9c45f76..d384a3e7 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/TagLoaderMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/TagLoaderMixin.java @@ -3,7 +3,7 @@ package org.betterx.bclib.mixin.common; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagLoader; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/betterx/bclib/mixin/common/WorldOpenFlowsMixin.java b/src/main/java/org/betterx/bclib/mixin/common/WorldOpenFlowsMixin.java index d52a3dff..a96cb299 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/WorldOpenFlowsMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/WorldOpenFlowsMixin.java @@ -9,10 +9,10 @@ import net.minecraft.world.level.levelgen.WorldGenSettings; import net.minecraft.world.level.storage.LevelStorageSource; import net.minecraft.world.level.storage.WorldData; -import org.betterx.bclib.api.LifeCycleAPI; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; -import org.betterx.bclib.api.datafixer.DataFixerAPI; +import org.betterx.bclib.api.v2.LifeCycleAPI; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.datafixer.DataFixerAPI; +import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; import org.betterx.bclib.config.Configs; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -34,7 +34,7 @@ public abstract class WorldOpenFlowsMixin { @Inject(method = "loadLevel", cancellable = true, at = @At("HEAD")) private void bcl_callFixerOnLoad(Screen screen, String levelID, CallbackInfo ci) { DataExchangeAPI.prepareServerside(); - BiomeAPI.prepareNewLevel(); + InternalBiomeAPI.prepareNewLevel(); if (DataFixerAPI.fixData(this.levelSource, levelID, true, (appliedFixes) -> { LifeCycleAPI._runBeforeLevelLoad(); diff --git a/src/main/java/org/betterx/bclib/mixin/common/WorldPresetsBootstrapMixin.java b/src/main/java/org/betterx/bclib/mixin/common/WorldPresetsBootstrapMixin.java index ab334a4c..920614a7 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/WorldPresetsBootstrapMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/WorldPresetsBootstrapMixin.java @@ -11,8 +11,8 @@ import net.minecraft.world.level.levelgen.presets.WorldPresets; import net.minecraft.world.level.levelgen.structure.StructureSet; import net.minecraft.world.level.levelgen.synth.NormalNoise; +import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; import org.betterx.bclib.presets.worldgen.BCLWorldPresets; -import org.betterx.bclib.api.worldgen.WorldGenUtil; import org.betterx.bclib.presets.worldgen.WorldPresetSettings; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -52,12 +52,12 @@ public abstract class WorldPresetsBootstrapMixin { @ModifyArg(method = "run", at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/world/level/levelgen/presets/WorldPresets$Bootstrap;registerCustomOverworldPreset(Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/level/dimension/LevelStem;)Lnet/minecraft/core/Holder;")) private LevelStem bcl_getOverworldStem(LevelStem overworldStem) { WorldPresetSettings.bootstrap(); - WorldGenUtil.Context netherContext = new WorldGenUtil.Context(this.biomes, + LevelGenUtil.Context netherContext = new LevelGenUtil.Context(this.biomes, this.netherDimensionType, this.structureSets, this.noises, this.netherNoiseSettings); - WorldGenUtil.Context endContext = new WorldGenUtil.Context(this.biomes, + LevelGenUtil.Context endContext = new LevelGenUtil.Context(this.biomes, this.endDimensionType, this.structureSets, this.noises, diff --git a/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java b/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java index c84c605f..9d304d3c 100644 --- a/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java +++ b/src/main/java/org/betterx/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java @@ -5,7 +5,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import org.betterx.bclib.api.tag.CommonItemTags; +import org.betterx.bclib.api.v2.tag.CommonItemTags; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java b/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java index 517af810..52f42b27 100644 --- a/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java +++ b/src/main/java/org/betterx/bclib/presets/FlatLevelPresets.java @@ -6,8 +6,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.FlatLevelGeneratorPresetTags; import net.minecraft.world.level.levelgen.flat.FlatLevelGeneratorPreset; -import org.betterx.bclib.api.tag.TagAPI; -import org.betterx.bclib.api.tag.TagType; +import org.betterx.bclib.api.v2.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.TagType; public class FlatLevelPresets { public static TagType.Simple FLAT_LEVEL_PRESETS = diff --git a/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresetSettings.java b/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresetSettings.java index 5cc89961..034b72f7 100644 --- a/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresetSettings.java +++ b/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresetSettings.java @@ -15,14 +15,14 @@ import net.minecraft.world.level.levelgen.WorldGenSettings; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.biomes.BiomeAPI; -import org.betterx.bclib.api.surface.SurfaceRuleUtil; -import org.betterx.bclib.api.worldgen.BCLChunkGenerator; -import org.betterx.bclib.api.worldgen.WorldGenUtil; +import org.betterx.bclib.api.v2.generator.BCLBiomeSource; +import org.betterx.bclib.api.v2.generator.BCLChunkGenerator; +import org.betterx.bclib.api.v2.generator.BCLibNetherBiomeSource; +import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; +import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI; +import org.betterx.bclib.api.v2.levelgen.surface.SurfaceRuleUtil; import org.betterx.bclib.interfaces.ChunkGeneratorAccessor; import org.betterx.bclib.interfaces.NoiseGeneratorSettingsProvider; -import org.betterx.bclib.world.generator.BCLBiomeSource; -import org.betterx.bclib.world.generator.BCLibNetherBiomeSource; import java.util.Map; import java.util.Optional; @@ -64,14 +64,14 @@ public class BCLWorldPresetSettings extends WorldPresetSettings { } public BCLWorldPreset buildPreset(LevelStem overworldStem, - WorldGenUtil.Context netherContext, - WorldGenUtil.Context endContext) { + LevelGenUtil.Context netherContext, + LevelGenUtil.Context endContext) { return new BCLWorldPreset(buildDimensionMap(overworldStem, netherContext, endContext), 1000, this); } public Map, LevelStem> buildDimensionMap(LevelStem overworldStem, - WorldGenUtil.Context netherContext, - WorldGenUtil.Context endContext) { + LevelGenUtil.Context netherContext, + LevelGenUtil.Context endContext) { return Map.of(LevelStem.OVERWORLD, overworldStem, LevelStem.NETHER, @@ -88,18 +88,18 @@ public class BCLWorldPresetSettings extends WorldPresetSettings { return BCLBiomeSource.BIOME_SOURCE_VERSION_VANILLA; } - public LevelStem createStem(WorldGenUtil.Context ctx, ResourceKey key) { + public LevelStem createStem(LevelGenUtil.Context ctx, ResourceKey key) { if (key == LevelStem.NETHER) return createNetherStem(ctx); if (key == LevelStem.END) return createEndStem(ctx); return null; } - public LevelStem createNetherStem(WorldGenUtil.Context ctx) { - return WorldGenUtil.getBCLNetherLevelStem(ctx, Optional.of(netherVersion)); + public LevelStem createNetherStem(LevelGenUtil.Context ctx) { + return LevelGenUtil.getBCLNetherLevelStem(ctx, Optional.of(netherVersion)); } - public LevelStem createEndStem(WorldGenUtil.Context ctx) { - return WorldGenUtil.getBCLEndLevelStem(ctx, Optional.of(endVersion)); + public LevelStem createEndStem(LevelGenUtil.Context ctx) { + return LevelGenUtil.getBCLEndLevelStem(ctx, Optional.of(endVersion)); } public BiomeSource fixBiomeSource(BiomeSource biomeSource, Set> datapackBiomes) { @@ -143,7 +143,7 @@ public class BCLWorldPresetSettings extends WorldPresetSettings { WorldGenSettings settings) { Optional> loadedStem = settings.dimensions().getHolder(dimensionKey); final ChunkGenerator loadedChunkGenerator = loadedStem.map(h -> h.value().generator()).orElse(null); - final int loaderVersion = WorldGenUtil.getBiomeVersionForGenerator(loadedStem + final int loaderVersion = LevelGenUtil.getBiomeVersionForGenerator(loadedStem .map(h -> h.value().generator()) .orElse(null)); @@ -151,7 +151,7 @@ public class BCLWorldPresetSettings extends WorldPresetSettings { if (loaderVersion != targetVersion) { BCLib.LOGGER.info("Enforcing Correct Generator for " + dimensionKey.location().toString() + "."); - Optional> refLevelStem = WorldGenUtil.referenceStemForVersion( + Optional> refLevelStem = LevelGenUtil.referenceStemForVersion( dimensionKey, targetVersion, access, @@ -170,7 +170,7 @@ public class BCLWorldPresetSettings extends WorldPresetSettings { if (loadedChunkGenerator instanceof NoiseGeneratorSettingsProvider noiseProvider) { final Set> biomes = loadedChunkGenerator.getBiomeSource().possibleBiomes(); final BiomeSource bs = fixBiomeSource(referenceGenerator.getBiomeSource(), biomes); - BiomeAPI.applyModifications(bs, dimensionKey); + InternalBiomeAPI.applyModifications(bs, dimensionKey); referenceGenerator = new BCLChunkGenerator(generator.bclib_getStructureSetsRegistry(), noiseProvider.bclib_getNoises(), bs, @@ -179,7 +179,7 @@ public class BCLWorldPresetSettings extends WorldPresetSettings { } } - return WorldGenUtil.replaceGenerator(dimensionKey, + return LevelGenUtil.replaceGenerator(dimensionKey, dimensionTypeKey, access, settings, diff --git a/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresets.java b/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresets.java index 621f2428..d15e5147 100644 --- a/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresets.java +++ b/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresets.java @@ -10,10 +10,10 @@ import net.minecraft.world.level.levelgen.presets.WorldPreset; import com.google.common.collect.Maps; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.tag.TagAPI; -import org.betterx.bclib.api.tag.TagType; -import org.betterx.bclib.api.worldgen.WorldGenUtil; -import org.betterx.bclib.world.generator.BCLBiomeSource; +import org.betterx.bclib.api.v2.generator.BCLBiomeSource; +import org.betterx.bclib.api.v2.levelgen.LevelGenUtil; +import org.betterx.bclib.api.v2.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.TagType; import java.util.Map; import java.util.Optional; @@ -83,8 +83,8 @@ public class BCLWorldPresets { public static void bootstrapPresets(Registry presets, LevelStem overworldStem, - WorldGenUtil.Context netherContext, - WorldGenUtil.Context endContext) { + LevelGenUtil.Context netherContext, + LevelGenUtil.Context endContext) { for (Map.Entry, PresetBuilder> e : BUILDERS.entrySet()) { BCLWorldPreset preset = e.getValue().create(overworldStem, netherContext, endContext); @@ -101,7 +101,7 @@ public class BCLWorldPresets { @FunctionalInterface public interface PresetBuilder { BCLWorldPreset create(LevelStem overworldStem, - WorldGenUtil.Context netherContext, - WorldGenUtil.Context endContext); + LevelGenUtil.Context netherContext, + LevelGenUtil.Context endContext); } } diff --git a/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java b/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java index 182588a1..f371977d 100644 --- a/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java +++ b/src/main/java/org/betterx/bclib/recipes/AnvilRecipe.java @@ -27,7 +27,7 @@ import net.fabricmc.api.Environment; import com.google.gson.JsonObject; import com.mojang.brigadier.exceptions.CommandSyntaxException; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.tag.CommonItemTags; +import org.betterx.bclib.api.v2.tag.CommonItemTags; import org.betterx.bclib.config.PathConfig; import org.betterx.bclib.interfaces.UnknownReceipBookCategory; import org.betterx.bclib.util.ItemUtil; diff --git a/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java b/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java index c065d676..44d01d92 100644 --- a/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java +++ b/src/main/java/org/betterx/bclib/recipes/CraftingRecipes.java @@ -5,7 +5,7 @@ import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import org.betterx.bclib.BCLib; -import org.betterx.bclib.api.tag.CommonItemTags; +import org.betterx.bclib.api.v2.tag.CommonItemTags; import org.betterx.bclib.config.Configs; public class CraftingRecipes { diff --git a/src/main/java/org/betterx/bclib/registry/BlockRegistry.java b/src/main/java/org/betterx/bclib/registry/BlockRegistry.java index d8776b66..5e278b71 100644 --- a/src/main/java/org/betterx/bclib/registry/BlockRegistry.java +++ b/src/main/java/org/betterx/bclib/registry/BlockRegistry.java @@ -10,7 +10,7 @@ import net.minecraft.world.level.block.Block; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; -import org.betterx.bclib.api.tag.*; +import org.betterx.bclib.api.v2.tag.*; import org.betterx.bclib.blocks.BaseLeavesBlock; import org.betterx.bclib.blocks.BaseOreBlock; import org.betterx.bclib.blocks.FeatureSaplingBlock; diff --git a/src/main/java/org/betterx/bclib/registry/ItemRegistry.java b/src/main/java/org/betterx/bclib/registry/ItemRegistry.java index e8483062..726c1a08 100644 --- a/src/main/java/org/betterx/bclib/registry/ItemRegistry.java +++ b/src/main/java/org/betterx/bclib/registry/ItemRegistry.java @@ -15,9 +15,9 @@ import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.*; import net.minecraft.world.level.block.DispenserBlock; -import org.betterx.bclib.api.tag.CommonItemTags; -import org.betterx.bclib.api.tag.NamedToolTags; -import org.betterx.bclib.api.tag.TagAPI; +import org.betterx.bclib.api.v2.tag.CommonItemTags; +import org.betterx.bclib.api.v2.tag.NamedToolTags; +import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.config.PathConfig; import org.betterx.bclib.items.BaseDiscItem; import org.betterx.bclib.items.BaseDrinkItem; diff --git a/src/main/java/org/betterx/bclib/sdf/SDF.java b/src/main/java/org/betterx/bclib/sdf/SDF.java index 3bf11404..c7e6d9a8 100644 --- a/src/main/java/org/betterx/bclib/sdf/SDF.java +++ b/src/main/java/org/betterx/bclib/sdf/SDF.java @@ -11,7 +11,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.betterx.bclib.util.BlocksHelper; -import org.betterx.bclib.world.structures.StructureWorld; +import org.betterx.bclib.api.v2.levelgen.structures.StructureWorld; import java.util.*; import java.util.function.Function; diff --git a/src/main/java/org/betterx/bclib/server/BCLibServer.java b/src/main/java/org/betterx/bclib/server/BCLibServer.java index 0b35ab76..209a49fb 100644 --- a/src/main/java/org/betterx/bclib/server/BCLibServer.java +++ b/src/main/java/org/betterx/bclib/server/BCLibServer.java @@ -2,9 +2,9 @@ package org.betterx.bclib.server; import net.fabricmc.api.DedicatedServerModInitializer; -import org.betterx.bclib.api.ModIntegrationAPI; -import org.betterx.bclib.api.PostInitAPI; -import org.betterx.bclib.api.dataexchange.DataExchangeAPI; +import org.betterx.bclib.api.v2.ModIntegrationAPI; +import org.betterx.bclib.api.v2.PostInitAPI; +import org.betterx.bclib.api.v2.dataexchange.DataExchangeAPI; public class BCLibServer implements DedicatedServerModInitializer { @Override diff --git a/src/main/java/org/betterx/bclib/util/BlocksHelper.java b/src/main/java/org/betterx/bclib/util/BlocksHelper.java index b2035e55..1813328a 100644 --- a/src/main/java/org/betterx/bclib/util/BlocksHelper.java +++ b/src/main/java/org/betterx/bclib/util/BlocksHelper.java @@ -16,7 +16,7 @@ import net.minecraft.world.level.block.state.properties.Property; import net.minecraft.world.level.material.LavaFluid; import com.google.common.collect.Maps; -import org.betterx.bclib.api.tag.CommonBlockTags; +import org.betterx.bclib.api.v2.tag.CommonBlockTags; import java.util.Map; import java.util.Optional; diff --git a/src/main/java/org/betterx/bclib/world/generator/BiomeType.java b/src/main/java/org/betterx/bclib/world/generator/BiomeType.java deleted file mode 100644 index dd5bb0e0..00000000 --- a/src/main/java/org/betterx/bclib/world/generator/BiomeType.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.betterx.bclib.world.generator; - -public enum BiomeType { - LAND, VOID -} diff --git a/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java b/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java index b7e1e927..535bc80f 100644 --- a/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java +++ b/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java @@ -10,20 +10,21 @@ import net.minecraft.world.level.levelgen.structure.placement.RandomSpreadStruct import net.minecraft.world.level.levelgen.structure.placement.RandomSpreadType; import com.mojang.serialization.Codec; +import org.betterx.bclib.api.v2.levelgen.structures.BCLStructureBuilder; import org.betterx.bclib.util.MHelper; import java.util.function.Function; @Deprecated(forRemoval = true) /** - * Please use the {@link org.betterx.bclib.api.structures.BCLStructure} and - * {@link org.betterx.bclib.api.structures.BCLStructureBuilder} instead. + * Please use the {@link org.betterx.bclib.api.v2.levelgen.structures.BCLStructure} and + * {@link BCLStructureBuilder} instead. */ -public class BCLStructure extends org.betterx.bclib.api.structures.BCLStructure { +public class BCLStructure extends org.betterx.bclib.api.v2.levelgen.structures.BCLStructure { @Deprecated(forRemoval = true) /** - * Please use the {@link org.betterx.bclib.api.structures.BCLStructureBuilder} instead: + * Please use the {@link BCLStructureBuilder} instead: * * BCLStructureBuilder * .start(id, structureBuilder) @@ -41,7 +42,7 @@ public class BCLStructure extends org.betterx.bclib.api.str @Deprecated(forRemoval = true) /** - * Please use the {@link org.betterx.bclib.api.structures.BCLStructureBuilder} instead: + * Please use the {@link BCLStructureBuilder} instead: * * BCLStructureBuilder * .start(id, structureBuilder) @@ -68,7 +69,7 @@ public class BCLStructure extends org.betterx.bclib.api.str @Deprecated(forRemoval = true) /** * - * Please use the {@link org.betterx.bclib.api.structures.BCLStructureBuilder} instead: + * Please use the {@link BCLStructureBuilder} instead: * * BCLStructureBuilder * .start(id, structureBuilder)