From 223d35febefecfe1ac1b200a40c4b4bc13ac5f85 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 7 Jun 2022 23:21:08 +0200 Subject: [PATCH] Moved Featrues and Included Sculk in TagLists --- src/main/java/org/betterx/bclib/BCLib.java | 11 +++-------- .../bclib/api/v2/levelgen/features/BCLFeature.java | 1 + .../bclib/api/v2/levelgen/features/FastFeatures.java | 1 + .../features/{ => features}/ConditionFeature.java | 2 +- .../features/{ => features}/DefaultFeature.java | 3 ++- .../{ => features}/MarkPostProcessingFeature.java | 2 +- .../features/{ => features}/PlaceBlockFeature.java | 2 +- .../features/{ => features}/ScatterFeature.java | 3 ++- .../features/{ => features}/SequenceFeature.java | 2 +- .../features/{ => features}/SurfaceFeature.java | 2 +- .../features/{ => features}/TemplateFeature.java | 4 +++- .../{ => features}/WeightedRandomSelectorFeature.java | 2 +- .../org/betterx/bclib/api/v2/tag/CommonBlockTags.java | 3 ++- .../org/betterx/bclib/api/v2/tag/NamedBlockTags.java | 2 +- .../bclib/presets/worldgen/BCLWorldPresets.java | 2 +- 15 files changed, 22 insertions(+), 20 deletions(-) rename src/main/java/org/betterx/bclib/api/v2/levelgen/features/{ => features}/ConditionFeature.java (96%) rename src/main/java/org/betterx/bclib/api/v2/levelgen/features/{ => features}/DefaultFeature.java (94%) rename src/main/java/org/betterx/bclib/api/v2/levelgen/features/{ => features}/MarkPostProcessingFeature.java (92%) rename src/main/java/org/betterx/bclib/api/v2/levelgen/features/{ => features}/PlaceBlockFeature.java (89%) rename src/main/java/org/betterx/bclib/api/v2/levelgen/features/{ => features}/ScatterFeature.java (98%) rename src/main/java/org/betterx/bclib/api/v2/levelgen/features/{ => features}/SequenceFeature.java (90%) rename src/main/java/org/betterx/bclib/api/v2/levelgen/features/{ => features}/SurfaceFeature.java (96%) rename src/main/java/org/betterx/bclib/api/v2/levelgen/features/{ => features}/TemplateFeature.java (94%) rename src/main/java/org/betterx/bclib/api/v2/levelgen/features/{ => features}/WeightedRandomSelectorFeature.java (96%) diff --git a/src/main/java/org/betterx/bclib/BCLib.java b/src/main/java/org/betterx/bclib/BCLib.java index f239b08b..d072ed01 100644 --- a/src/main/java/org/betterx/bclib/BCLib.java +++ b/src/main/java/org/betterx/bclib/BCLib.java @@ -1,14 +1,9 @@ package org.betterx.bclib; -import net.minecraft.core.Registry; -import net.minecraft.data.BuiltinRegistries; -import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.biome.*; import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.impl.biome.NetherBiomeData; import net.fabricmc.loader.api.FabricLoader; import org.betterx.bclib.api.v2.WorldDataAPI; @@ -19,6 +14,7 @@ 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.structures.TemplatePiece; import org.betterx.bclib.api.v2.levelgen.surface.rules.Conditions; import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.commands.CommandRegistry; @@ -29,7 +25,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.api.v2.levelgen.structures.TemplatePiece; import java.util.List; @@ -69,7 +64,7 @@ public class BCLib implements ModInitializer { TemplatePiece.ensureStaticInitialization(); PlacementModifiers.ensureStaticInitialization(); Configs.save(); - if (isDevEnvironment()) { + /*if (isDevEnvironment()) { Biome.BiomeBuilder builder = new Biome.BiomeBuilder() .precipitation(Biome.Precipitation.NONE) .temperature(1.0f) @@ -87,7 +82,7 @@ public class BCLib implements ModInitializer { biome = Registry.register(BuiltinRegistries.BIOME, loc, biome); ResourceKey key = BuiltinRegistries.BIOME.getResourceKey(biome).orElseThrow(); NetherBiomeData.addNetherBiome(key, Climate.parameters(-1, 1, 0, 0, 0, 0, 0)); - } + }*/ } public static boolean isDevEnvironment() { diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java index f25cf508..63218210 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/BCLFeature.java @@ -23,6 +23,7 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier; import org.betterx.bclib.BCLib; import org.betterx.bclib.api.v2.levelgen.features.config.*; +import org.betterx.bclib.api.v2.levelgen.features.features.*; import java.util.Map.Entry; import java.util.Optional; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java index e3206acd..53585756 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/FastFeatures.java @@ -16,6 +16,7 @@ import net.minecraft.world.level.levelgen.feature.stateproviders.RandomizedIntSt import org.betterx.bclib.api.v2.levelgen.features.config.PlaceFacingBlockConfig; import org.betterx.bclib.api.v2.levelgen.features.config.ScatterFeatureConfig; +import org.betterx.bclib.api.v2.levelgen.features.features.ScatterFeature; public class FastFeatures { diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/ConditionFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/ConditionFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java index 0aff94a6..226895ef 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/ConditionFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ConditionFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.v2.levelgen.features; +package org.betterx.bclib.api.v2.levelgen.features.features; import net.minecraft.core.BlockPos; import net.minecraft.core.Holder; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/DefaultFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java similarity index 94% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/DefaultFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java index c789718e..7c62da4c 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/DefaultFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/DefaultFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.v2.levelgen.features; +package org.betterx.bclib.api.v2.levelgen.features.features; import net.minecraft.core.BlockPos; import net.minecraft.world.level.WorldGenLevel; @@ -10,6 +10,7 @@ import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConf import org.betterx.bclib.util.BlocksHelper; +@Deprecated(forRemoval = true) public abstract class DefaultFeature extends Feature { protected static final BlockState AIR = Blocks.AIR.defaultBlockState(); protected static final BlockState WATER = Blocks.WATER.defaultBlockState(); diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/MarkPostProcessingFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java similarity index 92% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/MarkPostProcessingFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java index 0f8c6c0f..6a423fb0 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/MarkPostProcessingFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/MarkPostProcessingFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.v2.levelgen.features; +package org.betterx.bclib.api.v2.levelgen.features.features; import net.minecraft.core.BlockPos; import net.minecraft.world.level.levelgen.feature.Feature; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/PlaceBlockFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java similarity index 89% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/PlaceBlockFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java index 84000f14..fbd24509 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/PlaceBlockFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/PlaceBlockFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.v2.levelgen.features; +package org.betterx.bclib.api.v2.levelgen.features.features; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/ScatterFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java similarity index 98% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/ScatterFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java index e7893272..024d8b33 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/ScatterFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/ScatterFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.v2.levelgen.features; +package org.betterx.bclib.api.v2.levelgen.features.features; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -11,6 +11,7 @@ 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.v2.levelgen.features.UserGrowableFeature; import org.betterx.bclib.api.v2.levelgen.features.config.ScatterFeatureConfig; import org.betterx.bclib.util.BlocksHelper; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/SequenceFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java similarity index 90% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/SequenceFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java index bbce00a6..1fd52dc7 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/SequenceFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SequenceFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.v2.levelgen.features; +package org.betterx.bclib.api.v2.levelgen.features.features; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/SurfaceFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/SurfaceFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java index 469a123c..41b63489 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/SurfaceFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/SurfaceFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.v2.levelgen.features; +package org.betterx.bclib.api.v2.levelgen.features.features; import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/TemplateFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java similarity index 94% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/TemplateFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java index ea43fff5..6b6e0fd6 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/TemplateFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/TemplateFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.v2.levelgen.features; +package org.betterx.bclib.api.v2.levelgen.features.features; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.RandomSource; @@ -7,6 +7,8 @@ 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.v2.levelgen.features.BCLFeature; +import org.betterx.bclib.api.v2.levelgen.features.BCLFeatureBuilder; 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; diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/WeightedRandomSelectorFeature.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java similarity index 96% rename from src/main/java/org/betterx/bclib/api/v2/levelgen/features/WeightedRandomSelectorFeature.java rename to src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java index 3b8fd55b..efa8117e 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/features/WeightedRandomSelectorFeature.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/features/features/WeightedRandomSelectorFeature.java @@ -1,4 +1,4 @@ -package org.betterx.bclib.api.v2.levelgen.features; +package org.betterx.bclib.api.v2.levelgen.features.features; import net.minecraft.core.BlockPos; import net.minecraft.util.RandomSource; diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java index 1a5a2715..bf1828b7 100644 --- a/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/CommonBlockTags.java @@ -54,7 +54,8 @@ public class CommonBlockTags { Blocks.SAND, Blocks.RED_SAND, Blocks.GLOWSTONE, - Blocks.BONE_BLOCK + Blocks.BONE_BLOCK, + Blocks.SCULK ); TagAPI.BLOCKS.addOtherTags(TERRAIN, diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java b/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java index a2f67619..ea322476 100644 --- a/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java +++ b/src/main/java/org/betterx/bclib/api/v2/tag/NamedBlockTags.java @@ -39,7 +39,7 @@ public class NamedBlockTags { public static final TagKey STONE_BRICKS = BlockTags.STONE_BRICKS; static { - TagAPI.BLOCKS.add(BlockTags.NETHER_CARVER_REPLACEABLES, Blocks.RED_SAND, Blocks.MAGMA_BLOCK); + TagAPI.BLOCKS.add(BlockTags.NETHER_CARVER_REPLACEABLES, Blocks.RED_SAND, Blocks.MAGMA_BLOCK, Blocks.SCULK); TagAPI.BLOCKS.addOtherTags(BlockTags.NETHER_CARVER_REPLACEABLES, CommonBlockTags.NETHER_STONES, CommonBlockTags.NETHERRACK); 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 d15e5147..a0f78b1c 100644 --- a/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresets.java +++ b/src/main/java/org/betterx/bclib/presets/worldgen/BCLWorldPresets.java @@ -39,7 +39,7 @@ public class BCLWorldPresets { overworldStem, netherContext, endContext), - true); + false); /** * Registers a custom WorldPreset (with custom rules and behaviour)