Moved Classes

src/main/java/org/betterx/bclib/BCLib.java

@@ -14,6 +14,7 @@ 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.placement.PlacementModifiers;
 import org.betterx.bclib.api.tag.TagAPI;
 import org.betterx.bclib.config.Configs;
 import org.betterx.bclib.presets.worldgen.BCLWorldPresets;
@@ -22,7 +23,6 @@ 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.features.placement.PlacementModifiers;
 import org.betterx.bclib.world.generator.BCLibEndBiomeSource;
 import org.betterx.bclib.world.generator.BCLibNetherBiomeSource;
 import org.betterx.bclib.world.generator.GeneratorOptions;

src/main/java/org/betterx/bclib/api/biomes/BCLBiomeBuilder.java

@@ -29,6 +29,7 @@ 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.entity.BCLEntityWrapper;
@@ -37,7 +38,6 @@ import org.betterx.bclib.util.CollectionsUtil;
 import org.betterx.bclib.util.ColorUtil;
 import org.betterx.bclib.util.Pair;
 import org.betterx.bclib.util.TriFunction;
-import org.betterx.bclib.world.features.BCLFeature;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/org/betterx/bclib/api/biomes/BiomeAPI.java

@@ -42,6 +42,7 @@ 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;
@@ -51,7 +52,6 @@ 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 org.betterx.bclib.world.features.BCLFeature;
 
 import java.util.List;
 import java.util.Map;

src/main/java/org/betterx/bclib/api/features/BCLCommonFeatures.java

@@ -9,8 +9,6 @@ import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguratio
 import net.minecraft.world.level.levelgen.placement.PlacementModifier;
 import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest;
 
-import org.betterx.bclib.world.features.BCLFeature;
-
 public class BCLCommonFeatures {
     /**
      * Will create a basic plant feature.

src/main/java/org/betterx/bclib/api/features/BCLFeature.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features;
 
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
@@ -15,6 +15,8 @@ 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.BlockPlaceFeatureConfig;
+import org.betterx.bclib.api.features.config.ScatterFeatureConfig;
 
 import java.util.Map.Entry;
 import java.util.Optional;

src/main/java/org/betterx/bclib/api/features/BCLFeatureBuilder.java

@@ -13,8 +13,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfigur
 import net.minecraft.world.level.levelgen.placement.*;
 import net.minecraft.world.level.material.Material;
 
-import org.betterx.bclib.world.features.BCLFeature;
-import org.betterx.bclib.world.features.placement.*;
+import org.betterx.bclib.api.features.placement.*;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/org/betterx/bclib/api/features/BlockPlaceFeature.java

@@ -1,10 +1,11 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features;
 
 import net.minecraft.world.level.block.state.BlockState;
 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.BlockPlaceFeatureConfig;
 import org.betterx.bclib.util.BlocksHelper;
 
 import java.util.Optional;

src/main/java/org/betterx/bclib/api/features/DefaultFeature.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.WorldGenLevel;

src/main/java/org/betterx/bclib/api/features/ListFeature.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;

src/main/java/org/betterx/bclib/api/features/NBTFeature.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.BlockPos.MutableBlockPos;

src/main/java/org/betterx/bclib/api/features/ScatterFeature.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -22,7 +22,7 @@ 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.BCLFeatureBuilder;
+import org.betterx.bclib.api.features.config.ScatterFeatureConfig;
 import org.betterx.bclib.api.tag.CommonBlockTags;
 import org.betterx.bclib.util.BlocksHelper;
 

src/main/java/org/betterx/bclib/api/features/SurfaceFeature.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/org/betterx/bclib/api/features/TemplateFeature.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.RandomSource;
@@ -8,7 +8,7 @@ import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
 
 import com.mojang.serialization.Codec;
 import org.betterx.bclib.BCLib;
-import org.betterx.bclib.api.features.BCLFeatureBuilder;
+import org.betterx.bclib.api.features.config.TemplateFeatureConfig;
 import org.betterx.bclib.world.structures.StructureNBT;
 import org.betterx.bclib.world.structures.StructureWorldNBT;
 

src/main/java/org/betterx/bclib/api/features/config/BlockPlaceFeatureConfig.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features.config;
 
 import net.minecraft.util.RandomSource;
 import net.minecraft.util.random.SimpleWeightedRandomList;

src/main/java/org/betterx/bclib/api/features/config/ScatterFeatureConfig.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features.config;
 
 import net.minecraft.util.RandomSource;
 import net.minecraft.util.valueproviders.ConstantInt;

src/main/java/org/betterx/bclib/api/features/config/TemplateFeatureConfig.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features;
+package org.betterx.bclib.api.features.config;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.ExtraCodecs;

src/main/java/org/betterx/bclib/api/features/placement/Extend.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/org/betterx/bclib/api/features/placement/FindSolidInDirection.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/org/betterx/bclib/api/features/placement/Is.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;

src/main/java/org/betterx/bclib/api/features/placement/IsBasin.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;

src/main/java/org/betterx/bclib/api/features/placement/IsEmptyAboveSampledFilter.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;

src/main/java/org/betterx/bclib/api/features/placement/MinEmptyFilter.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/org/betterx/bclib/api/features/placement/Offset.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

src/main/java/org/betterx/bclib/api/features/placement/OnEveryLayer.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;

src/main/java/org/betterx/bclib/api/features/placement/PlacementModifiers.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;

src/main/java/org/betterx/bclib/api/features/placement/Stencil.java

@@ -1,4 +1,4 @@
-package org.betterx.bclib.world.features.placement;
+package org.betterx.bclib.api.features.placement;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.ExtraCodecs;

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.world.features.BCLFeature;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

src/main/java/org/betterx/bclib/world/features/BCLDecorators.java

@@ -1,21 +0,0 @@
-package org.betterx.bclib.world.features;
-
-public class BCLDecorators {
-	/*public static final ConfiguredDecorator<?> HEIGHTMAP_SQUARE;
-	
-	private static final ConfiguredDecorator<?> getDecorator(Field[] fields, int index) {
-		try {
-			return (ConfiguredDecorator<?>) fields[index].get(null);
-		}
-		catch (IllegalAccessException e) {
-			BCLib.LOGGER.error(e.getLocalizedMessage());
-			return null;
-		}
-	}
-	
-	static {
-		Class<?>[] classes = Features.class.getDeclaredClasses();
-		Field[] fields = classes[1].getDeclaredFields(); // Decorators class
-		HEIGHTMAP_SQUARE = getDecorator(fields, 17);
-	}*/
-}