Skip to content

Commit

Permalink
Update to 1.21-pre2.
Browse files Browse the repository at this point in the history
- Update to 1.21-pre2
  • Loading branch information
gniftygnome committed Jun 1, 2024
1 parent 0aba221 commit b49635e
Show file tree
Hide file tree
Showing 12 changed files with 131 additions and 120 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public void onInitializeClient() {
}

private static void registerEntityRenderers() {
TerraformBoatClientHelper.registerModelLayers(new Identifier(Traverse.MOD_ID, "fir"), false);
TerraformBoatClientHelper.registerModelLayers(Identifier.of(Traverse.MOD_ID, "fir"), false);
}

private static void registerRenderLayers() {
Expand Down
1 change: 1 addition & 0 deletions client/src/main/resources/assets/traverse/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"itemGroup.traverse.items": "Traverse Items",
"tag.item.traverse.fir_logs": "Fir Logs",

"biome.traverse.arid_highlands": "Arid Highlands",
"biome.traverse.autumnal_woods": "Autumnal Woods",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.terraformersmc.traverse.block;

import com.terraformersmc.terraform.sign.block.TerraformHangingSignBlock;
import com.terraformersmc.terraform.sign.block.TerraformSignBlock;
import com.terraformersmc.terraform.sign.block.TerraformWallHangingSignBlock;
import com.terraformersmc.terraform.sign.block.TerraformWallSignBlock;
import com.terraformersmc.terraform.wood.block.PillarLogHelper;
import com.terraformersmc.terraform.sign.api.block.TerraformHangingSignBlock;
import com.terraformersmc.terraform.sign.api.block.TerraformSignBlock;
import com.terraformersmc.terraform.sign.api.block.TerraformWallHangingSignBlock;
import com.terraformersmc.terraform.sign.api.block.TerraformWallSignBlock;
import com.terraformersmc.terraform.wood.api.block.PillarLogHelper;
import com.terraformersmc.traverse.Traverse;
import com.terraformersmc.traverse.feature.TraverseConfiguredFeatures;
import com.terraformersmc.traverse.init.helpers.TraverseRegistry;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.terraformersmc.traverse.biome.TraverseBiomes;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
import net.fabricmc.fabric.api.tag.convention.v1.ConventionalBiomeTags;
import net.fabricmc.fabric.api.tag.convention.v2.ConventionalBiomeTags;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.registry.tag.BiomeTags;
Expand All @@ -24,145 +24,164 @@ public void configure(RegistryWrapper.WrapperLookup registries) {
* Vanilla biome categories
*/
getOrCreateTagBuilder(BiomeTags.ALLOWS_SURFACE_SLIME_SPAWNS)
.addOptional(TraverseBiomes.LUSH_SWAMP);
.addOptional(TraverseBiomes.LUSH_SWAMP);

getOrCreateTagBuilder(BiomeTags.IS_FOREST)
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(BiomeTags.IS_TAIGA)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);

getOrCreateTagBuilder(BiomeTags.SPAWNS_COLD_VARIANT_FROGS)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);

getOrCreateTagBuilder(BiomeTags.SPAWNS_WARM_VARIANT_FROGS)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND);
.addOptional(TraverseBiomes.DESERT_SHRUBLAND);

getOrCreateTagBuilder(BiomeTags.WATER_ON_MAP_OUTLINES)
.addOptional(TraverseBiomes.LUSH_SWAMP);
.addOptional(TraverseBiomes.LUSH_SWAMP);


/*
* Conventional biome categories
*/
getOrCreateTagBuilder(ConventionalBiomeTags.CLIMATE_TEMPERATE)
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.LUSH_SWAMP)
.addOptional(TraverseBiomes.WOODLANDS);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_COLD_OVERWORLD)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);

getOrCreateTagBuilder(ConventionalBiomeTags.DESERT)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_CONIFEROUS_TREE)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST);

getOrCreateTagBuilder(ConventionalBiomeTags.PLAINS)
.addOptional(TraverseBiomes.FLATLANDS);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_DECIDUOUS_TREE)
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.LUSH_SWAMP)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(ConventionalBiomeTags.IN_OVERWORLD)
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.LUSH_SWAMP)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_DESERT)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND);

getOrCreateTagBuilder(ConventionalBiomeTags.SNOWY)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_HOT_OVERWORLD)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND);

getOrCreateTagBuilder(ConventionalBiomeTags.SWAMP)
.addOptional(TraverseBiomes.LUSH_SWAMP);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_OVERWORLD)
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.LUSH_SWAMP)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(ConventionalBiomeTags.TREE_CONIFEROUS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_PLAINS)
.addOptional(TraverseBiomes.FLATLANDS);

getOrCreateTagBuilder(ConventionalBiomeTags.TREE_DECIDUOUS)
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.LUSH_SWAMP)
.addOptional(TraverseBiomes.WOODLANDS);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_SNOWY)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);

getOrCreateTagBuilder(ConventionalBiomeTags.IS_SWAMP)
.addOptional(TraverseBiomes.LUSH_SWAMP);

