diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/MarsSkyProperties.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/MarsSkyProperties.java index e87026614..fb0759d22 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/MarsSkyProperties.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/MarsSkyProperties.java @@ -26,7 +26,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; - import net.minecraft.client.render.SkyProperties; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; @@ -40,7 +39,7 @@ public MarsSkyProperties() { } @Override - public Vec3d adjustSkyColor(Vec3d color, float sunHeight) { + public Vec3d adjustFogColor(Vec3d color, float sunHeight) { return new Vec3d(0.8, 0.5, 0.08); } @@ -50,7 +49,7 @@ public boolean useThickFog(int camX, int camY) { } @Override - public float[] getSkyColor(float skyAngle, float tickDelta) { + public float[] getFogColorOverride(float skyAngle, float tickDelta) { // Help me, how in the world does this work float g = MathHelper.cos(skyAngle * 6.2831855F) - 0.0F; if (g >= -0.4F && g <= 0.4F) { diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/MoonSkyProperties.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/MoonSkyProperties.java index 656fb1f80..b06b4bcd8 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/MoonSkyProperties.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/MoonSkyProperties.java @@ -26,7 +26,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; - import net.minecraft.client.render.SkyProperties; import net.minecraft.util.math.Vec3d; @@ -37,7 +36,7 @@ public MoonSkyProperties() { } @Override - public Vec3d adjustSkyColor(Vec3d color, float sunHeight) { + public Vec3d adjustFogColor(Vec3d color, float sunHeight) { return color.multiply(0.15000000596046448D); } diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/SpaceSkyProperties.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/SpaceSkyProperties.java index 134eebc56..027b0f7cd 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/SpaceSkyProperties.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/SpaceSkyProperties.java @@ -26,7 +26,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; - import net.minecraft.client.render.SkyProperties; import net.minecraft.util.math.Vec3d; @@ -37,7 +36,7 @@ public SpaceSkyProperties() { } @Override - public Vec3d adjustSkyColor(Vec3d color, float sunHeight) { + public Vec3d adjustFogColor(Vec3d color, float sunHeight) { return color.multiply(0.15000000596046448D); } diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/VulcanSkyProperties.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/VulcanSkyProperties.java index 9d25fe9d9..79ff7b7a2 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/VulcanSkyProperties.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/client/render/sky/VulcanSkyProperties.java @@ -26,7 +26,6 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; - import net.minecraft.client.render.SkyProperties; import net.minecraft.util.math.Vec3d; @@ -37,7 +36,7 @@ public VulcanSkyProperties() { } @Override - public Vec3d adjustSkyColor(Vec3d color, float sunHeight) { + public Vec3d adjustFogColor(Vec3d color, float sunHeight) { return new Vec3d(0.4, 0.35, 0.31); } diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/AsteroidOreFeature.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/AsteroidOreFeature.java index bd63fcb64..9eda7bf7f 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/AsteroidOreFeature.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/AsteroidOreFeature.java @@ -24,6 +24,16 @@ package com.github.chainmailstudios.astromine.discoveries.common.world.feature; +import com.github.chainmailstudios.astromine.common.utilities.data.Range; +import com.github.chainmailstudios.astromine.discoveries.client.registry.AsteroidOreRegistry; +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; +import com.mojang.serialization.Codec; +import com.terraformersmc.terraform.shapes.api.Position; +import com.terraformersmc.terraform.shapes.api.Quaternion; +import com.terraformersmc.terraform.shapes.api.Shape; +import com.terraformersmc.terraform.shapes.impl.Shapes; +import com.terraformersmc.terraform.shapes.impl.layer.transform.RotateLayer; +import com.terraformersmc.terraform.shapes.impl.layer.transform.TranslateLayer; import net.minecraft.block.Block; import net.minecraft.util.Pair; import net.minecraft.util.collection.WeightedList; @@ -32,17 +42,6 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.Feature; -import com.mojang.serialization.Codec; - -import com.github.chainmailstudios.astromine.common.utilities.data.Range; -import com.github.chainmailstudios.astromine.discoveries.client.registry.AsteroidOreRegistry; -import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; -import com.terraformersmc.shapes.api.Position; -import com.terraformersmc.shapes.api.Quaternion; -import com.terraformersmc.shapes.api.Shape; -import com.terraformersmc.shapes.impl.Shapes; -import com.terraformersmc.shapes.impl.layer.transform.RotateLayer; -import com.terraformersmc.shapes.impl.layer.transform.TranslateLayer; import org.jetbrains.annotations.Nullable; import java.util.Map; diff --git a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonOreFeature.java b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonOreFeature.java index 7f2741a73..a6ab81449 100644 --- a/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonOreFeature.java +++ b/astromine-discoveries/src/main/java/com/github/chainmailstudios/astromine/discoveries/common/world/feature/MoonOreFeature.java @@ -24,20 +24,19 @@ package com.github.chainmailstudios.astromine.discoveries.common.world.feature; +import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; +import com.mojang.serialization.Codec; +import com.terraformersmc.terraform.shapes.api.Position; +import com.terraformersmc.terraform.shapes.api.Quaternion; +import com.terraformersmc.terraform.shapes.api.Shape; +import com.terraformersmc.terraform.shapes.impl.Shapes; +import com.terraformersmc.terraform.shapes.impl.layer.transform.RotateLayer; +import com.terraformersmc.terraform.shapes.impl.layer.transform.TranslateLayer; import net.minecraft.util.math.BlockPos; import net.minecraft.world.StructureWorldAccess; import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.Feature; -import com.mojang.serialization.Codec; - -import com.github.chainmailstudios.astromine.discoveries.registry.AstromineDiscoveriesBlocks; -import com.terraformersmc.shapes.api.Position; -import com.terraformersmc.shapes.api.Quaternion; -import com.terraformersmc.shapes.api.Shape; -import com.terraformersmc.shapes.impl.Shapes; -import com.terraformersmc.shapes.impl.layer.transform.RotateLayer; -import com.terraformersmc.shapes.impl.layer.transform.TranslateLayer; import java.util.Random; import java.util.stream.Collectors; diff --git a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/CrudeOilFeature.java b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/CrudeOilFeature.java index 362e97aa3..e0dcea615 100644 --- a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/CrudeOilFeature.java +++ b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/CrudeOilFeature.java @@ -24,6 +24,13 @@ package com.github.chainmailstudios.astromine.foundations.common.world.feature; +import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFluids; +import com.mojang.serialization.Codec; +import com.terraformersmc.terraform.shapes.api.Position; +import com.terraformersmc.terraform.shapes.impl.Shapes; +import com.terraformersmc.terraform.shapes.impl.layer.transform.NoiseTranslateLayer; +import com.terraformersmc.terraform.shapes.impl.layer.transform.TranslateLayer; import net.minecraft.block.Block; import net.minecraft.block.FluidBlock; import net.minecraft.util.Lazy; @@ -35,14 +42,6 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.Feature; -import com.mojang.serialization.Codec; - -import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFluids; -import com.terraformersmc.shapes.api.Position; -import com.terraformersmc.shapes.impl.Shapes; -import com.terraformersmc.shapes.impl.layer.transform.NoiseTranslateLayer; -import com.terraformersmc.shapes.impl.layer.transform.TranslateLayer; import java.util.Random; diff --git a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/MeteorGenerator.java b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/MeteorGenerator.java index e53de93c6..a8678fc4c 100644 --- a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/MeteorGenerator.java +++ b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/common/world/feature/MeteorGenerator.java @@ -24,6 +24,16 @@ package com.github.chainmailstudios.astromine.foundations.common.world.feature; +import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.common.noise.OpenSimplexNoise; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsBlocks; +import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFeatures; +import com.terraformersmc.terraform.shapes.api.Position; +import com.terraformersmc.terraform.shapes.api.Quaternion; +import com.terraformersmc.terraform.shapes.api.Shape; +import com.terraformersmc.terraform.shapes.impl.Shapes; +import com.terraformersmc.terraform.shapes.impl.layer.transform.RotateLayer; +import com.terraformersmc.terraform.shapes.impl.layer.transform.TranslateLayer; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -31,11 +41,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.structure.StructureManager; import net.minecraft.structure.StructurePieceWithDimensions; -import net.minecraft.util.math.BlockBox; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.math.Direction; -import net.minecraft.util.math.Vec3i; +import net.minecraft.util.math.*; import net.minecraft.util.registry.Registry; import net.minecraft.world.Heightmap; import net.minecraft.world.StructureWorldAccess; @@ -43,17 +49,6 @@ import net.minecraft.world.gen.StructureAccessor; import net.minecraft.world.gen.chunk.ChunkGenerator; -import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.common.noise.OpenSimplexNoise; -import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsBlocks; -import com.github.chainmailstudios.astromine.foundations.registry.AstromineFoundationsFeatures; -import com.terraformersmc.shapes.api.Position; -import com.terraformersmc.shapes.api.Quaternion; -import com.terraformersmc.shapes.api.Shape; -import com.terraformersmc.shapes.impl.Shapes; -import com.terraformersmc.shapes.impl.layer.transform.RotateLayer; -import com.terraformersmc.shapes.impl.layer.transform.TranslateLayer; - import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsFeatures.java b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsFeatures.java index f47420eed..fe84fb425 100644 --- a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsFeatures.java +++ b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsFeatures.java @@ -24,29 +24,28 @@ package com.github.chainmailstudios.astromine.foundations.registry; +import com.github.chainmailstudios.astromine.AstromineCommon; +import com.github.chainmailstudios.astromine.foundations.AstromineFoundationsCommon; +import com.github.chainmailstudios.astromine.foundations.common.world.feature.CrudeOilFeature; +import com.github.chainmailstudios.astromine.foundations.common.world.feature.MeteorFeature; +import com.github.chainmailstudios.astromine.foundations.common.world.feature.MeteorGenerator; +import com.github.chainmailstudios.astromine.registry.AstromineFeatures; +import net.fabricmc.fabric.api.biome.v1.BiomeModifications; +import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext; +import net.fabricmc.fabric.api.biome.v1.ModificationPhase; +import net.fabricmc.fabric.api.structure.v1.FabricStructureBuilder; import net.minecraft.structure.StructurePieceType; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.chunk.StructureConfig; -import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.ConfiguredStructureFeature; -import net.minecraft.world.gen.feature.DefaultFeatureConfig; -import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.StructureFeature; +import net.minecraft.world.gen.feature.*; -import com.github.chainmailstudios.astromine.AstromineCommon; -import com.github.chainmailstudios.astromine.foundations.common.world.feature.CrudeOilFeature; -import com.github.chainmailstudios.astromine.foundations.common.world.feature.MeteorFeature; -import com.github.chainmailstudios.astromine.foundations.common.world.feature.MeteorGenerator; -import com.github.chainmailstudios.astromine.registry.AstromineFeatures; -import me.shedaniel.cloth.api.dynamic.registry.v1.BiomesRegistry; -import me.shedaniel.cloth.api.dynamic.registry.v1.DynamicRegistryCallback; -import net.earthcomputer.libstructure.LibStructure; +import java.util.function.Predicate; public class AstromineFoundationsFeatures extends AstromineFeatures { + public static final Identifier ASTROMINE_FOUNDATIONS_MODIFICATIONS_FEATURES = AstromineFoundationsCommon.identifier("foundations_odifications_features"); public static final Identifier METEOR_ID = AstromineCommon.identifier("meteor"); public static final StructurePieceType METEOR_STRUCTURE = register(MeteorGenerator::new, METEOR_ID); public static final RegistryKey> METEOR_KEY = RegistryKey.of(Registry.CONFIGURED_STRUCTURE_FEATURE_WORLDGEN, METEOR_ID); @@ -58,18 +57,26 @@ public class AstromineFoundationsFeatures extends AstromineFeatures { public static void initialize() { MeteorFeature meteor = new MeteorFeature(DefaultFeatureConfig.CODEC); ConfiguredStructureFeature> meteorStructure = meteor.configure(new DefaultFeatureConfig()); - LibStructure.registerStructure(METEOR_ID, meteor, GenerationStep.Feature.RAW_GENERATION, new StructureConfig(32, 8, 12345), meteorStructure); + FabricStructureBuilder.create(METEOR_ID, meteor) + .step(GenerationStep.Feature.SURFACE_STRUCTURES) + .defaultConfig(32, 8, 12345) + .superflatFeature(meteorStructure) + .register(); - DynamicRegistryCallback.callback(Registry.BIOME_KEY).register((manager, key, biome) -> { - if (biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THEEND) { - BiomesRegistry.registerStructure(manager, biome, () -> meteorStructure); - } - }); + BiomeModifications.create(ASTROMINE_FOUNDATIONS_MODIFICATIONS_FEATURES) + .add(ModificationPhase.ADDITIONS, overworldPredicate(), context -> { + context.getGenerationSettings().addStructure(METEOR_KEY); + }) + .add(ModificationPhase.ADDITIONS, oceanPredicate(), context -> { + context.getGenerationSettings().addFeature(GenerationStep.Feature.LAKES, CRUDE_OIL_KEY); + }); + } + + private static Predicate overworldPredicate() { + return context -> context.getBiome().getCategory() != Biome.Category.NETHER && context.getBiome().getCategory() != Biome.Category.THEEND; + } - DynamicRegistryCallback.callback(Registry.BIOME_KEY).register((manager, key, biome) -> { - if (biome.getCategory() == Biome.Category.OCEAN || biome.getCategory() == Biome.Category.DESERT) { - BiomesRegistry.registerFeature(manager, biome, GenerationStep.Feature.LAKES, CRUDE_OIL_KEY); - } - }); + private static Predicate oceanPredicate() { + return context -> context.getBiome().getCategory() == Biome.Category.OCEAN; } } diff --git a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsOres.java b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsOres.java index f60fd7fe1..cc58b83cc 100644 --- a/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsOres.java +++ b/astromine-foundations/src/main/java/com/github/chainmailstudios/astromine/foundations/registry/AstromineFoundationsOres.java @@ -24,6 +24,10 @@ package com.github.chainmailstudios.astromine.foundations.registry; +import com.github.chainmailstudios.astromine.foundations.AstromineFoundationsCommon; +import net.fabricmc.fabric.api.biome.v1.BiomeModifications; +import net.fabricmc.fabric.api.biome.v1.BiomeSelectionContext; +import net.fabricmc.fabric.api.biome.v1.ModificationPhase; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryKey; @@ -31,11 +35,10 @@ import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.feature.ConfiguredFeature; -import com.github.chainmailstudios.astromine.foundations.AstromineFoundationsCommon; -import me.shedaniel.cloth.api.dynamic.registry.v1.BiomesRegistry; -import me.shedaniel.cloth.api.dynamic.registry.v1.DynamicRegistryCallback; +import java.util.function.Predicate; public class AstromineFoundationsOres { + public static final Identifier ASTROMINE_FOUNDATIONS_MODIFICATIONS_ORES = AstromineFoundationsCommon.identifier("foundations_odifications_ores"); public static final Identifier TIN_ORE_ID = AstromineFoundationsCommon.identifier("tin_ore"); public static final RegistryKey> TIN_ORE_KEY = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, TIN_ORE_ID); @@ -49,17 +52,22 @@ public class AstromineFoundationsOres { public static final RegistryKey> LEAD_ORE_KEY = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, LEAD_ORE_ID); public static void initialize() { - DynamicRegistryCallback.callback(Registry.BIOME_KEY).register((manager, key, biome) -> { - if (biome.getCategory() != Biome.Category.NETHER && biome.getCategory() != Biome.Category.THEEND) { - if (AstromineFoundationsConfig.get().overworldTinOre) - BiomesRegistry.registerFeature(manager, biome, GenerationStep.Feature.UNDERGROUND_ORES, TIN_ORE_KEY); - if (AstromineFoundationsConfig.get().overworldCopperOre) - BiomesRegistry.registerFeature(manager, biome, GenerationStep.Feature.UNDERGROUND_ORES, COPPER_ORE_KEY); - if (AstromineFoundationsConfig.get().overworldSilverOre) - BiomesRegistry.registerFeature(manager, biome, GenerationStep.Feature.UNDERGROUND_ORES, SILVER_ORE_KEY); - if (AstromineFoundationsConfig.get().overworldLeadOre) - BiomesRegistry.registerFeature(manager, biome, GenerationStep.Feature.UNDERGROUND_ORES, LEAD_ORE_KEY); - } - }); + BiomeModifications.create(ASTROMINE_FOUNDATIONS_MODIFICATIONS_ORES) + .add(ModificationPhase.ADDITIONS, overworldPredicate().and(context -> AstromineFoundationsConfig.get().overworldTinOre), context -> { + context.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, TIN_ORE_KEY); + }) + .add(ModificationPhase.ADDITIONS, overworldPredicate().and(context -> AstromineFoundationsConfig.get().overworldCopperOre), context -> { + context.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, COPPER_ORE_KEY); + }) + .add(ModificationPhase.ADDITIONS, overworldPredicate().and(context -> AstromineFoundationsConfig.get().overworldSilverOre), context -> { + context.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, SILVER_ORE_KEY); + }) + .add(ModificationPhase.ADDITIONS, overworldPredicate().and(context -> AstromineFoundationsConfig.get().overworldLeadOre), context -> { + context.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, LEAD_ORE_KEY); + }); + } + + private static Predicate overworldPredicate() { + return context -> context.getBiome().getCategory() != Biome.Category.NETHER && context.getBiome().getCategory() != Biome.Category.THEEND; } } diff --git a/astromine-foundations/src/main/resources/data/astromine/worldgen/configured_structure_feature/meteor.json b/astromine-foundations/src/main/resources/data/astromine/worldgen/configured_structure_feature/meteor.json new file mode 100644 index 000000000..d464bd0e0 --- /dev/null +++ b/astromine-foundations/src/main/resources/data/astromine/worldgen/configured_structure_feature/meteor.json @@ -0,0 +1,4 @@ +{ + "type": "astromine:meteor", + "config": {} +} \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index 190acec41..920630ba2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -10,7 +10,7 @@ project.ext.setDefaultApis = { useAsApi("io.github.onyxstudios.Cardinal-Components-API:cardinal-components-util:${cardinal_components_version}") // Shapes - useAsApi("com.terraformersmc:shapes:${shapes_version}") + useAsApi("com.terraformersmc.terraform-api:terraform-shapes-api-v1:${shapes_version}") // Blade useAsApi("com.github.vini2003:blade:${blade_version}") @@ -34,7 +34,6 @@ project.ext.setDefaultApis = { // Cloth API useAsApi("me.shedaniel.cloth.api:cloth-durability-bar-api-v1:${cloth_api_version}") - useAsApi("me.shedaniel.cloth.api:cloth-dynamic-registry-api-v1:${cloth_api_version}") useAsApi("me.shedaniel.cloth.api:cloth-datagen-api-v1:${cloth_api_version}") // Cloth Config @@ -43,9 +42,6 @@ project.ext.setDefaultApis = { // RoughlyEnoughItems useAsApiOptionally("me.shedaniel:RoughlyEnoughItems:${rei_version}") - // LibStructure - useAsApi("net.earthcomputer:libstructure:${libstructure_version}") - // Magna useAsApi("com.github.Draylar:magna:${magna_version}") @@ -65,6 +61,9 @@ project.ext.setDefaultApis = { // Piglib useAsApi("com.github.Shnupbups:Piglib:${piglib_version}") + + // Fermion Mod Keys + useAsApi("grondag:fermion-modkeys-mc116:${fermion_version}") } project.ext.setRuntimeTestMods = { diff --git a/gradle.properties b/gradle.properties index 65e722db3..a898baf3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,39 +2,39 @@ org.gradle.jvmargs=-Xmx4G ignoreRemapSrc=false # Fabric -minecraft_version=1.16.3 -mappings_version=1.16.3+build.45 -loader_version=0.10.1+build.209 +minecraft_version=1.16.5 +mappings_version=1.16.5+build.1 +loader_version=0.11.1 # Fabric API -api_version=0.24.0+build.411-1.16 +api_version=0.29.3+1.16 # Mod mod_name=astromine -mod_version=1.11.4 +mod_version=1.11.5 mod_group=com.github.chainmailstudios.astromine -version_meta=fabric-1.16.3 +version_meta=fabric-1.16.5 # CurseForge -tagged_versions=1.16.3,Fabric,Java 8 +tagged_versions=1.16.4,1.16.5,Fabric,Java 8 release_cycle=release # Dependencies -cardinal_components_version=2.6.0 +cardinal_components_version=2.7.10 blade_version=2e84810 -shapes_version=2.0.0+build.10 -patchouli_version=1.16.2-44-FABRIC -lba_version=0.8.2 -auto_config_version=3.2.2 -libstructure_version=1.5 -tr_energy_version=0.1.0 -cloth_config_version=4.8.2 +shapes_version=1.0.0+build.4 +patchouli_version=1.16.4-48-FABRIC +lba_version=0.8.5 +auto_config_version=3.3.1 +tr_energy_version=0.1.1 +cloth_config_version=4.8.3 magna_version=619014b -cloth_api_version=1.4.8 +cloth_api_version=1.4.9 kotlin_version=1.4.0 -joml_version=1.9.25 +joml_version=1.10.0 maybe_data_version=0446d26 -piglib_version=1.0.1 +piglib_version=1.0.2-1.16 +fermion_version=1.10.218 # Conveniences -rei_version=5.6.1 -modmenu_version=1.14.6+build.31 +rei_version=5.8.10 +modmenu_version=1.14.13+build.19 databreaker_version=0.2.6 -tech_reborn_version=3.5.4+build.129 -reborn_core_version=4.4.2+build.75 +tech_reborn_version=3.7.3+build.192 +reborn_core_version=4.6.3+build.110 wrenchable_version=1.0.0+1.16.1 \ No newline at end of file