From e8607ca41947658572add55dd6bd74347bb7ce95 Mon Sep 17 00:00:00 2001 From: jottyfan Date: Thu, 26 Aug 2021 14:42:41 +0200 Subject: [PATCH] spawning of ores in nether fixed --- .../quickiefabric/init/RegistryManager.java | 20 ++++++++++--------- .../mixin/FeatureConfigMixin.java | 8 ++++---- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index 91e1c20..25330e3 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -45,6 +45,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Identifier; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.gen.YOffset; import net.minecraft.world.gen.decorator.Decorator; import net.minecraft.world.gen.decorator.RangeDecoratorConfig; @@ -70,36 +71,36 @@ public class RegistryManager { public static final ConfiguredFeature FEATURE_ORENETHERSULPHOR = Feature.ORE .configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_NETHER, QuickieBlocks.ORE_NETHER_SULPHOR.getDefaultState(), 24)) - .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(128)))).spreadHorizontally().repeat(10)); + .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(0)))).spreadHorizontally().repeat(10)); public static final ConfiguredFeature FEATURE_ORESALPETER = Feature.ORE .configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, QuickieBlocks.ORE_SALPETER.getDefaultState(), 12)) - .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(128))))).spreadHorizontally().repeat(10); + .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(64))))).spreadHorizontally().repeat(10); public static final ConfiguredFeature FEATURE_ORESULPHOR = Feature.ORE .configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, QuickieBlocks.ORE_SULPHOR.getDefaultState(), 16)) - .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(32), YOffset.belowTop(255))))).spreadHorizontally().repeat(4); + .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(64))))).spreadHorizontally().repeat(7); public static final ConfiguredFeature FEATURE_DIRTSALPETER = Feature.ORE .configure( new OreFeatureConfig(new BlockMatchRuleTest(Blocks.DIRT), QuickieBlocks.DIRT_SALPETER.getDefaultState(), 3)) - .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(255))))).spreadHorizontally().repeatRandomly(4); + .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(64))))).spreadHorizontally().repeatRandomly(4); public static final ConfiguredFeature FEATURE_SANDSALPETER = Feature.ORE .configure( new OreFeatureConfig(new BlockMatchRuleTest(Blocks.SAND), QuickieBlocks.SAND_SALPETER.getDefaultState(), 3)) - .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(255))))).spreadHorizontally().repeatRandomly(4); + .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(64))))).spreadHorizontally().repeatRandomly(4); public static final ConfiguredFeature FEATURE_ORESANDSALPETER = Feature.ORE .configure(new OreFeatureConfig(new BlockMatchRuleTest(Blocks.SANDSTONE), QuickieBlocks.ORE_SAND_SALPETER.getDefaultState(), 3)) - .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(255))))).spreadHorizontally().repeatRandomly(4); + .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig(UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.belowTop(64))))).spreadHorizontally().repeatRandomly(4); - public static final List> FEATURE_UNDERGROUND_ORES = Arrays.asList(FEATURE_ORESALPETER, + public static final List> FEATURE_QUICKIE_ORES = Arrays.asList(FEATURE_ORESALPETER, FEATURE_ORESULPHOR, FEATURE_DIRTSALPETER, FEATURE_SANDSALPETER, FEATURE_ORESANDSALPETER); - public static final List> FEATURE_UNDERGROUND_DECORATIONS = Arrays + public static final List> FEATURE_QUICKIE_NETHERORES = Arrays .asList(FEATURE_ORENETHERSULPHOR); public static final ItemGroup QUICKIEFABRIC_GROUP = FabricItemGroupBuilder @@ -278,7 +279,8 @@ public class RegistryManager { * @param feature the feature */ private static final void registerFeature(String name, ConfiguredFeature feature) { - Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new Identifier(QUICKIEFABRIC, name), feature); + RegistryKey> identifier = RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, new Identifier(QUICKIEFABRIC, name)); + Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, identifier.getValue(), feature); } /** diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/mixin/FeatureConfigMixin.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/mixin/FeatureConfigMixin.java index 8ad288c..24dfad3 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/mixin/FeatureConfigMixin.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/mixin/FeatureConfigMixin.java @@ -21,15 +21,15 @@ public class FeatureConfigMixin { @Inject(at = @At("TAIL"), method = "addMineables(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V") private static void addMineables(GenerationSettings.Builder builder, CallbackInfo ci) { - for (ConfiguredFeature configuredFeature : RegistryManager.FEATURE_UNDERGROUND_ORES) { + for (ConfiguredFeature configuredFeature : RegistryManager.FEATURE_QUICKIE_ORES) { builder.feature(GenerationStep.Feature.UNDERGROUND_ORES, configuredFeature); } } - @Inject(at = @At("HEAD"), method = "addNetherMineables(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V") + @Inject(at = @At("TAIL"), method = "addNetherMineables(Lnet/minecraft/world/biome/GenerationSettings$Builder;)V") private static void addNetherMineables(GenerationSettings.Builder builder, CallbackInfo ci) { - for (ConfiguredFeature configuredFeature : RegistryManager.FEATURE_UNDERGROUND_DECORATIONS) { - builder.feature(GenerationStep.Feature.UNDERGROUND_DECORATION, configuredFeature); + for (ConfiguredFeature configuredFeature : RegistryManager.FEATURE_QUICKIE_NETHERORES) { + builder.feature(GenerationStep.Feature.UNDERGROUND_ORES, configuredFeature); } } }