getOrCreateTagBuilder(ConventionalBiomeTags.IS_TEMPERATE_OVERWORLD)
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.LUSH_SWAMP)
.addOptional(TraverseBiomes.WOODLANDS);


/*
* Biome structure generation tags
*/
getOrCreateTagBuilder(BiomeTags.IGLOO_HAS_STRUCTURE)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST);

getOrCreateTagBuilder(BiomeTags.MINESHAFT_HAS_STRUCTURE)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.LUSH_SWAMP);
.addOptional(TraverseBiomes.DESERT_SHRUBLAND)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.LUSH_SWAMP);

getOrCreateTagBuilder(BiomeTags.PILLAGER_OUTPOST_HAS_STRUCTURE)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_DESERT_HAS_STRUCTURE)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND);
.addOptional(TraverseBiomes.DESERT_SHRUBLAND);

getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_STANDARD_HAS_STRUCTURE)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(BiomeTags.RUINED_PORTAL_SWAMP_HAS_STRUCTURE)
.addOptional(TraverseBiomes.LUSH_SWAMP);
.addOptional(TraverseBiomes.LUSH_SWAMP);

getOrCreateTagBuilder(BiomeTags.STRONGHOLD_HAS_STRUCTURE)
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.LUSH_SWAMP)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.LUSH_SWAMP)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(BiomeTags.SWAMP_HUT_HAS_STRUCTURE)
.addOptional(TraverseBiomes.LUSH_SWAMP);
.addOptional(TraverseBiomes.LUSH_SWAMP);

getOrCreateTagBuilder(BiomeTags.TRAIL_RUINS_HAS_STRUCTURE)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(BiomeTags.TRIAL_CHAMBERS_HAS_STRUCTURE)
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.LUSH_SWAMP)
.addOptional(TraverseBiomes.SNOWY_CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(BiomeTags.VILLAGE_DESERT_HAS_STRUCTURE)
.addOptional(TraverseBiomes.DESERT_SHRUBLAND);
.addOptional(TraverseBiomes.DESERT_SHRUBLAND);

getOrCreateTagBuilder(BiomeTags.VILLAGE_PLAINS_HAS_STRUCTURE)
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.WOODLANDS);
.addOptional(TraverseBiomes.FLATLANDS)
.addOptional(TraverseBiomes.WOODLANDS);


/*
* Compatibility tags for Wilder Wild
*/
getOrCreateTagBuilder(TagKey.of(registryRef, new Identifier("wilderwild", "forest_grass")))
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);
getOrCreateTagBuilder(TagKey.of(registryRef, Identifier.of("wilderwild", "forest_grass")))
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(TagKey.of(registryRef, new Identifier("wilderwild", "has_carnation")))
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);
getOrCreateTagBuilder(TagKey.of(registryRef, Identifier.of("wilderwild", "has_carnation")))
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(TagKey.of(registryRef, new Identifier("wilderwild", "has_seeding_dandelion")))
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);
getOrCreateTagBuilder(TagKey.of(registryRef, Identifier.of("wilderwild", "has_seeding_dandelion")))
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.CONIFEROUS_FOREST)
.addOptional(TraverseBiomes.WOODLANDS);

getOrCreateTagBuilder(TagKey.of(registryRef, new Identifier("wilderwild", "has_rare_seeding_dandelion")))
.addOptional(TraverseBiomes.FLATLANDS);
getOrCreateTagBuilder(TagKey.of(registryRef, Identifier.of("wilderwild", "has_rare_seeding_dandelion")))
.addOptional(TraverseBiomes.FLATLANDS);

getOrCreateTagBuilder(TagKey.of(registryRef, new Identifier("wilderwild", "has_milkweed")))
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.LUSH_SWAMP);
getOrCreateTagBuilder(TagKey.of(registryRef, Identifier.of("wilderwild", "has_milkweed")))
.addOptional(TraverseBiomes.AUTUMNAL_WOODS)
.addOptional(TraverseBiomes.LUSH_SWAMP);

getOrCreateTagBuilder(TagKey.of(registryRef, new Identifier("wilderwild", "has_cattail_common")))
.addOptional(TraverseBiomes.LUSH_SWAMP);
getOrCreateTagBuilder(TagKey.of(registryRef, Identifier.of("wilderwild", "has_cattail_common")))
.addOptional(TraverseBiomes.LUSH_SWAMP);

