From a4ebe5ccfbbea9484c0c4d764638bacea20c4982 Mon Sep 17 00:00:00 2001 From: gniftygnome Date: Sat, 8 Jun 2024 13:14:54 -0700 Subject: [PATCH] Update to 1.21-pre4 and FAPI 0.100. - Update to 1.21-pre4 --- .../terrestria/data/TerrestriaBiomeTagProvider.java | 4 ++++ .../terrestria/data/TerrestriaBlockLootTableProvider.java | 7 +------ gradle.properties | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBiomeTagProvider.java b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBiomeTagProvider.java index 64d435cc..e4d9ecc6 100644 --- a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBiomeTagProvider.java +++ b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBiomeTagProvider.java @@ -153,6 +153,10 @@ public void configure(RegistryWrapper.WrapperLookup registries) { .addOptional(TerrestriaBiomes.REDWOOD_FOREST) .addOptional(TerrestriaBiomes.SAKURA_FOREST); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD) + .addOptional(TerrestriaBiomes.HEMLOCK_RAINFOREST) + .addOptional(TerrestriaBiomes.SNOWY_HEMLOCK_FOREST); + getOrCreateTagBuilder(ConventionalBiomeTags.IS_WINDSWEPT) .addOptional(TerrestriaBiomes.WINDSWEPT_REDWOOD_FOREST); diff --git a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockLootTableProvider.java b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockLootTableProvider.java index f7b61ffd..50092e55 100644 --- a/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockLootTableProvider.java +++ b/common/src/main/java/com/terraformersmc/terrestria/data/TerrestriaBlockLootTableProvider.java @@ -19,18 +19,13 @@ import java.util.concurrent.CompletableFuture; public class TerrestriaBlockLootTableProvider extends FabricBlockLootTableProvider { - private final CompletableFuture registriesFuture; - protected TerrestriaBlockLootTableProvider(FabricDataOutput output, CompletableFuture registriesFuture) { super(output, registriesFuture); - - this.registriesFuture = registriesFuture; } @Override public void generate() { - RegistryWrapper.Impl enchantmentRegistry = registriesFuture.getNow(null) - .getWrapperOrThrow(RegistryKeys.ENCHANTMENT); + RegistryWrapper.Impl enchantmentRegistry = this.registryLookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT); // simple blocks addDrop(TerrestriaBlocks.AGAVE); diff --git a/gradle.properties b/gradle.properties index bf6803aa..6810252e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ fabric.loom.multiProjectOptimisation=true maven_group=com.terraformersmc archive_name=terrestria -minecraft_version=1.21-pre2 -yarn_mappings=1.21-pre2+build.2 +minecraft_version=1.21-pre4 +yarn_mappings=1.21-pre4+build.3 loader_version=0.15.11 -fabric_version=0.99.4+1.21 +fabric_version=0.100.0+1.21 # Terraform modules terraform_biome_remapper_api_version=11.0.0-alpha.1 @@ -43,7 +43,7 @@ curseforge_optional_dependencies= # Modrinth Metadata modrinth_slug=terrestria modrinth_id=lsUDPMOT -modrinth_game_versions=1.21-pre2 +modrinth_game_versions=1.21-pre4 modrinth_mod_loaders=fabric, quilt modrinth_required_dependencies=fabric-api #modrinth_embedded_dependencies=biolith