Moved Featrues and Included Sculk in TagLists
This commit is contained in:
parent
261099babd
commit
223d35febe
15 changed files with 22 additions and 20 deletions
|
@ -1,14 +1,9 @@
|
||||||
package org.betterx.bclib;
|
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.resources.ResourceLocation;
|
||||||
import net.minecraft.world.level.biome.*;
|
|
||||||
|
|
||||||
import net.fabricmc.api.EnvType;
|
import net.fabricmc.api.EnvType;
|
||||||
import net.fabricmc.api.ModInitializer;
|
import net.fabricmc.api.ModInitializer;
|
||||||
import net.fabricmc.fabric.impl.biome.NetherBiomeData;
|
|
||||||
import net.fabricmc.loader.api.FabricLoader;
|
import net.fabricmc.loader.api.FabricLoader;
|
||||||
|
|
||||||
import org.betterx.bclib.api.v2.WorldDataAPI;
|
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.generator.GeneratorOptions;
|
||||||
import org.betterx.bclib.api.v2.levelgen.features.blockpredicates.Types;
|
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.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.levelgen.surface.rules.Conditions;
|
||||||
import org.betterx.bclib.api.v2.tag.TagAPI;
|
import org.betterx.bclib.api.v2.tag.TagAPI;
|
||||||
import org.betterx.bclib.commands.CommandRegistry;
|
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.BaseBlockEntities;
|
||||||
import org.betterx.bclib.registry.BaseRegistry;
|
import org.betterx.bclib.registry.BaseRegistry;
|
||||||
import org.betterx.bclib.util.Logger;
|
import org.betterx.bclib.util.Logger;
|
||||||
import org.betterx.bclib.api.v2.levelgen.structures.TemplatePiece;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -69,7 +64,7 @@ public class BCLib implements ModInitializer {
|
||||||
TemplatePiece.ensureStaticInitialization();
|
TemplatePiece.ensureStaticInitialization();
|
||||||
PlacementModifiers.ensureStaticInitialization();
|
PlacementModifiers.ensureStaticInitialization();
|
||||||
Configs.save();
|
Configs.save();
|
||||||
if (isDevEnvironment()) {
|
/*if (isDevEnvironment()) {
|
||||||
Biome.BiomeBuilder builder = new Biome.BiomeBuilder()
|
Biome.BiomeBuilder builder = new Biome.BiomeBuilder()
|
||||||
.precipitation(Biome.Precipitation.NONE)
|
.precipitation(Biome.Precipitation.NONE)
|
||||||
.temperature(1.0f)
|
.temperature(1.0f)
|
||||||
|
@ -87,7 +82,7 @@ public class BCLib implements ModInitializer {
|
||||||
biome = Registry.register(BuiltinRegistries.BIOME, loc, biome);
|
biome = Registry.register(BuiltinRegistries.BIOME, loc, biome);
|
||||||
ResourceKey<Biome> key = BuiltinRegistries.BIOME.getResourceKey(biome).orElseThrow();
|
ResourceKey<Biome> key = BuiltinRegistries.BIOME.getResourceKey(biome).orElseThrow();
|
||||||
NetherBiomeData.addNetherBiome(key, Climate.parameters(-1, 1, 0, 0, 0, 0, 0));
|
NetherBiomeData.addNetherBiome(key, Climate.parameters(-1, 1, 0, 0, 0, 0, 0));
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isDevEnvironment() {
|
public static boolean isDevEnvironment() {
|
||||||
|
|
|
@ -23,6 +23,7 @@ import net.minecraft.world.level.levelgen.placement.PlacementModifier;
|
||||||
|
|
||||||
import org.betterx.bclib.BCLib;
|
import org.betterx.bclib.BCLib;
|
||||||
import org.betterx.bclib.api.v2.levelgen.features.config.*;
|
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.Map.Entry;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
|
@ -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.PlaceFacingBlockConfig;
|
||||||
import org.betterx.bclib.api.v2.levelgen.features.config.ScatterFeatureConfig;
|
import org.betterx.bclib.api.v2.levelgen.features.config.ScatterFeatureConfig;
|
||||||
|
import org.betterx.bclib.api.v2.levelgen.features.features.ScatterFeature;
|
||||||
|
|
||||||
public class FastFeatures {
|
public class FastFeatures {
|
||||||
|
|
||||||
|
|
|
@ -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.BlockPos;
|
||||||
import net.minecraft.core.Holder;
|
import net.minecraft.core.Holder;
|
|
@ -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.BlockPos;
|
||||||
import net.minecraft.world.level.WorldGenLevel;
|
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;
|
import org.betterx.bclib.util.BlocksHelper;
|
||||||
|
|
||||||
|
@Deprecated(forRemoval = true)
|
||||||
public abstract class DefaultFeature extends Feature<NoneFeatureConfiguration> {
|
public abstract class DefaultFeature extends Feature<NoneFeatureConfiguration> {
|
||||||
protected static final BlockState AIR = Blocks.AIR.defaultBlockState();
|
protected static final BlockState AIR = Blocks.AIR.defaultBlockState();
|
||||||
protected static final BlockState WATER = Blocks.WATER.defaultBlockState();
|
protected static final BlockState WATER = Blocks.WATER.defaultBlockState();
|
|
@ -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.BlockPos;
|
||||||
import net.minecraft.world.level.levelgen.feature.Feature;
|
import net.minecraft.world.level.levelgen.feature.Feature;
|
|
@ -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.Feature;
|
||||||
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
|
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
|
|
@ -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.BlockPos;
|
||||||
import net.minecraft.core.Direction;
|
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 net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
|
||||||
|
|
||||||
import com.mojang.serialization.Codec;
|
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.api.v2.levelgen.features.config.ScatterFeatureConfig;
|
||||||
import org.betterx.bclib.util.BlocksHelper;
|
import org.betterx.bclib.util.BlocksHelper;
|
||||||
|
|
|
@ -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.Feature;
|
||||||
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
|
import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
|
|
@ -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.BlockPos;
|
||||||
import net.minecraft.world.level.block.state.BlockState;
|
import net.minecraft.world.level.block.state.BlockState;
|
|
@ -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.resources.ResourceLocation;
|
||||||
import net.minecraft.util.RandomSource;
|
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 net.minecraft.world.level.levelgen.feature.FeaturePlaceContext;
|
||||||
|
|
||||||
import com.mojang.serialization.Codec;
|
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.features.config.TemplateFeatureConfig;
|
||||||
import org.betterx.bclib.api.v2.levelgen.structures.StructureNBT;
|
import org.betterx.bclib.api.v2.levelgen.structures.StructureNBT;
|
||||||
import org.betterx.bclib.api.v2.levelgen.structures.StructureWorldNBT;
|
import org.betterx.bclib.api.v2.levelgen.structures.StructureWorldNBT;
|
|
@ -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.BlockPos;
|
||||||
import net.minecraft.util.RandomSource;
|
import net.minecraft.util.RandomSource;
|
|
@ -54,7 +54,8 @@ public class CommonBlockTags {
|
||||||
Blocks.SAND,
|
Blocks.SAND,
|
||||||
Blocks.RED_SAND,
|
Blocks.RED_SAND,
|
||||||
Blocks.GLOWSTONE,
|
Blocks.GLOWSTONE,
|
||||||
Blocks.BONE_BLOCK
|
Blocks.BONE_BLOCK,
|
||||||
|
Blocks.SCULK
|
||||||
);
|
);
|
||||||
|
|
||||||
TagAPI.BLOCKS.addOtherTags(TERRAIN,
|
TagAPI.BLOCKS.addOtherTags(TERRAIN,
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class NamedBlockTags {
|
||||||
public static final TagKey<Block> STONE_BRICKS = BlockTags.STONE_BRICKS;
|
public static final TagKey<Block> STONE_BRICKS = BlockTags.STONE_BRICKS;
|
||||||
|
|
||||||
static {
|
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,
|
TagAPI.BLOCKS.addOtherTags(BlockTags.NETHER_CARVER_REPLACEABLES,
|
||||||
CommonBlockTags.NETHER_STONES,
|
CommonBlockTags.NETHER_STONES,
|
||||||
CommonBlockTags.NETHERRACK);
|
CommonBlockTags.NETHERRACK);
|
||||||
|
|
|
@ -39,7 +39,7 @@ public class BCLWorldPresets {
|
||||||
overworldStem,
|
overworldStem,
|
||||||
netherContext,
|
netherContext,
|
||||||
endContext),
|
endContext),
|
||||||
true);
|
false);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Registers a custom WorldPreset (with custom rules and behaviour)
|
* Registers a custom WorldPreset (with custom rules and behaviour)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue