Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static LoadedTag loadTag(TagKey<?> tagKey) {
tagEntry.resolve(new TagEntry.ValueGetter<>() {
@Nullable
@Override
public Identifier direct(Identifier id) {
public Identifier direct(Identifier id, boolean required) {
immediateChildIds.add(id);
return id;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.concurrent.CompletableFuture;

import net.minecraft.class_10351;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.registry.tag.BiomeTags;
Expand Down Expand Up @@ -94,6 +95,9 @@ private void generateCategoryTags() {
getOrCreateTagBuilder(ConventionalBiomeTags.IS_BIRCH_FOREST)
.add(BiomeKeys.BIRCH_FOREST)
.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_DARK_FOREST)
.add(BiomeKeys.DARK_FOREST)
.addOptional(class_10351.PALE_GARDEN);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_OCEAN)
.addOptionalTag(BiomeTags.IS_OCEAN)
.addOptionalTag(ConventionalBiomeTags.IS_DEEP_OCEAN)
Expand Down Expand Up @@ -175,6 +179,7 @@ private void generateClimateAndVegetationTags() {
.add(BiomeKeys.SWAMP)
.add(BiomeKeys.STONY_SHORE)
.add(BiomeKeys.DARK_FOREST)
.addOptional(class_10351.PALE_GARDEN)
.add(BiomeKeys.WINDSWEPT_FOREST)
.add(BiomeKeys.BIRCH_FOREST)
.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST)
Expand Down Expand Up @@ -247,6 +252,7 @@ private void generateClimateAndVegetationTags() {

getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_DENSE_OVERWORLD)
.add(BiomeKeys.DARK_FOREST)
.addOptional(class_10351.PALE_GARDEN)
.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST)
.add(BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA)
.add(BiomeKeys.JUNGLE)
Expand Down Expand Up @@ -279,6 +285,7 @@ private void generateClimateAndVegetationTags() {
.add(BiomeKeys.FLOWER_FOREST)
.add(BiomeKeys.BIRCH_FOREST)
.add(BiomeKeys.DARK_FOREST)
.addOptional(class_10351.PALE_GARDEN)
.add(BiomeKeys.OLD_GROWTH_BIRCH_FOREST);
getOrCreateTagBuilder(ConventionalBiomeTags.IS_JUNGLE_TREE)
.addOptionalTag(ConventionalBiomeTags.IS_JUNGLE);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
translationBuilder.add(ConventionalBiomeTags.IS_SNOWY_PLAINS, "Snowy Plains");
translationBuilder.add(ConventionalBiomeTags.IS_FOREST, "Forest");
translationBuilder.add(ConventionalBiomeTags.IS_BIRCH_FOREST, "Birch Forest");
translationBuilder.add(ConventionalBiomeTags.IS_DARK_FOREST, "Dark Forest");
translationBuilder.add(ConventionalBiomeTags.IS_FLOWER_FOREST, "Flower Forest");
translationBuilder.add(ConventionalBiomeTags.IS_TAIGA, "Taiga");
translationBuilder.add(ConventionalBiomeTags.IS_OLD_GROWTH, "Old Growth");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ protected void configure(RegistryWrapper.WrapperLookup registries) {
.add(EntityType.JUNGLE_CHEST_BOAT)
.add(EntityType.ACACIA_CHEST_BOAT)
.add(EntityType.CHERRY_CHEST_BOAT)
.add(EntityType.PALE_OAK_CHEST_BOAT)
.add(EntityType.DARK_OAK_CHEST_BOAT)
.add(EntityType.MANGROVE_CHEST_BOAT)
.add(EntityType.BAMBOO_CHEST_RAFT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -772,97 +772,97 @@ private void generateDyedTags() {
.add(Items.BLACK_BANNER).add(Items.BLACK_BED).add(Items.BLACK_CANDLE).add(Items.BLACK_CARPET)
.add(Items.BLACK_CONCRETE).add(Items.BLACK_CONCRETE_POWDER).add(Items.BLACK_GLAZED_TERRACOTTA)
.add(Items.BLACK_SHULKER_BOX).add(Items.BLACK_STAINED_GLASS).add(Items.BLACK_STAINED_GLASS_PANE)
.add(Items.BLACK_TERRACOTTA).add(Items.BLACK_WOOL);
.add(Items.BLACK_TERRACOTTA).add(Items.BLACK_WOOL).add(Items.BLACK_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.BLUE_DYED)
.add(Items.BLUE_BANNER).add(Items.BLUE_BED).add(Items.BLUE_CANDLE).add(Items.BLUE_CARPET)
.add(Items.BLUE_CONCRETE).add(Items.BLUE_CONCRETE_POWDER).add(Items.BLUE_GLAZED_TERRACOTTA)
.add(Items.BLUE_SHULKER_BOX).add(Items.BLUE_STAINED_GLASS).add(Items.BLUE_STAINED_GLASS_PANE)
.add(Items.BLUE_TERRACOTTA).add(Items.BLUE_WOOL);
.add(Items.BLUE_TERRACOTTA).add(Items.BLUE_WOOL).add(Items.BLUE_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.BROWN_DYED)
.add(Items.BROWN_BANNER).add(Items.BROWN_BED).add(Items.BROWN_CANDLE).add(Items.BROWN_CARPET)
.add(Items.BROWN_CONCRETE).add(Items.BROWN_CONCRETE_POWDER).add(Items.BROWN_GLAZED_TERRACOTTA)
.add(Items.BROWN_SHULKER_BOX).add(Items.BROWN_STAINED_GLASS).add(Items.BROWN_STAINED_GLASS_PANE)
.add(Items.BROWN_TERRACOTTA).add(Items.BROWN_WOOL);
.add(Items.BROWN_TERRACOTTA).add(Items.BROWN_WOOL).add(Items.BROWN_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.CYAN_DYED)
.add(Items.CYAN_BANNER).add(Items.CYAN_BED).add(Items.CYAN_CANDLE).add(Items.CYAN_CARPET)
.add(Items.CYAN_CONCRETE).add(Items.CYAN_CONCRETE_POWDER).add(Items.CYAN_GLAZED_TERRACOTTA)
.add(Items.CYAN_SHULKER_BOX).add(Items.CYAN_STAINED_GLASS).add(Items.CYAN_STAINED_GLASS_PANE)
.add(Items.CYAN_TERRACOTTA).add(Items.CYAN_WOOL);
.add(Items.CYAN_TERRACOTTA).add(Items.CYAN_WOOL).add(Items.CYAN_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.GRAY_DYED)
.add(Items.GRAY_BANNER).add(Items.GRAY_BED).add(Items.GRAY_CANDLE).add(Items.GRAY_CARPET)
.add(Items.GRAY_CONCRETE).add(Items.GRAY_CONCRETE_POWDER).add(Items.GRAY_GLAZED_TERRACOTTA)
.add(Items.GRAY_SHULKER_BOX).add(Items.GRAY_STAINED_GLASS).add(Items.GRAY_STAINED_GLASS_PANE)
.add(Items.GRAY_TERRACOTTA).add(Items.GRAY_WOOL);
.add(Items.GRAY_TERRACOTTA).add(Items.GRAY_WOOL).add(Items.GRAY_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.GREEN_DYED)
.add(Items.GREEN_BANNER).add(Items.GREEN_BED).add(Items.GREEN_CANDLE).add(Items.GREEN_CARPET)
.add(Items.GREEN_CONCRETE).add(Items.GREEN_CONCRETE_POWDER).add(Items.GREEN_GLAZED_TERRACOTTA)
.add(Items.GREEN_SHULKER_BOX).add(Items.GREEN_STAINED_GLASS).add(Items.GREEN_STAINED_GLASS_PANE)
.add(Items.GREEN_TERRACOTTA).add(Items.GREEN_WOOL);
.add(Items.GREEN_TERRACOTTA).add(Items.GREEN_WOOL).add(Items.GREEN_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.LIGHT_BLUE_DYED)
.add(Items.LIGHT_BLUE_BANNER).add(Items.LIGHT_BLUE_BED).add(Items.LIGHT_BLUE_CANDLE).add(Items.LIGHT_BLUE_CARPET)
.add(Items.LIGHT_BLUE_CONCRETE).add(Items.LIGHT_BLUE_CONCRETE_POWDER).add(Items.LIGHT_BLUE_GLAZED_TERRACOTTA)
.add(Items.LIGHT_BLUE_SHULKER_BOX).add(Items.LIGHT_BLUE_STAINED_GLASS).add(Items.LIGHT_BLUE_STAINED_GLASS_PANE)
.add(Items.LIGHT_BLUE_TERRACOTTA).add(Items.LIGHT_BLUE_WOOL);
.add(Items.LIGHT_BLUE_TERRACOTTA).add(Items.LIGHT_BLUE_WOOL).add(Items.LIGHT_BLUE_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.LIGHT_GRAY_DYED)
.add(Items.LIGHT_GRAY_BANNER).add(Items.LIGHT_GRAY_BED).add(Items.LIGHT_GRAY_CANDLE).add(Items.LIGHT_GRAY_CARPET)
.add(Items.LIGHT_GRAY_CONCRETE).add(Items.LIGHT_GRAY_CONCRETE_POWDER).add(Items.LIGHT_GRAY_GLAZED_TERRACOTTA)
.add(Items.LIGHT_GRAY_SHULKER_BOX).add(Items.LIGHT_GRAY_STAINED_GLASS).add(Items.LIGHT_GRAY_STAINED_GLASS_PANE)
.add(Items.LIGHT_GRAY_TERRACOTTA).add(Items.LIGHT_GRAY_WOOL);
.add(Items.LIGHT_GRAY_TERRACOTTA).add(Items.LIGHT_GRAY_WOOL).add(Items.LIGHT_GRAY_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.LIME_DYED)
.add(Items.LIME_BANNER).add(Items.LIME_BED).add(Items.LIME_CANDLE).add(Items.LIME_CARPET)
.add(Items.LIME_CONCRETE).add(Items.LIME_CONCRETE_POWDER).add(Items.LIME_GLAZED_TERRACOTTA)
.add(Items.LIME_SHULKER_BOX).add(Items.LIME_STAINED_GLASS).add(Items.LIME_STAINED_GLASS_PANE)
.add(Items.LIME_TERRACOTTA).add(Items.LIME_WOOL);
.add(Items.LIME_TERRACOTTA).add(Items.LIME_WOOL).add(Items.LIME_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.MAGENTA_DYED)
.add(Items.MAGENTA_BANNER).add(Items.MAGENTA_BED).add(Items.MAGENTA_CANDLE).add(Items.MAGENTA_CARPET)
.add(Items.MAGENTA_CONCRETE).add(Items.MAGENTA_CONCRETE_POWDER).add(Items.MAGENTA_GLAZED_TERRACOTTA)
.add(Items.MAGENTA_SHULKER_BOX).add(Items.MAGENTA_STAINED_GLASS).add(Items.MAGENTA_STAINED_GLASS_PANE)
.add(Items.MAGENTA_TERRACOTTA).add(Items.MAGENTA_WOOL);
.add(Items.MAGENTA_TERRACOTTA).add(Items.MAGENTA_WOOL).add(Items.MAGENTA_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.ORANGE_DYED)
.add(Items.ORANGE_BANNER).add(Items.ORANGE_BED).add(Items.ORANGE_CANDLE).add(Items.ORANGE_CARPET)
.add(Items.ORANGE_CONCRETE).add(Items.ORANGE_CONCRETE_POWDER).add(Items.ORANGE_GLAZED_TERRACOTTA)
.add(Items.ORANGE_SHULKER_BOX).add(Items.ORANGE_STAINED_GLASS).add(Items.ORANGE_STAINED_GLASS_PANE)
.add(Items.ORANGE_TERRACOTTA).add(Items.ORANGE_WOOL);
.add(Items.ORANGE_TERRACOTTA).add(Items.ORANGE_WOOL).add(Items.ORANGE_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.PINK_DYED)
.add(Items.PINK_BANNER).add(Items.PINK_BED).add(Items.PINK_CANDLE).add(Items.PINK_CARPET)
.add(Items.PINK_CONCRETE).add(Items.PINK_CONCRETE_POWDER).add(Items.PINK_GLAZED_TERRACOTTA)
.add(Items.PINK_SHULKER_BOX).add(Items.PINK_STAINED_GLASS).add(Items.PINK_STAINED_GLASS_PANE)
.add(Items.PINK_TERRACOTTA).add(Items.PINK_WOOL);
.add(Items.PINK_TERRACOTTA).add(Items.PINK_WOOL).add(Items.PINK_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.PURPLE_DYED)
.add(Items.PURPLE_BANNER).add(Items.PURPLE_BED).add(Items.PURPLE_CANDLE).add(Items.PURPLE_CARPET)
.add(Items.PURPLE_CONCRETE).add(Items.PURPLE_CONCRETE_POWDER).add(Items.PURPLE_GLAZED_TERRACOTTA)
.add(Items.PURPLE_SHULKER_BOX).add(Items.PURPLE_STAINED_GLASS).add(Items.PURPLE_STAINED_GLASS_PANE)
.add(Items.PURPLE_TERRACOTTA).add(Items.PURPLE_WOOL);
.add(Items.PURPLE_TERRACOTTA).add(Items.PURPLE_WOOL).add(Items.PURPLE_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.RED_DYED)
.add(Items.RED_BANNER).add(Items.RED_BED).add(Items.RED_CANDLE).add(Items.RED_CARPET)
.add(Items.RED_CONCRETE).add(Items.RED_CONCRETE_POWDER).add(Items.RED_GLAZED_TERRACOTTA)
.add(Items.RED_SHULKER_BOX).add(Items.RED_STAINED_GLASS).add(Items.RED_STAINED_GLASS_PANE)
.add(Items.RED_TERRACOTTA).add(Items.RED_WOOL);
.add(Items.RED_TERRACOTTA).add(Items.RED_WOOL).add(Items.RED_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.WHITE_DYED)
.add(Items.WHITE_BANNER).add(Items.WHITE_BED).add(Items.WHITE_CANDLE).add(Items.WHITE_CARPET)
.add(Items.WHITE_CONCRETE).add(Items.WHITE_CONCRETE_POWDER).add(Items.WHITE_GLAZED_TERRACOTTA)
.add(Items.WHITE_SHULKER_BOX).add(Items.WHITE_STAINED_GLASS).add(Items.WHITE_STAINED_GLASS_PANE)
.add(Items.WHITE_TERRACOTTA).add(Items.WHITE_WOOL);
.add(Items.WHITE_TERRACOTTA).add(Items.WHITE_WOOL).add(Items.WHITE_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.YELLOW_DYED)
.add(Items.YELLOW_BANNER).add(Items.YELLOW_BED).add(Items.YELLOW_CANDLE).add(Items.YELLOW_CARPET)
.add(Items.YELLOW_CONCRETE).add(Items.YELLOW_CONCRETE_POWDER).add(Items.YELLOW_GLAZED_TERRACOTTA)
.add(Items.YELLOW_SHULKER_BOX).add(Items.YELLOW_STAINED_GLASS).add(Items.YELLOW_STAINED_GLASS_PANE)
.add(Items.YELLOW_TERRACOTTA).add(Items.YELLOW_WOOL);
.add(Items.YELLOW_TERRACOTTA).add(Items.YELLOW_WOOL).add(Items.YELLOW_BUNDLE);

getOrCreateTagBuilder(ConventionalItemTags.DYED)
.addTag(ConventionalItemTags.WHITE_DYED)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@
"tag.worldgen.biome.c.is_cold": "Cold",
"tag.worldgen.biome.c.is_cold.end": "Cold End",
"tag.worldgen.biome.c.is_cold.overworld": "Cold Overworld",
"tag.worldgen.biome.c.is_dark_forest": "Dark Forest",
"tag.worldgen.biome.c.is_dead": "Dead",
"tag.worldgen.biome.c.is_deep_ocean": "Deep Ocean",
"tag.worldgen.biome.c.is_dense_vegetation": "Dense Vegetation",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"minecraft:jungle_chest_boat",
"minecraft:acacia_chest_boat",
"minecraft:cherry_chest_boat",
"minecraft:pale_oak_chest_boat",
"minecraft:dark_oak_chest_boat",
"minecraft:mangrove_chest_boat",
"minecraft:bamboo_chest_raft"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:black_stained_glass",
"minecraft:black_stained_glass_pane",
"minecraft:black_terracotta",
"minecraft:black_wool"
"minecraft:black_wool",
"minecraft:black_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:blue_stained_glass",
"minecraft:blue_stained_glass_pane",
"minecraft:blue_terracotta",
"minecraft:blue_wool"
"minecraft:blue_wool",
"minecraft:blue_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:brown_stained_glass",
"minecraft:brown_stained_glass_pane",
"minecraft:brown_terracotta",
"minecraft:brown_wool"
"minecraft:brown_wool",
"minecraft:brown_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:cyan_stained_glass",
"minecraft:cyan_stained_glass_pane",
"minecraft:cyan_terracotta",
"minecraft:cyan_wool"
"minecraft:cyan_wool",
"minecraft:cyan_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:gray_stained_glass",
"minecraft:gray_stained_glass_pane",
"minecraft:gray_terracotta",
"minecraft:gray_wool"
"minecraft:gray_wool",
"minecraft:gray_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:green_stained_glass",
"minecraft:green_stained_glass_pane",
"minecraft:green_terracotta",
"minecraft:green_wool"
"minecraft:green_wool",
"minecraft:green_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:light_blue_stained_glass",
"minecraft:light_blue_stained_glass_pane",
"minecraft:light_blue_terracotta",
"minecraft:light_blue_wool"
"minecraft:light_blue_wool",
"minecraft:light_blue_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:light_gray_stained_glass",
"minecraft:light_gray_stained_glass_pane",
"minecraft:light_gray_terracotta",
"minecraft:light_gray_wool"
"minecraft:light_gray_wool",
"minecraft:light_gray_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:lime_stained_glass",
"minecraft:lime_stained_glass_pane",
"minecraft:lime_terracotta",
"minecraft:lime_wool"
"minecraft:lime_wool",
"minecraft:lime_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:magenta_stained_glass",
"minecraft:magenta_stained_glass_pane",
"minecraft:magenta_terracotta",
"minecraft:magenta_wool"
"minecraft:magenta_wool",
"minecraft:magenta_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:orange_stained_glass",
"minecraft:orange_stained_glass_pane",
"minecraft:orange_terracotta",
"minecraft:orange_wool"
"minecraft:orange_wool",
"minecraft:orange_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:pink_stained_glass",
"minecraft:pink_stained_glass_pane",
"minecraft:pink_terracotta",
"minecraft:pink_wool"
"minecraft:pink_wool",
"minecraft:pink_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:purple_stained_glass",
"minecraft:purple_stained_glass_pane",
"minecraft:purple_terracotta",
"minecraft:purple_wool"
"minecraft:purple_wool",
"minecraft:purple_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:red_stained_glass",
"minecraft:red_stained_glass_pane",
"minecraft:red_terracotta",
"minecraft:red_wool"
"minecraft:red_wool",
"minecraft:red_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:white_stained_glass",
"minecraft:white_stained_glass_pane",
"minecraft:white_terracotta",
"minecraft:white_wool"
"minecraft:white_wool",
"minecraft:white_bundle"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"minecraft:yellow_stained_glass",
"minecraft:yellow_stained_glass_pane",
"minecraft:yellow_terracotta",
"minecraft:yellow_wool"
"minecraft:yellow_wool",
"minecraft:yellow_bundle"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"values": [
"minecraft:dark_forest",
{
"id": "minecraft:pale_garden",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"values": [
"minecraft:dark_forest",
{
"id": "minecraft:pale_garden",
"required": false
},
"minecraft:old_growth_birch_forest",
"minecraft:old_growth_spruce_taiga",
"minecraft:jungle",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
"minecraft:swamp",
"minecraft:stony_shore",
"minecraft:dark_forest",
{
"id": "minecraft:pale_garden",
"required": false
},
"minecraft:windswept_forest",
"minecraft:birch_forest",
"minecraft:old_growth_birch_forest",
Expand Down
Loading