getOrCreateTagBuilder(TagKey.of(registryRef, new Identifier("wilderwild", "firefly_spawnable_during_day")))
.addOptional(TraverseBiomes.LUSH_SWAMP);
getOrCreateTagBuilder(TagKey.of(registryRef, Identifier.of("wilderwild", "firefly_spawnable_during_day")))
.addOptional(TraverseBiomes.LUSH_SWAMP);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,5 @@ public void configure(RegistryWrapper.WrapperLookup registries) {


copy(TraverseBlockTags.FIR_LOGS, TraverseItemTags.FIR_LOGS);

copy(TraverseBlockTags.PLANKS_THAT_BURN, TraverseItemTags.PLANKS_THAT_BURN);

copy(TraverseBlockTags.STRIPPED_LOGS, TraverseItemTags.STRIPPED_LOGS);

copy(TraverseBlockTags.STRIPPED_WOOD, TraverseItemTags.STRIPPED_WOOD);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,18 @@ public void generate(RecipeExporter exporter) {
.pattern("LL")
.input('L', TraverseBlocks.FIR_LOG)
.criterion("has_logs", InventoryChangedCriterion.Conditions.items(TraverseBlocks.FIR_LOG))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "fir_wood"));
.offerTo(exporter, Identifier.of(Traverse.MOD_ID, "fir_wood"));

new ShapedRecipeJsonBuilder(RecipeCategory.BUILDING_BLOCKS, TraverseBlocks.STRIPPED_FIR_WOOD, 3)
.pattern("LL")
.pattern("LL")
.input('L', TraverseBlocks.STRIPPED_FIR_LOG)
.criterion("has_logs", InventoryChangedCriterion.Conditions.items(TraverseBlocks.STRIPPED_FIR_LOG))
.offerTo(exporter, new Identifier(Traverse.MOD_ID, "stripped_fir_wood"));
.offerTo(exporter, Identifier.of(Traverse.MOD_ID, "stripped_fir_wood"));
}

@Override
protected Identifier getRecipeIdentifier(Identifier identifier) {
return new Identifier(Traverse.MOD_ID, identifier.getPath());
return Identifier.of(Traverse.MOD_ID, identifier.getPath());
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.terraformersmc.traverse.feature.placer;

import com.terraformersmc.terraform.tree.placer.PlacerTypes;
import com.terraformersmc.terraform.tree.api.placer.PlacerTypes;
import net.minecraft.world.gen.foliage.FoliagePlacerType;
import net.minecraft.world.gen.trunk.TrunkPlacerType;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.terraformersmc.traverse.init;

import com.terraformersmc.terraform.tree.merchant.TerraformSaplingTradeHelper;
import com.terraformersmc.terraform.tree.api.merchant.TerraformSaplingTradeHelper;
import com.terraformersmc.traverse.item.TraverseItems;

public class TraverseTrades {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

public final class TraverseItemTags {
public static final TagKey<Item> FIR_LOGS = TraverseItemTags.of("fir_logs");
public static final TagKey<Item> PLANKS_THAT_BURN = TraverseItemTags.of(Identifier.of("c", "planks_that_burn"));
public static final TagKey<Item> STRIPPED_LOGS = TraverseItemTags.of(Identifier.of("c", "stripped_logs"));
public static final TagKey<Item> STRIPPED_WOOD = TraverseItemTags.of(Identifier.of("c", "stripped_wood"));

@SuppressWarnings("UnnecessaryReturnStatement")
private TraverseItemTags() {
Expand Down
26 changes: 13 additions & 13 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ fabric.loom.multiProjectOptimisation=true
maven_group=com.terraformersmc
archive_name=traverse

minecraft_version=1.20.5
yarn_mappings=1.20.5+build.1
loader_version=0.15.10
fabric_version=0.97.6+1.20.5
terraform_biome_remapper_api_version=10.0.0-beta.1
terraform_config_api_version=10.0.0-beta.1
terraform_surfaces_api_version=10.0.0-beta.1
terraform_tree_api_version=10.0.0-beta.1
terraform_wood_api_version=10.0.0-beta.1
minecraft_version=1.21-pre2
yarn_mappings=1.21-pre2+build.2
loader_version=0.15.11
fabric_version=0.99.4+1.21
terraform_biome_remapper_api_version=11.0.0-alpha.1
terraform_config_api_version=11.0.0-alpha.1
terraform_surfaces_api_version=11.0.0-alpha.1
terraform_tree_api_version=11.0.0-alpha.1
terraform_wood_api_version=11.0.0-alpha.1

# Biolith for worldgen module and testing
biolith_version=2.1.0-alpha.4
biolith_version=2.2.0-alpha.1

# TerraBlender for worldgen module and testing
terrablender_version=1.20.4-3.3.0.12
terrablender_version=1.20.6-3.5.0.5

# Project Metadata
project_name=Traverse
Expand All @@ -31,14 +31,14 @@ default_release_type=alpha
# CurseForge Metadata
curseforge_slug=traverse
curseforge_id=308777
curseforge_game_versions=1.20.5, Fabric, Quilt
curseforge_game_versions=1.21-Snapshot, Fabric, Quilt
curseforge_required_dependencies=fabric-api
curseforge_optional_dependencies=

# Modrinth Metadata
modrinth_slug=traverse
modrinth_id=kXygSBVI
modrinth_game_versions=1.20.5
modrinth_game_versions=1.21-pre2
modrinth_mod_loaders=fabric, quilt
modrinth_required_dependencies=fabric-api
#modrinth_embedded_dependencies=biolith
Expand Down
Loading

0 comments on commit b49635e

Please sign in to comment.