From e5c736706daeaa44b91052b63171a1b431e5187c Mon Sep 17 00:00:00 2001 From: nelle Date: Sun, 22 Dec 2024 00:23:03 -0700 Subject: [PATCH] 1.21.2 work --- MC20.5-21.1/build.gradle.kts | 2 +- MC21.2/build.gradle.kts | 99 ++++++++++++++ MC21.2/gradle.properties | 18 +++ .../nelle/roses/RosesDataGenerator.java | 33 +++++ .../roses/datagen/RosesBlockTagProvider.java | 30 ++++ .../roses/datagen/RosesLootTableProvider.java | 45 ++++++ .../roses/datagen/RosesRecipeProvider.java | 45 ++++++ .../roses/datagen/RosesRegistryGenerator.java | 25 ++++ .../roses/world/RosesConfiguredFeatures.java | 57 ++++++++ .../roses/world/RosesPlacedFeatures.java | 94 +++++++++++++ .../world/gen/RosesVegetationGeneration.java | 128 ++++++++++++++++++ .../roses/world/gen/RosesWorldGeneration.java | 7 + .../observer/nelle/roses/RosesBlocks.kt | 69 ++++++++++ .../observer/nelle/roses/RosesCreativeTab.kt | 32 +++++ .../kotlin/observer/nelle/roses/RosesMod.kt | 23 ++++ .../observer/nelle/roses/RosesModClient.kt | 18 +++ .../roses_mod/blockstates/cyan_rose.json | 5 + .../roses_mod/blockstates/cyan_rose_bush.json | 10 ++ .../roses_mod/blockstates/potted_cyan.json | 5 + .../roses_mod/blockstates/potted_rose.json | 5 + .../roses_mod/blockstates/rose_flower.json | 5 + .../main/resources/assets/roses_mod/icon.png | Bin 0 -> 7582 bytes .../assets/roses_mod/lang/en_us.json | 7 + .../roses_mod/models/block/cyan_rose.json | 6 + .../models/block/cyan_rose_bush_bottom.json | 6 + .../models/block/cyan_rose_bush_top.json | 6 + .../roses_mod/models/block/potted_cyan.json | 6 + .../roses_mod/models/block/potted_rose.json | 6 + .../roses_mod/models/block/rose_flower.json | 6 + .../roses_mod/models/item/cyan_rose.json | 6 + .../roses_mod/models/item/cyan_rose_bush.json | 6 + .../roses_mod/models/item/rose_flower.json | 6 + .../roses_mod/textures/block/cyan_rose.png | Bin 0 -> 237 bytes .../textures/block/cyan_rose_bush_bottom.png | Bin 0 -> 6255 bytes .../textures/block/cyan_rose_bush_top.png | Bin 0 -> 5841 bytes .../roses_mod/textures/block/rose_flower.png | Bin 0 -> 248 bytes MC21.2/src/main/resources/fabric.mod.json | 42 ++++++ .../minecraft/tags/blocks/flower_pots.json | 7 + .../minecraft/tags/blocks/small_flowers.json | 7 + .../minecraft/tags/blocks/tall_flowers.json | 6 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes settings.gradle.kts | 2 +- 42 files changed, 878 insertions(+), 2 deletions(-) create mode 100644 MC21.2/build.gradle.kts create mode 100644 MC21.2/gradle.properties create mode 100644 MC21.2/src/main/java/observer/nelle/roses/RosesDataGenerator.java create mode 100644 MC21.2/src/main/java/observer/nelle/roses/datagen/RosesBlockTagProvider.java create mode 100644 MC21.2/src/main/java/observer/nelle/roses/datagen/RosesLootTableProvider.java create mode 100644 MC21.2/src/main/java/observer/nelle/roses/datagen/RosesRecipeProvider.java create mode 100644 MC21.2/src/main/java/observer/nelle/roses/datagen/RosesRegistryGenerator.java create mode 100644 MC21.2/src/main/java/observer/nelle/roses/world/RosesConfiguredFeatures.java create mode 100644 MC21.2/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java create mode 100644 MC21.2/src/main/java/observer/nelle/roses/world/gen/RosesVegetationGeneration.java create mode 100644 MC21.2/src/main/java/observer/nelle/roses/world/gen/RosesWorldGeneration.java create mode 100644 MC21.2/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt create mode 100644 MC21.2/src/main/kotlin/observer/nelle/roses/RosesCreativeTab.kt create mode 100644 MC21.2/src/main/kotlin/observer/nelle/roses/RosesMod.kt create mode 100644 MC21.2/src/main/kotlin/observer/nelle/roses/RosesModClient.kt create mode 100644 MC21.2/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/blockstates/potted_rose.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/blockstates/rose_flower.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/icon.png create mode 100644 MC21.2/src/main/resources/assets/roses_mod/lang/en_us.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/models/block/cyan_rose.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_bottom.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/models/block/cyan_rose_bush_top.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/models/block/potted_cyan.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/models/block/potted_rose.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/models/block/rose_flower.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/models/item/cyan_rose.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/models/item/cyan_rose_bush.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/models/item/rose_flower.json create mode 100644 MC21.2/src/main/resources/assets/roses_mod/textures/block/cyan_rose.png create mode 100644 MC21.2/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png create mode 100644 MC21.2/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png create mode 100644 MC21.2/src/main/resources/assets/roses_mod/textures/block/rose_flower.png create mode 100644 MC21.2/src/main/resources/fabric.mod.json create mode 100644 MC21.2/src/main/resources/old/data/minecraft/tags/blocks/flower_pots.json create mode 100644 MC21.2/src/main/resources/old/data/minecraft/tags/blocks/small_flowers.json create mode 100644 MC21.2/src/main/resources/old/data/minecraft/tags/blocks/tall_flowers.json create mode 100644 gradle/wrapper/gradle-wrapper.jar diff --git a/MC20.5-21.1/build.gradle.kts b/MC20.5-21.1/build.gradle.kts index 21ed80a..c374f12 100644 --- a/MC20.5-21.1/build.gradle.kts +++ b/MC20.5-21.1/build.gradle.kts @@ -35,7 +35,7 @@ repositories { dependencies { // To change the versions see the gradle.properties file - minecraft("com.mojang:minecraft:1.20.6") + minecraft("com.mojang:minecraft:${project.property("minecraft_version")}") mappings("net.fabricmc:yarn:${project.property("yarn_mappings")}:v2") modImplementation("net.fabricmc:fabric-loader:${project.property("loader_version")}") modImplementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}") diff --git a/MC21.2/build.gradle.kts b/MC21.2/build.gradle.kts new file mode 100644 index 0000000..c374f12 --- /dev/null +++ b/MC21.2/build.gradle.kts @@ -0,0 +1,99 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + java + id("org.jetbrains.kotlin.jvm") version "2.1.0" + id("fabric-loom") version "1.9-SNAPSHOT" + id("com.modrinth.minotaur") version "2.+" + id("maven-publish") +} + +version = project.property("mod_version") as String +group = project.property("maven_group") as String + +base { + archivesName.set(project.property("archives_base_name") as String) +} + +val targetJavaVersion = 21 +java { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft("com.mojang:minecraft:${project.property("minecraft_version")}") + mappings("net.fabricmc:yarn:${project.property("yarn_mappings")}:v2") + modImplementation("net.fabricmc:fabric-loader:${project.property("loader_version")}") + modImplementation("net.fabricmc:fabric-language-kotlin:${project.property("kotlin_loader_version")}") + modImplementation("net.fabricmc.fabric-api:fabric-api:${project.property("fabric_version")}") +} + +modrinth { + token.set(System.getenv("MODRINTH_TOKEN")) + projectId.set("Hxo4BmMk") + versionNumber.set(project.property("mod_version").toString()) + versionType.set("release") + uploadFile.set(tasks.jar) + gameVersions.addAll("1.20.5", "1.20.6", "1.21", "1.21.1") + loaders.addAll("fabric", "quilt") + dependencies { + // The scope can be `required`, `optional`, `incompatible`, or `embedded` + // The type can either be `project` or `version` + required.project("fabric-api") + required.project("fabric-language-kotlin") + } + syncBodyFrom = rootProject.file("README.md").readText() +} + +tasks.processResources { + inputs.property("version", project.property("mod_version")) + inputs.property("minecraft_version", project.property("minecraft_version")) + inputs.property("loader_version", project.property("loader_version")) + filteringCharset = "UTF-8" + + filesMatching("fabric.mod.json") { + expand( + "version" to project.property("mod_version"), + "minecraft_version" to project.property("minecraft_version"), + "loader_version" to project.property("loader_version"), + "kotlin_loader_version" to project.property("kotlin_loader_version"), + ) + } +} + +tasks.withType().configureEach { + // ensure that the encoding is set to UTF-8, no matter what the system default is + // this fixes some edge cases with special characters not displaying correctly + // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html + // If Javadoc is generated, this must be specified in that task too. + options.encoding = "UTF-8" + options.release.set(targetJavaVersion) +} + +tasks.withType().configureEach { + compilerOptions.jvmTarget.set(JvmTarget.fromTarget(targetJavaVersion.toString())) +} + +tasks.jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName}" } + } +} + +fabricApi { + configureDataGeneration() +} diff --git a/MC21.2/gradle.properties b/MC21.2/gradle.properties new file mode 100644 index 0000000..bf80d76 --- /dev/null +++ b/MC21.2/gradle.properties @@ -0,0 +1,18 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://modmuss50.me/fabric.html + minecraft_version=1.21.2 + yarn_mappings=1.21.2+build.1 + loader_version=0.16.9 + kotlin_loader_version=1.13.0+kotlin.2.1.0 + +# Mod Properties + mod_version = 1.0+1.21.2 + maven_group = observer.nelle + archives_base_name = roses_mod + +# Dependencies + # check this on https://modmuss50.me/fabric.html + fabric_version=0.106.1+1.21.2 diff --git a/MC21.2/src/main/java/observer/nelle/roses/RosesDataGenerator.java b/MC21.2/src/main/java/observer/nelle/roses/RosesDataGenerator.java new file mode 100644 index 0000000..80aad78 --- /dev/null +++ b/MC21.2/src/main/java/observer/nelle/roses/RosesDataGenerator.java @@ -0,0 +1,33 @@ +package observer.nelle.roses; + +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.minecraft.registry.RegistryBuilder; +import net.minecraft.registry.RegistryKeys; +import observer.nelle.roses.datagen.RosesBlockTagProvider; +import observer.nelle.roses.datagen.RosesLootTableProvider; +import observer.nelle.roses.datagen.RosesRecipeProvider; +import observer.nelle.roses.datagen.RosesRegistryGenerator; +import observer.nelle.roses.world.RosesConfiguredFeatures; +import observer.nelle.roses.world.RosesPlacedFeatures; + +public class RosesDataGenerator implements DataGeneratorEntrypoint { + + @Override + public void onInitializeDataGenerator(FabricDataGenerator generator) { + FabricDataGenerator.Pack pack = generator.createPack(); + + // Adding a provider example: + // + pack.addProvider(RosesRecipeProvider::new); + pack.addProvider(RosesBlockTagProvider::new); + pack.addProvider(RosesLootTableProvider::new); + pack.addProvider(RosesRegistryGenerator::new); + } + + @Override + public void buildRegistry(RegistryBuilder registryBuilder) { + registryBuilder.addRegistry(RegistryKeys.CONFIGURED_FEATURE, RosesConfiguredFeatures::bootstrap); + registryBuilder.addRegistry(RegistryKeys.PLACED_FEATURE, RosesPlacedFeatures::bootstrap); + } +} diff --git a/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesBlockTagProvider.java b/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesBlockTagProvider.java new file mode 100644 index 0000000..73b12bc --- /dev/null +++ b/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesBlockTagProvider.java @@ -0,0 +1,30 @@ +package observer.nelle.roses.datagen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.BlockTags; +import observer.nelle.roses.RosesBlocks; + +import java.util.concurrent.CompletableFuture; + +public class RosesBlockTagProvider extends FabricTagProvider.BlockTagProvider { + public RosesBlockTagProvider(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { + getOrCreateTagBuilder(BlockTags.TALL_FLOWERS) + .add(RosesBlocks.INSTANCE.getCyanRoseBush()) + ; + getOrCreateTagBuilder(BlockTags.SMALL_FLOWERS) + .add(RosesBlocks.INSTANCE.getRoseFlower()) + .add(RosesBlocks.INSTANCE.getCyanRoseFlower()) + ; + getOrCreateTagBuilder(BlockTags.FLOWER_POTS) + .add(RosesBlocks.INSTANCE.getPottedRose()) + .add(RosesBlocks.INSTANCE.getPottedCyan()) + ; + } +} diff --git a/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesLootTableProvider.java b/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesLootTableProvider.java new file mode 100644 index 0000000..3e89cbe --- /dev/null +++ b/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesLootTableProvider.java @@ -0,0 +1,45 @@ +package observer.nelle.roses.datagen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.Enchantments; +import net.minecraft.item.Item; +import net.minecraft.loot.LootTable; +import net.minecraft.loot.entry.ItemEntry; +import net.minecraft.loot.function.ApplyBonusLootFunction; +import net.minecraft.loot.function.SetCountLootFunction; +import net.minecraft.loot.provider.number.UniformLootNumberProvider; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.entry.RegistryEntry; +import observer.nelle.roses.RosesBlocks; + +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + +public class RosesLootTableProvider extends FabricBlockLootTableProvider { + public RosesLootTableProvider(FabricDataOutput dataOutput, CompletableFuture registryLookup) { + super(dataOutput, registryLookup); + } + + @Override + public void generate() { + addDrop(RosesBlocks.INSTANCE.getRoseFlower()); + addDrop(RosesBlocks.INSTANCE.getCyanRoseFlower()); + + addPottedPlantDrops(RosesBlocks.INSTANCE.getPottedRose()); + addPottedPlantDrops(RosesBlocks.INSTANCE.getPottedCyan()); + + addDrop(Blocks.ROSE_BUSH, roseBushDrops(Blocks.ROSE_BUSH, Objects.requireNonNull(RosesBlocks.INSTANCE.getRoseFlower()).asItem(), 2.0F, 5.0F)); + addDrop(RosesBlocks.INSTANCE.getCyanRoseBush(), roseBushDrops(RosesBlocks.INSTANCE.getCyanRoseBush(), Objects.requireNonNull(RosesBlocks.INSTANCE.getCyanRoseFlower()).asItem(), 2.0F, 5.0F)); + } + + public LootTable.Builder roseBushDrops(Block input, Item output, Float min, Float max) { + return dropsWithShears(input, this + .applyExplosionDecay(input, ItemEntry.builder(output) + .apply(SetCountLootFunction.builder(UniformLootNumberProvider.create(min, max))) + .apply(ApplyBonusLootFunction.oreDrops((RegistryEntry) Enchantments.FORTUNE)))); + } +} diff --git a/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesRecipeProvider.java b/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesRecipeProvider.java new file mode 100644 index 0000000..89be5c1 --- /dev/null +++ b/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesRecipeProvider.java @@ -0,0 +1,45 @@ +package observer.nelle.roses.datagen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; +import net.minecraft.data.server.recipe.RecipeExporter; +import net.minecraft.data.server.recipe.RecipeGenerator; +import net.minecraft.item.Items; +import net.minecraft.recipe.book.RecipeCategory; +import net.minecraft.registry.RegistryWrapper; +import observer.nelle.roses.RosesBlocks; + +import java.util.Objects; +import java.util.concurrent.CompletableFuture; + + +public class RosesRecipeProvider extends FabricRecipeProvider { + + public RosesRecipeProvider(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); + } + + @Override + protected RecipeGenerator getRecipeGenerator(RegistryWrapper.WrapperLookup wrapperLookup, RecipeExporter recipeExporter) { + return new RecipeGenerator(wrapperLookup, recipeExporter) { + + @Override + public void generate() { + createShapeless(RecipeCategory.DECORATIONS, Items.RED_DYE) + .input(RosesBlocks.INSTANCE.getRoseFlower(), 2); + createShapeless(RecipeCategory.DECORATIONS, Items.CYAN_DYE) + .input(RosesBlocks.INSTANCE.getCyanRoseFlower(), 2); + + offer2x2CompactingRecipe(RecipeCategory.DECORATIONS, Items.ROSE_BUSH, RosesBlocks.INSTANCE.getRoseFlower()); + offer2x2CompactingRecipe(RecipeCategory.DECORATIONS, Objects.requireNonNull(RosesBlocks.INSTANCE.getCyanRoseBush()).asItem(), RosesBlocks.INSTANCE.getCyanRoseFlower()); + + } + }; + } + + @Override + public String getName() { + return ""; + } + +} diff --git a/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesRegistryGenerator.java b/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesRegistryGenerator.java new file mode 100644 index 0000000..1d22ff5 --- /dev/null +++ b/MC21.2/src/main/java/observer/nelle/roses/datagen/RosesRegistryGenerator.java @@ -0,0 +1,25 @@ +package observer.nelle.roses.datagen; + +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.RegistryWrapper; + +import java.util.concurrent.CompletableFuture; + +public class RosesRegistryGenerator extends FabricDynamicRegistryProvider { + public RosesRegistryGenerator(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup registries, Entries entries) { + entries.addAll(registries.getOrThrow(RegistryKeys.CONFIGURED_FEATURE)); + entries.addAll(registries.getOrThrow(RegistryKeys.PLACED_FEATURE)); + } + + @Override + public String getName() { + return ""; + } +} diff --git a/MC21.2/src/main/java/observer/nelle/roses/world/RosesConfiguredFeatures.java b/MC21.2/src/main/java/observer/nelle/roses/world/RosesConfiguredFeatures.java new file mode 100644 index 0000000..e944fa2 --- /dev/null +++ b/MC21.2/src/main/java/observer/nelle/roses/world/RosesConfiguredFeatures.java @@ -0,0 +1,57 @@ +package observer.nelle.roses.world; + +// Configured Feature (flowers, how does this look like) -> Placed Feature (How is this feature placed) -> WorldGen/BiomeMod (Where is our feature placed) + +import net.minecraft.block.BlockState; +import net.minecraft.registry.Registerable; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.Identifier; +import net.minecraft.util.collection.DataPool; +import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.stateprovider.BlockStateProvider; +import net.minecraft.world.gen.stateprovider.WeightedBlockStateProvider; +import observer.nelle.roses.RosesBlocks; +import observer.nelle.roses.RosesModKt; + +import java.util.Objects; + +public class RosesConfiguredFeatures { + public static final RegistryKey> cyanRoseBushKey = registerKey("cyan_rose_bush"); + public static final RegistryKey> cyanRoseKey = registerKey("cyan_rose_flower"); + public static final RegistryKey> roseKey = registerKey("rose_flower"); + + public static void bootstrap(Registerable> context) { + // pretty much exactly as FOREST_FLOWERS + register(context, cyanRoseBushKey, Feature.RANDOM_PATCH, + ConfiguredFeatures.createRandomPatchFeatureConfig(Feature.SIMPLE_BLOCK, + new SimpleBlockFeatureConfig(BlockStateProvider.of(Objects.requireNonNull(RosesBlocks.INSTANCE.getCyanRoseBush()))))); + + register(context, cyanRoseKey, Feature.FLOWER, + createRandomFlowerPatchFeatureConfig( + new WeightedBlockStateProvider(DataPool.builder() + .add(Objects.requireNonNull(RosesBlocks.INSTANCE.getCyanRoseFlower()).getDefaultState(), 2) + .add(Objects.requireNonNull(RosesBlocks.INSTANCE.getCyanRoseFlower()).getDefaultState(), 1)), 64 + )); + + register(context, roseKey, Feature.FLOWER, + createRandomFlowerPatchFeatureConfig( + new WeightedBlockStateProvider(DataPool.builder() + .add(Objects.requireNonNull(RosesBlocks.INSTANCE.getRoseFlower()).getDefaultState(), 2) + .add(Objects.requireNonNull(RosesBlocks.INSTANCE.getRoseFlower()).getDefaultState(), 1)), 64 + )); + } + + public static RegistryKey> registerKey(String name) { + return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, Identifier.of(RosesModKt.MOD_ID, name)); + } + + private static > void register(Registerable> context, + RegistryKey> key, F feature, FC configuration) { + context.register(key, new ConfiguredFeature<>(feature, configuration)); + } + + private static RandomPatchFeatureConfig createRandomFlowerPatchFeatureConfig(BlockStateProvider block, int tries) { + return ConfiguredFeatures.createRandomPatchFeatureConfig(tries, PlacedFeatures.createEntry(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(block))); + } +} diff --git a/MC21.2/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java b/MC21.2/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java new file mode 100644 index 0000000..3460343 --- /dev/null +++ b/MC21.2/src/main/java/observer/nelle/roses/world/RosesPlacedFeatures.java @@ -0,0 +1,94 @@ +package observer.nelle.roses.world; + +import net.minecraft.registry.Registerable; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.entry.RegistryEntry; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.intprovider.ClampedIntProvider; +import net.minecraft.util.math.intprovider.UniformIntProvider; +import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.placementmodifier.*; +import observer.nelle.roses.RosesModKt; + +import java.util.List; + +public class RosesPlacedFeatures { + + public static final RegistryKey cyanRoseBushPlacedKey = registerKey("cyan_rose_bush_placed"); + + public static final RegistryKey cyanRosePlacedKey = registerKey("cyan_rose_placed"); + public static final RegistryKey rosePlacedKey = registerKey("rose_placed"); + + public static final RegistryKey cyanRoseRarerPlacedKey = registerKey("cyan_rose_rare_placed"); + public static final RegistryKey roseRarerPlacedKey = registerKey("rose_rare_placed"); + + public static final RegistryKey cyanRoseCommonPlacedKey = registerKey("cyan_rose_common_placed"); + public static final RegistryKey roseCommonPlacedKey = registerKey("rose_common_placed"); + + public static void bootstrap(Registerable context) { + var configuredFeatures = context.getRegistryLookup(RegistryKeys.CONFIGURED_FEATURE); + + register(context, cyanRoseBushPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.cyanRoseBushKey), + RarityFilterPlacementModifier.of(85), + SquarePlacementModifier.of(), + PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, + CountPlacementModifier.of(ClampedIntProvider.create(UniformIntProvider.create(-1, 3), 0, 3)), + BiomePlacementModifier.of()); + + // regular + register(context, cyanRosePlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.cyanRoseKey), + RarityFilterPlacementModifier.of(70), + SquarePlacementModifier.of(), + PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, + BiomePlacementModifier.of()); + + register(context, rosePlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.roseKey), + RarityFilterPlacementModifier.of(32), + SquarePlacementModifier.of(), + PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, + BiomePlacementModifier.of()); + + // rarer + register(context, cyanRoseRarerPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.cyanRoseKey), + RarityFilterPlacementModifier.of(90), + SquarePlacementModifier.of(), + PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, + BiomePlacementModifier.of()); + + register(context, roseRarerPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.roseKey), + RarityFilterPlacementModifier.of(80), + SquarePlacementModifier.of(), + PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, + BiomePlacementModifier.of()); + + // more common + register(context, cyanRoseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.cyanRoseKey), + RarityFilterPlacementModifier.of(45), + SquarePlacementModifier.of(), + PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, + BiomePlacementModifier.of()); + + register(context, roseCommonPlacedKey, configuredFeatures.getOrThrow(RosesConfiguredFeatures.roseKey), + RarityFilterPlacementModifier.of(4), + SquarePlacementModifier.of(), + PlacedFeatures.MOTION_BLOCKING_HEIGHTMAP, + BiomePlacementModifier.of()); + } + + public static RegistryKey registerKey(String name) { + return RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(RosesModKt.MOD_ID, name)); + } + + private static void register(Registerable context, RegistryKey key, RegistryEntry> configuration, + List modifiers) { + context.register(key, new PlacedFeature(configuration, List.copyOf(modifiers))); + } + + // may not need this + private static > void register(Registerable context, RegistryKey key, + RegistryEntry> configuration, + PlacementModifier... modifiers) { + register(context, key, configuration, List.of(modifiers)); + } +} diff --git a/MC21.2/src/main/java/observer/nelle/roses/world/gen/RosesVegetationGeneration.java b/MC21.2/src/main/java/observer/nelle/roses/world/gen/RosesVegetationGeneration.java new file mode 100644 index 0000000..80cdf6b --- /dev/null +++ b/MC21.2/src/main/java/observer/nelle/roses/world/gen/RosesVegetationGeneration.java @@ -0,0 +1,128 @@ +package observer.nelle.roses.world.gen; + +import net.fabricmc.fabric.api.biome.v1.BiomeModifications; +import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; +import net.minecraft.world.biome.BiomeKeys; +import net.minecraft.world.gen.GenerationStep; +import observer.nelle.roses.world.RosesPlacedFeatures; + +public class RosesVegetationGeneration { + public static void generateVegetation() { + BiomeModifications.addFeature( + BiomeSelectors.includeByKey( + BiomeKeys.FOREST, + BiomeKeys.FLOWER_FOREST, + BiomeKeys.BIRCH_FOREST, + BiomeKeys.OLD_GROWTH_BIRCH_FOREST, + BiomeKeys.DARK_FOREST), + GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.cyanRoseBushPlacedKey); + + // regular + BiomeModifications.addFeature( + BiomeSelectors.includeByKey( + BiomeKeys.PLAINS, + BiomeKeys.SUNFLOWER_PLAINS, + BiomeKeys.MEADOW, // https://minecraft.wiki/w/Flower#Flower_gradients + BiomeKeys.FLOWER_FOREST, // https://minecraft.wiki/w/Flower#Flower_gradients + BiomeKeys.SNOWY_PLAINS, + BiomeKeys.FOREST, + BiomeKeys.BIRCH_FOREST, + BiomeKeys.OLD_GROWTH_BIRCH_FOREST, + BiomeKeys.TAIGA, + BiomeKeys.OLD_GROWTH_PINE_TAIGA, + BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA, + BiomeKeys.SNOWY_TAIGA, + BiomeKeys.DARK_FOREST, + BiomeKeys.WINDSWEPT_HILLS, + BiomeKeys.WINDSWEPT_FOREST, + BiomeKeys.WINDSWEPT_GRAVELLY_HILLS, + BiomeKeys.RIVER, + BiomeKeys.FROZEN_RIVER), + GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.cyanRosePlacedKey); + + BiomeModifications.addFeature(BiomeSelectors.includeByKey( + BiomeKeys.PLAINS, + BiomeKeys.SUNFLOWER_PLAINS, + BiomeKeys.MEADOW, // https://minecraft.wiki/w/Flower#Flower_gradients + BiomeKeys.FLOWER_FOREST, // https://minecraft.wiki/w/Flower#Flower_gradients + BiomeKeys.SNOWY_PLAINS, + BiomeKeys.FOREST, + BiomeKeys.BIRCH_FOREST, + BiomeKeys.OLD_GROWTH_BIRCH_FOREST, + BiomeKeys.TAIGA, + BiomeKeys.OLD_GROWTH_PINE_TAIGA, + BiomeKeys.OLD_GROWTH_SPRUCE_TAIGA, + BiomeKeys.SNOWY_TAIGA, + BiomeKeys.DARK_FOREST, + BiomeKeys.WINDSWEPT_HILLS, + BiomeKeys.WINDSWEPT_FOREST, + BiomeKeys.WINDSWEPT_GRAVELLY_HILLS, + BiomeKeys.RIVER, + BiomeKeys.FROZEN_RIVER), + GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.rosePlacedKey); + + // rarer + BiomeModifications.addFeature( + BiomeSelectors.includeByKey( + BiomeKeys.BEACH, + BiomeKeys.SNOWY_BEACH, + BiomeKeys.STONY_SHORE, + BiomeKeys.OCEAN, + BiomeKeys.DEEP_COLD_OCEAN, + BiomeKeys.COLD_OCEAN, + BiomeKeys.DEEP_FROZEN_OCEAN, + BiomeKeys.DEEP_LUKEWARM_OCEAN, + BiomeKeys.DEEP_OCEAN, + BiomeKeys.FROZEN_OCEAN, + BiomeKeys.LUKEWARM_OCEAN, + BiomeKeys.WARM_OCEAN, + BiomeKeys.DESERT, + BiomeKeys.ICE_SPIKES, + BiomeKeys.DRIPSTONE_CAVES, + BiomeKeys.DEEP_DARK + ), + GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.cyanRoseRarerPlacedKey); + + BiomeModifications.addFeature(BiomeSelectors.includeByKey( + BiomeKeys.BEACH, + BiomeKeys.SNOWY_BEACH, + BiomeKeys.STONY_SHORE, + BiomeKeys.OCEAN, + BiomeKeys.DEEP_COLD_OCEAN, + BiomeKeys.COLD_OCEAN, + BiomeKeys.DEEP_FROZEN_OCEAN, + BiomeKeys.DEEP_LUKEWARM_OCEAN, + BiomeKeys.DEEP_OCEAN, + BiomeKeys.FROZEN_OCEAN, + BiomeKeys.LUKEWARM_OCEAN, + BiomeKeys.WARM_OCEAN, + BiomeKeys.DESERT, + BiomeKeys.ICE_SPIKES, + BiomeKeys.DRIPSTONE_CAVES, + BiomeKeys.DEEP_DARK + ), + GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.roseRarerPlacedKey); + + // more common + BiomeModifications.addFeature( + BiomeSelectors.includeByKey( + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA + ), + GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.cyanRoseCommonPlacedKey); + + BiomeModifications.addFeature(BiomeSelectors.includeByKey( + BiomeKeys.JUNGLE, + BiomeKeys.BAMBOO_JUNGLE, + BiomeKeys.SPARSE_JUNGLE, + BiomeKeys.SAVANNA, + BiomeKeys.SAVANNA_PLATEAU, + BiomeKeys.WINDSWEPT_SAVANNA + ), + GenerationStep.Feature.VEGETAL_DECORATION, RosesPlacedFeatures.roseCommonPlacedKey); + } +} diff --git a/MC21.2/src/main/java/observer/nelle/roses/world/gen/RosesWorldGeneration.java b/MC21.2/src/main/java/observer/nelle/roses/world/gen/RosesWorldGeneration.java new file mode 100644 index 0000000..6e8814b --- /dev/null +++ b/MC21.2/src/main/java/observer/nelle/roses/world/gen/RosesWorldGeneration.java @@ -0,0 +1,7 @@ +package observer.nelle.roses.world.gen; + +public class RosesWorldGeneration { + public static void generateRosesWorldGen() { + RosesVegetationGeneration.generateVegetation(); + } +} diff --git a/MC21.2/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt b/MC21.2/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt new file mode 100644 index 0000000..f39c33c --- /dev/null +++ b/MC21.2/src/main/kotlin/observer/nelle/roses/RosesBlocks.kt @@ -0,0 +1,69 @@ +@file:Suppress( + "ktlint:standard:no-wildcard-imports", +) + +package observer.nelle.roses + +import net.minecraft.block.* +import net.minecraft.entity.effect.StatusEffects +import net.minecraft.item.BlockItem +import net.minecraft.item.Item +import net.minecraft.registry.Registries +import net.minecraft.registry.Registry +import net.minecraft.util.Identifier + +object RosesBlocks { + val roseFlower: Block = + register( + FlowerBlock( + StatusEffects.INSTANT_DAMAGE, + 6F, + AbstractBlock.Settings.copy(Blocks.POPPY), + ), + Identifier.of(MOD_ID, "rose_flower"), + ) + + val pottedRose: Block = + register( + FlowerPotBlock( + roseFlower, + AbstractBlock.Settings.copy(Blocks.POTTED_POPPY), + ), + Identifier.of(MOD_ID, "potted_rose"), + ) + val cyanRoseFlower: Block = + register( + FlowerBlock( + StatusEffects.INSTANT_HEALTH, + 6F, + AbstractBlock.Settings.copy(Blocks.POPPY), + ), + Identifier.of(MOD_ID, "cyan_rose"), + ) + val pottedCyan: Block = + register( + FlowerPotBlock( + cyanRoseFlower, + AbstractBlock.Settings.copy(Blocks.POTTED_POPPY), + ), + Identifier.of(MOD_ID, "potted_cyan"), + ) + val cyanRoseBush: Block = + register( + TallPlantBlock( + AbstractBlock.Settings.copy(Blocks.LARGE_FERN), + ), + Identifier.of(MOD_ID, "cyan_rose_bush"), + ) + + fun register( + block: Block, + id: Identifier, + ): Block { + // Register the block and its item. + val blockItem = BlockItem(block, Item.Settings()) + Registry.register(Registries.ITEM, id, blockItem) + + return Registry.register(Registries.BLOCK, id, block) + } +} diff --git a/MC21.2/src/main/kotlin/observer/nelle/roses/RosesCreativeTab.kt b/MC21.2/src/main/kotlin/observer/nelle/roses/RosesCreativeTab.kt new file mode 100644 index 0000000..8e7d5cb --- /dev/null +++ b/MC21.2/src/main/kotlin/observer/nelle/roses/RosesCreativeTab.kt @@ -0,0 +1,32 @@ +package observer.nelle.roses + +object RosesCreativeTab { + // CREATIVE TABS + val roseTabEntry = + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register( + ItemGroupEvents.ModifyEntries { content: FabricItemGroupEntries -> + content.addAfter( + Items.POPPY, + RosesBlocks.roseFlower, + ) + }, + ) + val cyanTabEntry = + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register( + ItemGroupEvents.ModifyEntries { content: FabricItemGroupEntries -> + content.addAfter( + Items.BLUE_ORCHID, + RosesBlocks.cyanRoseFlower, + ) + }, + ) + val cyanBushTabEntry = + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register( + ItemGroupEvents.ModifyEntries { content: FabricItemGroupEntries -> + content.addAfter( + Items.ROSE_BUSH, + RosesBlocks.cyanRoseBush, + ) + }, + ) +} diff --git a/MC21.2/src/main/kotlin/observer/nelle/roses/RosesMod.kt b/MC21.2/src/main/kotlin/observer/nelle/roses/RosesMod.kt new file mode 100644 index 0000000..3565464 --- /dev/null +++ b/MC21.2/src/main/kotlin/observer/nelle/roses/RosesMod.kt @@ -0,0 +1,23 @@ +package observer.nelle.roses + +import net.fabricmc.api.ModInitializer +import org.slf4j.Logger +import org.slf4j.LoggerFactory + +val LOGGER: Logger = LoggerFactory.getLogger("roses") +const val MOD_ID = "roses_mod" + +class Roses : ModInitializer { + override fun onInitialize() { + LOGGER.info("just like old times?") + + // blocks + RosesBlocks + + // creative tab entries + RosesCreativeTab + + // generation + RosesWorldGeneration.generateRosesWorldGen() + } +} diff --git a/MC21.2/src/main/kotlin/observer/nelle/roses/RosesModClient.kt b/MC21.2/src/main/kotlin/observer/nelle/roses/RosesModClient.kt new file mode 100644 index 0000000..6ab5100 --- /dev/null +++ b/MC21.2/src/main/kotlin/observer/nelle/roses/RosesModClient.kt @@ -0,0 +1,18 @@ +package observer.nelle.roses + +import net.fabricmc.api.ClientModInitializer +/*import observer.nelle.roses.RosesBlocks.cyanRoseBush +import observer.nelle.roses.RosesBlocks.cyanRoseFlower +import observer.nelle.roses.RosesBlocks.pottedCyan +import observer.nelle.roses.RosesBlocks.pottedRose +import observer.nelle.roses.RosesBlocks.roseFlower*/ + +class RosesModClient : ClientModInitializer { + override fun onInitializeClient() { + BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), cyanRoseBush) + BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), cyanRoseFlower) + BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), pottedCyan) + BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), pottedRose) + BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(), roseFlower) + } +} diff --git a/MC21.2/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json b/MC21.2/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json new file mode 100644 index 0000000..6be127f --- /dev/null +++ b/MC21.2/src/main/resources/assets/roses_mod/blockstates/cyan_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/cyan_rose"} + } +} diff --git a/MC21.2/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json b/MC21.2/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json new file mode 100644 index 0000000..eaf06c4 --- /dev/null +++ b/MC21.2/src/main/resources/assets/roses_mod/blockstates/cyan_rose_bush.json @@ -0,0 +1,10 @@ +{ + "variants": { + "half=lower": { + "model": "roses_mod:block/cyan_rose_bush_bottom" + }, + "half=upper": { + "model": "roses_mod:block/cyan_rose_bush_top" + } + } +} diff --git a/MC21.2/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json b/MC21.2/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json new file mode 100644 index 0000000..dedd97a --- /dev/null +++ b/MC21.2/src/main/resources/assets/roses_mod/blockstates/potted_cyan.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_cyan"} + } +} diff --git a/MC21.2/src/main/resources/assets/roses_mod/blockstates/potted_rose.json b/MC21.2/src/main/resources/assets/roses_mod/blockstates/potted_rose.json new file mode 100644 index 0000000..4f5619d --- /dev/null +++ b/MC21.2/src/main/resources/assets/roses_mod/blockstates/potted_rose.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/potted_rose"} + } +} diff --git a/MC21.2/src/main/resources/assets/roses_mod/blockstates/rose_flower.json b/MC21.2/src/main/resources/assets/roses_mod/blockstates/rose_flower.json new file mode 100644 index 0000000..66aeb91 --- /dev/null +++ b/MC21.2/src/main/resources/assets/roses_mod/blockstates/rose_flower.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "roses_mod:block/rose_flower"} + } +} diff --git a/MC21.2/src/main/resources/assets/roses_mod/icon.png b/MC21.2/src/main/resources/assets/roses_mod/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..38fcde9d5e8f820e0566f7e40ab124bc87a091a5 GIT binary patch literal 7582 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 literal 0 HcmV?d00001 diff --git a/MC21.2/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png b/MC21.2/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..882a660bb3e08bb8ee18ab4fc359fd2dbe0123e3 GIT binary patch literal 6255 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 literal 0 HcmV?d00001 diff --git a/MC21.2/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png b/MC21.2/src/main/resources/assets/roses_mod/textures/block/cyan_rose_bush_top.png new file mode 100644 index 0000000000000000000000000000000000000000..cfe9caace8c1ee8d02304238510b49d79ae43146 GIT binary patch literal 5841 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 literal 0 HcmV?d00001 diff --git a/MC21.2/src/main/resources/assets/roses_mod/textures/block/rose_flower.png b/MC21.2/src/main/resources/assets/roses_mod/textures/block/rose_flower.png new file mode 100644 index 0000000000000000000000000000000000000000..51d9847ccf92bf06ddceea8e8f0593a9e7a382c0 GIT binary patch literal 248 zcmV{JvIDdY^=~bK(-`M#6&;Ij`!GW2D;l+O@1_{Q04En!+V5rAx zzy($gu+1Q#&cwzr>-RT?{C|J2s>SPq!~gy;-1zq!Y>)#pGx06}X#lyxwebhT?>h_( zALikXZoKIr%GLD$vfZcgs=+A<(!AU8G{fsE{D}>(=>ka%|5;TS@ESreDT}o+{CC}N y#;|nvDbivA6p$cqY?D1rejtJj0eJ&oEC2wZ(LWK4E050r0000=${loader_version}", + "fabric-language-kotlin": ">=${kotlin_loader_version}", + "fabric": "*", + "minecraft": "*" + } +} diff --git a/MC21.2/src/main/resources/old/data/minecraft/tags/blocks/flower_pots.json b/MC21.2/src/main/resources/old/data/minecraft/tags/blocks/flower_pots.json new file mode 100644 index 0000000..6ca60b7 --- /dev/null +++ b/MC21.2/src/main/resources/old/data/minecraft/tags/blocks/flower_pots.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "roses_mod:potted_rose", + "roses_mod:cyan_rose" + ] +} diff --git a/MC21.2/src/main/resources/old/data/minecraft/tags/blocks/small_flowers.json b/MC21.2/src/main/resources/old/data/minecraft/tags/blocks/small_flowers.json new file mode 100644 index 0000000..fdecf80 --- /dev/null +++ b/MC21.2/src/main/resources/old/data/minecraft/tags/blocks/small_flowers.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "roses_mod:rose_flower", + "roses_mod:cyan_rose" + ] +} diff --git a/MC21.2/src/main/resources/old/data/minecraft/tags/blocks/tall_flowers.json b/MC21.2/src/main/resources/old/data/minecraft/tags/blocks/tall_flowers.json new file mode 100644 index 0000000..ad83bf8 --- /dev/null +++ b/MC21.2/src/main/resources/old/data/minecraft/tags/blocks/tall_flowers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "roses_mod:cyan_rose_bush" + ] +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ zQccdaaVK$5bz;*rnyK{_SQYM>;aES6Qs^lj9lEs6_J+%nIiuQC*fN;z8md>r_~Mfl zU%p5Dt_YT>gQqfr@`cR!$NWr~+`CZb%dn;WtzrAOI>P_JtsB76PYe*<%H(y>qx-`Kq!X_; z<{RpAqYhE=L1r*M)gNF3B8r(<%8mo*SR2hu zccLRZwGARt)Hlo1euqTyM>^!HK*!Q2P;4UYrysje@;(<|$&%vQekbn|0Ruu_Io(w4#%p6ld2Yp7tlA`Y$cciThP zKzNGIMPXX%&Ud0uQh!uQZz|FB`4KGD?3!ND?wQt6!n*f4EmCoJUh&b?;B{|lxs#F- z31~HQ`SF4x$&v00@(P+j1pAaj5!s`)b2RDBp*PB=2IB>oBF!*6vwr7Dp%zpAx*dPr zb@Zjq^XjN?O4QcZ*O+8>)|HlrR>oD*?WQl5ri3R#2?*W6iJ>>kH%KnnME&TT@ZzrHS$Q%LC?n|e>V+D+8D zYc4)QddFz7I8#}y#Wj6>4P%34dZH~OUDb?uP%-E zwjXM(?Sg~1!|wI(RVuxbu)-rH+O=igSho_pDCw(c6b=P zKk4ATlB?bj9+HHlh<_!&z0rx13K3ZrAR8W)!@Y}o`?a*JJsD+twZIv`W)@Y?Amu_u zz``@-e2X}27$i(2=9rvIu5uTUOVhzwu%mNazS|lZb&PT;XE2|B&W1>=B58#*!~D&) zfVmJGg8UdP*fx(>Cj^?yS^zH#o-$Q-*$SnK(ZVFkw+er=>N^7!)FtP3y~Xxnu^nzY zikgB>Nj0%;WOltWIob|}%lo?_C7<``a5hEkx&1ku$|)i>Rh6@3h*`slY=9U}(Ql_< zaNG*J8vb&@zpdhAvv`?{=zDedJ23TD&Zg__snRAH4eh~^oawdYi6A3w8<Ozh@Kw)#bdktM^GVb zrG08?0bG?|NG+w^&JvD*7LAbjED{_Zkc`3H!My>0u5Q}m!+6VokMLXxl`Mkd=g&Xx z-a>m*#G3SLlhbKB!)tnzfWOBV;u;ftU}S!NdD5+YtOjLg?X}dl>7m^gOpihrf1;PY zvll&>dIuUGs{Qnd- zwIR3oIrct8Va^Tm0t#(bJD7c$Z7DO9*7NnRZorrSm`b`cxz>OIC;jSE3DO8`hX955ui`s%||YQtt2 z5DNA&pG-V+4oI2s*x^>-$6J?p=I>C|9wZF8z;VjR??Icg?1w2v5Me+FgAeGGa8(3S z4vg*$>zC-WIVZtJ7}o9{D-7d>zCe|z#<9>CFve-OPAYsneTb^JH!Enaza#j}^mXy1 z+ULn^10+rWLF6j2>Ya@@Kq?26>AqK{A_| zQKb*~F1>sE*=d?A?W7N2j?L09_7n+HGi{VY;MoTGr_)G9)ot$p!-UY5zZ2Xtbm=t z@dpPSGwgH=QtIcEulQNI>S-#ifbnO5EWkI;$A|pxJd885oM+ zGZ0_0gDvG8q2xebj+fbCHYfAXuZStH2j~|d^sBAzo46(K8n59+T6rzBwK)^rfPT+B zyIFw)9YC-V^rhtK`!3jrhmW-sTmM+tPH+;nwjL#-SjQPUZ53L@A>y*rt(#M(qsiB2 zx6B)dI}6Wlsw%bJ8h|(lhkJVogQZA&n{?Vgs6gNSXzuZpEyu*xySy8ro07QZ7Vk1!3tJphN_5V7qOiyK8p z#@jcDD8nmtYi1^l8ml;AF<#IPK?!pqf9D4moYk>d99Im}Jtwj6c#+A;f)CQ*f-hZ< z=p_T86jog%!p)D&5g9taSwYi&eP z#JuEK%+NULWus;0w32-SYFku#i}d~+{Pkho&^{;RxzP&0!RCm3-9K6`>KZpnzS6?L z^H^V*s!8<>x8bomvD%rh>Zp3>Db%kyin;qtl+jAv8Oo~1g~mqGAC&Qi_wy|xEt2iz zWAJEfTV%cl2Cs<1L&DLRVVH05EDq`pH7Oh7sR`NNkL%wi}8n>IXcO40hp+J+sC!W?!krJf!GJNE8uj zg-y~Ns-<~D?yqbzVRB}G>0A^f0!^N7l=$m0OdZuqAOQqLc zX?AEGr1Ht+inZ-Qiwnl@Z0qukd__a!C*CKuGdy5#nD7VUBM^6OCpxCa2A(X;e0&V4 zM&WR8+wErQ7UIc6LY~Q9x%Sn*Tn>>P`^t&idaOEnOd(Ufw#>NoR^1QdhJ8s`h^|R_ zXX`c5*O~Xdvh%q;7L!_!ohf$NfEBmCde|#uVZvEo>OfEq%+Ns7&_f$OR9xsihRpBb z+cjk8LyDm@U{YN>+r46?nn{7Gh(;WhFw6GAxtcKD+YWV?uge>;+q#Xx4!GpRkVZYu zzsF}1)7$?%s9g9CH=Zs+B%M_)+~*j3L0&Q9u7!|+T`^O{xE6qvAP?XWv9_MrZKdo& z%IyU)$Q95AB4!#hT!_dA>4e@zjOBD*Y=XjtMm)V|+IXzjuM;(l+8aA5#Kaz_$rR6! zj>#&^DidYD$nUY(D$mH`9eb|dtV0b{S>H6FBfq>t5`;OxA4Nn{J(+XihF(stSche7$es&~N$epi&PDM_N`As;*9D^L==2Q7Z2zD+CiU(|+-kL*VG+&9!Yb3LgPy?A zm7Z&^qRG_JIxK7-FBzZI3Q<;{`DIxtc48k> zc|0dmX;Z=W$+)qE)~`yn6MdoJ4co;%!`ddy+FV538Y)j(vg}5*k(WK)KWZ3WaOG!8 z!syGn=s{H$odtpqFrT#JGM*utN7B((abXnpDM6w56nhw}OY}0TiTG1#f*VFZr+^-g zbP10`$LPq_;PvrA1XXlyx2uM^mrjTzX}w{yuLo-cOClE8MMk47T25G8M!9Z5ypOSV zAJUBGEg5L2fY)ZGJb^E34R2zJ?}Vf>{~gB!8=5Z) z9y$>5c)=;o0HeHHSuE4U)#vG&KF|I%-cF6f$~pdYJWk_dD}iOA>iA$O$+4%@>JU08 zS`ep)$XLPJ+n0_i@PkF#ri6T8?ZeAot$6JIYHm&P6EB=BiaNY|aA$W0I+nz*zkz_z zkEru!tj!QUffq%)8y0y`T&`fuus-1p>=^hnBiBqD^hXrPs`PY9tU3m0np~rISY09> z`P3s=-kt_cYcxWd{de@}TwSqg*xVhp;E9zCsnXo6z z?f&Sv^U7n4`xr=mXle94HzOdN!2kB~4=%)u&N!+2;z6UYKUDqi-s6AZ!haB;@&B`? z_TRX0%@suz^TRdCb?!vNJYPY8L_}&07uySH9%W^Tc&1pia6y1q#?*Drf}GjGbPjBS zbOPcUY#*$3sL2x4v_i*Y=N7E$mR}J%|GUI(>WEr+28+V z%v5{#e!UF*6~G&%;l*q*$V?&r$Pp^sE^i-0$+RH3ERUUdQ0>rAq2(2QAbG}$y{de( z>{qD~GGuOk559Y@%$?N^1ApVL_a704>8OD%8Y%8B;FCt%AoPu8*D1 zLB5X>b}Syz81pn;xnB}%0FnwazlWfUV)Z-~rZg6~b z6!9J$EcE&sEbzcy?CI~=boWA&eeIa%z(7SE^qgVLz??1Vbc1*aRvc%Mri)AJaAG!p z$X!_9Ds;Zz)f+;%s&dRcJt2==P{^j3bf0M=nJd&xwUGlUFn?H=2W(*2I2Gdu zv!gYCwM10aeus)`RIZSrCK=&oKaO_Ry~D1B5!y0R=%!i2*KfXGYX&gNv_u+n9wiR5 z*e$Zjju&ODRW3phN925%S(jL+bCHv6rZtc?!*`1TyYXT6%Ju=|X;6D@lq$8T zW{Y|e39ioPez(pBH%k)HzFITXHvnD6hw^lIoUMA;qAJ^CU?top1fo@s7xT13Fvn1H z6JWa-6+FJF#x>~+A;D~;VDs26>^oH0EI`IYT2iagy23?nyJ==i{g4%HrAf1-*v zK1)~@&(KkwR7TL}L(A@C_S0G;-GMDy=MJn2$FP5s<%wC)4jC5PXoxrQBFZ_k0P{{s@sz+gX`-!=T8rcB(=7vW}^K6oLWMmp(rwDh}b zwaGGd>yEy6fHv%jM$yJXo5oMAQ>c9j`**}F?MCry;T@47@r?&sKHgVe$MCqk#Z_3S z1GZI~nOEN*P~+UaFGnj{{Jo@16`(qVNtbU>O0Hf57-P>x8Jikp=`s8xWs^dAJ9lCQ z)GFm+=OV%AMVqVATtN@|vp61VVAHRn87}%PC^RAzJ%JngmZTasWBAWsoAqBU+8L8u z4A&Pe?fmTm0?mK-BL9t+{y7o(7jm+RpOhL9KnY#E&qu^}B6=K_dB}*VlSEiC9fn)+V=J;OnN)Ta5v66ic1rG+dGAJ1 z1%Zb_+!$=tQ~lxQrzv3x#CPb?CekEkA}0MYSgx$Jdd}q8+R=ma$|&1a#)TQ=l$1tQ z=tL9&_^vJ)Pk}EDO-va`UCT1m#Uty1{v^A3P~83_#v^ozH}6*9mIjIr;t3Uv%@VeW zGL6(CwCUp)Jq%G0bIG%?{_*Y#5IHf*5M@wPo6A{$Um++Co$wLC=J1aoG93&T7Ho}P z=mGEPP7GbvoG!uD$k(H3A$Z))+i{Hy?QHdk>3xSBXR0j!11O^mEe9RHmw!pvzv?Ua~2_l2Yh~_!s1qS`|0~0)YsbHSz8!mG)WiJE| z2f($6TQtt6L_f~ApQYQKSb=`053LgrQq7G@98#igV>y#i==-nEjQ!XNu9 z~;mE+gtj4IDDNQJ~JVk5Ux6&LCSFL!y=>79kE9=V}J7tD==Ga+IW zX)r7>VZ9dY=V&}DR))xUoV!u(Z|%3ciQi_2jl}3=$Agc(`RPb z8kEBpvY>1FGQ9W$n>Cq=DIpski};nE)`p3IUw1Oz0|wxll^)4dq3;CCY@RyJgFgc# zKouFh!`?Xuo{IMz^xi-h=StCis_M7yq$u) z?XHvw*HP0VgR+KR6wI)jEMX|ssqYvSf*_3W8zVTQzD?3>H!#>InzpSO)@SC8q*ii- z%%h}_#0{4JG;Jm`4zg};BPTGkYamx$Xo#O~lBirRY)q=5M45n{GCfV7h9qwyu1NxOMoP4)jjZMxmT|IQQh0U7C$EbnMN<3)Kk?fFHYq$d|ICu>KbY_hO zTZM+uKHe(cIZfEqyzyYSUBZa8;Fcut-GN!HSA9ius`ltNebF46ZX_BbZNU}}ZOm{M2&nANL9@0qvih15(|`S~z}m&h!u4x~(%MAO$jHRWNfuxWF#B)E&g3ghSQ9|> z(MFaLQj)NE0lowyjvg8z0#m6FIuKE9lDO~Glg}nSb7`~^&#(Lw{}GVOS>U)m8bF}x zVjbXljBm34Cs-yM6TVusr+3kYFjr28STT3g056y3cH5Tmge~ASxBj z%|yb>$eF;WgrcOZf569sDZOVwoo%8>XO>XQOX1OyN9I-SQgrm;U;+#3OI(zrWyow3 zk==|{lt2xrQ%FIXOTejR>;wv(Pb8u8}BUpx?yd(Abh6? zsoO3VYWkeLnF43&@*#MQ9-i-d0t*xN-UEyNKeyNMHw|A(k(_6QKO=nKMCxD(W(Yop zsRQ)QeL4X3Lxp^L%wzi2-WVSsf61dqliPUM7srDB?Wm6Lzn0&{*}|IsKQW;02(Y&| zaTKv|`U(pSzuvR6Rduu$wzK_W-Y-7>7s?G$)U}&uK;<>vU}^^ns@Z!p+9?St1s)dG zK%y6xkPyyS1$~&6v{kl?Md6gwM|>mt6Upm>oa8RLD^8T{0?HC!Z>;(Bob7el(DV6x zi`I)$&E&ngwFS@bi4^xFLAn`=fzTC;aimE^!cMI2n@Vo%Ae-ne`RF((&5y6xsjjAZ zVguVoQ?Z9uk$2ON;ersE%PU*xGO@T*;j1BO5#TuZKEf(mB7|g7pcEA=nYJ{s3vlbg zd4-DUlD{*6o%Gc^N!Nptgay>j6E5;3psI+C3Q!1ZIbeCubW%w4pq9)MSDyB{HLm|k zxv-{$$A*pS@csolri$Ge<4VZ}e~78JOL-EVyrbxKra^d{?|NnPp86!q>t<&IP07?Z z^>~IK^k#OEKgRH+LjllZXk7iA>2cfH6+(e&9ku5poo~6y{GC5>(bRK7hwjiurqAiZ zg*DmtgY}v83IjE&AbiWgMyFbaRUPZ{lYiz$U^&Zt2YjG<%m((&_JUbZcfJ22(>bi5 z!J?<7AySj0JZ&<-qXX;mcV!f~>G=sB0KnjWca4}vrtunD^1TrpfeS^4dvFr!65knK zZh`d;*VOkPs4*-9kL>$GP0`(M!j~B;#x?Ba~&s6CopvO86oM?-? zOw#dIRc;6A6T?B`Qp%^<U5 z19x(ywSH$_N+Io!6;e?`tWaM$`=Db!gzx|lQ${DG!zb1Zl&|{kX0y6xvO1o z220r<-oaS^^R2pEyY;=Qllqpmue|5yI~D|iI!IGt@iod{Opz@*ml^w2bNs)p`M(Io z|E;;m*Xpjd9l)4G#KaWfV(t8YUn@A;nK^#xgv=LtnArX|vWQVuw3}B${h+frU2>9^ z!l6)!Uo4`5k`<<;E(ido7M6lKTgWezNLq>U*=uz&s=cc$1%>VrAeOoUtA|T6gO4>UNqsdK=NF*8|~*sl&wI=x9-EGiq*aqV!(VVXA57 zw9*o6Ir8Lj1npUXvlevtn(_+^X5rzdR>#(}4YcB9O50q97%rW2me5_L=%ffYPUSRc z!vv?Kv>dH994Qi>U(a<0KF6NH5b16enCp+mw^Hb3Xs1^tThFpz!3QuN#}KBbww`(h z7GO)1olDqy6?T$()R7y%NYx*B0k_2IBiZ14&8|JPFxeMF{vW>HF-Vi3+ZOI=+qP}n zw(+!WcTd~4ZJX1!ZM&y!+uyt=&i!+~d(V%GjH;-NsEEv6nS1TERt|RHh!0>W4+4pp z1-*EzAM~i`+1f(VEHI8So`S`akPfPTfq*`l{Fz`hS%k#JS0cjT2mS0#QLGf=J?1`he3W*;m4)ce8*WFq1sdP=~$5RlH1EdWm|~dCvKOi4*I_96{^95p#B<(n!d?B z=o`0{t+&OMwKcxiBECznJcfH!fL(z3OvmxP#oWd48|mMjpE||zdiTBdWelj8&Qosv zZFp@&UgXuvJw5y=q6*28AtxZzo-UUpkRW%ne+Ylf!V-0+uQXBW=5S1o#6LXNtY5!I z%Rkz#(S8Pjz*P7bqB6L|M#Er{|QLae-Y{KA>`^} z@lPjeX>90X|34S-7}ZVXe{wEei1<{*e8T-Nbj8JmD4iwcE+Hg_zhkPVm#=@b$;)h6 z<<6y`nPa`f3I6`!28d@kdM{uJOgM%`EvlQ5B2bL)Sl=|y@YB3KeOzz=9cUW3clPAU z^sYc}xf9{4Oj?L5MOlYxR{+>w=vJjvbyO5}ptT(o6dR|ygO$)nVCvNGnq(6;bHlBd zl?w-|plD8spjDF03g5ip;W3Z z><0{BCq!Dw;h5~#1BuQilq*TwEu)qy50@+BE4bX28+7erX{BD4H)N+7U`AVEuREE8 z;X?~fyhF-x_sRfHIj~6f(+^@H)D=ngP;mwJjxhQUbUdzk8f94Ab%59-eRIq?ZKrwD z(BFI=)xrUlgu(b|hAysqK<}8bslmNNeD=#JW*}^~Nrswn^xw*nL@Tx!49bfJecV&KC2G4q5a!NSv)06A_5N3Y?veAz;Gv+@U3R% z)~UA8-0LvVE{}8LVDOHzp~2twReqf}ODIyXMM6=W>kL|OHcx9P%+aJGYi_Om)b!xe zF40Vntn0+VP>o<$AtP&JANjXBn7$}C@{+@3I@cqlwR2MdwGhVPxlTIcRVu@Ho-wO` z_~Or~IMG)A_`6-p)KPS@cT9mu9RGA>dVh5wY$NM9-^c@N=hcNaw4ITjm;iWSP^ZX| z)_XpaI61<+La+U&&%2a z0za$)-wZP@mwSELo#3!PGTt$uy0C(nTT@9NX*r3Ctw6J~7A(m#8fE)0RBd`TdKfAT zCf@$MAxjP`O(u9s@c0Fd@|}UQ6qp)O5Q5DPCeE6mSIh|Rj{$cAVIWsA=xPKVKxdhg zLzPZ`3CS+KIO;T}0Ip!fAUaNU>++ZJZRk@I(h<)RsJUhZ&Ru9*!4Ptn;gX^~4E8W^TSR&~3BAZc#HquXn)OW|TJ`CTahk+{qe`5+ixON^zA9IFd8)kc%*!AiLu z>`SFoZ5bW-%7}xZ>gpJcx_hpF$2l+533{gW{a7ce^B9sIdmLrI0)4yivZ^(Vh@-1q zFT!NQK$Iz^xu%|EOK=n>ug;(7J4OnS$;yWmq>A;hsD_0oAbLYhW^1Vdt9>;(JIYjf zdb+&f&D4@4AS?!*XpH>8egQvSVX`36jMd>$+RgI|pEg))^djhGSo&#lhS~9%NuWfX zDDH;3T*GzRT@5=7ibO>N-6_XPBYxno@mD_3I#rDD?iADxX`! zh*v8^i*JEMzyN#bGEBz7;UYXki*Xr(9xXax(_1qVW=Ml)kSuvK$coq2A(5ZGhs_pF z$*w}FbN6+QDseuB9=fdp_MTs)nQf!2SlROQ!gBJBCXD&@-VurqHj0wm@LWX-TDmS= z71M__vAok|@!qgi#H&H%Vg-((ZfxPAL8AI{x|VV!9)ZE}_l>iWk8UPTGHs*?u7RfP z5MC&=c6X;XlUzrz5q?(!eO@~* zoh2I*%J7dF!!_!vXoSIn5o|wj1#_>K*&CIn{qSaRc&iFVxt*^20ngCL;QonIS>I5^ zMw8HXm>W0PGd*}Ko)f|~dDd%;Wu_RWI_d;&2g6R3S63Uzjd7dn%Svu-OKpx*o|N>F zZg=-~qLb~VRLpv`k zWSdfHh@?dp=s_X`{yxOlxE$4iuyS;Z-x!*E6eqmEm*j2bE@=ZI0YZ5%Yj29!5+J$4h{s($nakA`xgbO8w zi=*r}PWz#lTL_DSAu1?f%-2OjD}NHXp4pXOsCW;DS@BC3h-q4_l`<))8WgzkdXg3! zs1WMt32kS2E#L0p_|x+x**TFV=gn`m9BWlzF{b%6j-odf4{7a4y4Uaef@YaeuPhU8 zHBvRqN^;$Jizy+ z=zW{E5<>2gp$pH{M@S*!sJVQU)b*J5*bX4h>5VJve#Q6ga}cQ&iL#=(u+KroWrxa%8&~p{WEUF0il=db;-$=A;&9M{Rq`ouZ5m%BHT6%st%saGsD6)fQgLN}x@d3q>FC;=f%O3Cyg=Ke@Gh`XW za@RajqOE9UB6eE=zhG%|dYS)IW)&y&Id2n7r)6p_)vlRP7NJL(x4UbhlcFXWT8?K=%s7;z?Vjts?y2+r|uk8Wt(DM*73^W%pAkZa1Jd zNoE)8FvQA>Z`eR5Z@Ig6kS5?0h;`Y&OL2D&xnnAUzQz{YSdh0k zB3exx%A2TyI)M*EM6htrxSlep!Kk(P(VP`$p0G~f$smld6W1r_Z+o?=IB@^weq>5VYsYZZR@` z&XJFxd5{|KPZmVOSxc@^%71C@;z}}WhbF9p!%yLj3j%YOlPL5s>7I3vj25 z@xmf=*z%Wb4;Va6SDk9cv|r*lhZ`(y_*M@>q;wrn)oQx%B(2A$9(74>;$zmQ!4fN; z>XurIk-7@wZys<+7XL@0Fhe-f%*=(weaQEdR9Eh6>Kl-EcI({qoZqyzziGwpg-GM#251sK_ z=3|kitS!j%;fpc@oWn65SEL73^N&t>Ix37xgs= zYG%eQDJc|rqHFia0!_sm7`@lvcv)gfy(+KXA@E{3t1DaZ$DijWAcA)E0@X?2ziJ{v z&KOYZ|DdkM{}t+@{@*6ge}m%xfjIxi%qh`=^2Rwz@w0cCvZ&Tc#UmCDbVwABrON^x zEBK43FO@weA8s7zggCOWhMvGGE`baZ62cC)VHyy!5Zbt%ieH+XN|OLbAFPZWyC6)p z4P3%8sq9HdS3=ih^0OOlqTPbKuzQ?lBEI{w^ReUO{V?@`ARsL|S*%yOS=Z%sF)>-y z(LAQdhgAcuF6LQjRYfdbD1g4o%tV4EiK&ElLB&^VZHbrV1K>tHTO{#XTo>)2UMm`2 z^t4s;vnMQgf-njU-RVBRw0P0-m#d-u`(kq7NL&2T)TjI_@iKuPAK-@oH(J8?%(e!0Ir$yG32@CGUPn5w4)+9@8c&pGx z+K3GKESI4*`tYlmMHt@br;jBWTei&(a=iYslc^c#RU3Q&sYp zSG){)V<(g7+8W!Wxeb5zJb4XE{I|&Y4UrFWr%LHkdQ;~XU zgy^dH-Z3lmY+0G~?DrC_S4@=>0oM8Isw%g(id10gWkoz2Q%7W$bFk@mIzTCcIB(K8 zc<5h&ZzCdT=9n-D>&a8vl+=ZF*`uTvQviG_bLde*k>{^)&0o*b05x$MO3gVLUx`xZ z43j+>!u?XV)Yp@MmG%Y`+COH2?nQcMrQ%k~6#O%PeD_WvFO~Kct za4XoCM_X!c5vhRkIdV=xUB3xI2NNStK*8_Zl!cFjOvp-AY=D;5{uXj}GV{LK1~IE2 z|KffUiBaStRr;10R~K2VVtf{TzM7FaPm;Y(zQjILn+tIPSrJh&EMf6evaBKIvi42-WYU9Vhj~3< zZSM-B;E`g_o8_XTM9IzEL=9Lb^SPhe(f(-`Yh=X6O7+6ALXnTcUFpI>ekl6v)ZQeNCg2 z^H|{SKXHU*%nBQ@I3It0m^h+6tvI@FS=MYS$ZpBaG7j#V@P2ZuYySbp@hA# ze(kc;P4i_-_UDP?%<6>%tTRih6VBgScKU^BV6Aoeg6Uh(W^#J^V$Xo^4#Ekp ztqQVK^g9gKMTHvV7nb64UU7p~!B?>Y0oFH5T7#BSW#YfSB@5PtE~#SCCg3p^o=NkMk$<8- z6PT*yIKGrvne7+y3}_!AC8NNeI?iTY(&nakN>>U-zT0wzZf-RuyZk^X9H-DT_*wk= z;&0}6LsGtfVa1q)CEUPlx#(ED@-?H<1_FrHU#z5^P3lEB|qsxEyn%FOpjx z3S?~gvoXy~L(Q{Jh6*i~=f%9kM1>RGjBzQh_SaIDfSU_9!<>*Pm>l)cJD@wlyxpBV z4Fmhc2q=R_wHCEK69<*wG%}mgD1=FHi4h!98B-*vMu4ZGW~%IrYSLGU{^TuseqVgV zLP<%wirIL`VLyJv9XG_p8w@Q4HzNt-o;U@Au{7%Ji;53!7V8Rv0^Lu^Vf*sL>R(;c zQG_ZuFl)Mh-xEIkGu}?_(HwkB2jS;HdPLSxVU&Jxy9*XRG~^HY(f0g8Q}iqnVmgjI zfd=``2&8GsycjR?M%(zMjn;tn9agcq;&rR!Hp z$B*gzHsQ~aXw8c|a(L^LW(|`yGc!qOnV(ZjU_Q-4z1&0;jG&vAKuNG=F|H?@m5^N@ zq{E!1n;)kNTJ>|Hb2ODt-7U~-MOIFo%9I)_@7fnX+eMMNh>)V$IXesJpBn|uo8f~#aOFytCT zf9&%MCLf8mp4kwHTcojWmM3LU=#|{3L>E}SKwOd?%{HogCZ_Z1BSA}P#O(%H$;z7XyJ^sjGX;j5 zrzp>|Ud;*&VAU3x#f{CKwY7Vc{%TKKqmB@oTHA9;>?!nvMA;8+Jh=cambHz#J18x~ zs!dF>$*AnsQ{{82r5Aw&^7eRCdvcgyxH?*DV5(I$qXh^zS>us*I66_MbL8y4d3ULj z{S(ipo+T3Ag!+5`NU2sc+@*m{_X|&p#O-SAqF&g_n7ObB82~$p%fXA5GLHMC+#qqL zdt`sJC&6C2)=juQ_!NeD>U8lDVpAOkW*khf7MCcs$A(wiIl#B9HM%~GtQ^}yBPjT@ z+E=|A!Z?A(rwzZ;T}o6pOVqHzTr*i;Wrc%&36kc@jXq~+w8kVrs;%=IFdACoLAcCAmhFNpbP8;s`zG|HC2Gv?I~w4ITy=g$`0qMQdkijLSOtX6xW%Z9Nw<;M- zMN`c7=$QxN00DiSjbVt9Mi6-pjv*j(_8PyV-il8Q-&TwBwH1gz1uoxs6~uU}PrgWB zIAE_I-a1EqlIaGQNbcp@iI8W1sm9fBBNOk(k&iLBe%MCo#?xI$%ZmGA?=)M9D=0t7 zc)Q0LnI)kCy{`jCGy9lYX%mUsDWwsY`;jE(;Us@gmWPqjmXL+Hu#^;k%eT>{nMtzj zsV`Iy6leTA8-PndszF;N^X@CJrTw5IIm!GPeu)H2#FQitR{1p;MasQVAG3*+=9FYK zw*k!HT(YQorfQj+1*mCV458(T5=fH`um$gS38hw(OqVMyunQ;rW5aPbF##A3fGH6h z@W)i9Uff?qz`YbK4c}JzQpuxuE3pcQO)%xBRZp{zJ^-*|oryTxJ-rR+MXJ)!f=+pp z10H|DdGd2exhi+hftcYbM0_}C0ZI-2vh+$fU1acsB-YXid7O|=9L!3e@$H*6?G*Zp z%qFB(sgl=FcC=E4CYGp4CN>=M8#5r!RU!u+FJVlH6=gI5xHVD&k;Ta*M28BsxfMV~ zLz+@6TxnfLhF@5=yQo^1&S}cmTN@m!7*c6z;}~*!hNBjuE>NLVl2EwN!F+)0$R1S! zR|lF%n!9fkZ@gPW|x|B={V6x3`=jS*$Pu0+5OWf?wnIy>Y1MbbGSncpKO0qE(qO=ts z!~@&!N`10S593pVQu4FzpOh!tvg}p%zCU(aV5=~K#bKi zHdJ1>tQSrhW%KOky;iW+O_n;`l9~omqM%sdxdLtI`TrJzN6BQz+7xOl*rM>xVI2~# z)7FJ^Dc{DC<%~VS?@WXzuOG$YPLC;>#vUJ^MmtbSL`_yXtNKa$Hk+l-c!aC7gn(Cg ze?YPYZ(2Jw{SF6MiO5(%_pTo7j@&DHNW`|lD`~{iH+_eSTS&OC*2WTT*a`?|9w1dh zh1nh@$a}T#WE5$7Od~NvSEU)T(W$p$s5fe^GpG+7fdJ9=enRT9$wEk+ZaB>G3$KQO zgq?-rZZnIv!p#>Ty~}c*Lb_jxJg$eGM*XwHUwuQ|o^}b3^T6Bxx{!?va8aC@-xK*H ztJBFvFfsSWu89%@b^l3-B~O!CXs)I6Y}y#0C0U0R0WG zybjroj$io0j}3%P7zADXOwHwafT#uu*zfM!oD$6aJx7+WL%t-@6^rD_a_M?S^>c;z zMK580bZXo1f*L$CuMeM4Mp!;P@}b~$cd(s5*q~FP+NHSq;nw3fbWyH)i2)-;gQl{S zZO!T}A}fC}vUdskGSq&{`oxt~0i?0xhr6I47_tBc`fqaSrMOzR4>0H^;A zF)hX1nfHs)%Zb-(YGX;=#2R6C{BG;k=?FfP?9{_uFLri~-~AJ;jw({4MU7e*d)?P@ zXX*GkNY9ItFjhwgAIWq7Y!ksbMzfqpG)IrqKx9q{zu%Mdl+{Dis#p9q`02pr1LG8R z@As?eG!>IoROgS!@J*to<27coFc1zpkh?w=)h9CbYe%^Q!Ui46Y*HO0mr% zEff-*$ndMNw}H2a5@BsGj5oFfd!T(F&0$<{GO!Qdd?McKkorh=5{EIjDTHU`So>8V zBA-fqVLb2;u7UhDV1xMI?y>fe3~4urv3%PX)lDw+HYa;HFkaLqi4c~VtCm&Ca+9C~ zge+67hp#R9`+Euq59WhHX&7~RlXn=--m8$iZ~~1C8cv^2(qO#X0?vl91gzUKBeR1J z^p4!!&7)3#@@X&2aF2-)1Ffcc^F8r|RtdL2X%HgN&XU-KH2SLCbpw?J5xJ*!F-ypZ zMG%AJ!Pr&}`LW?E!K~=(NJxuSVTRCGJ$2a*Ao=uUDSys!OFYu!Vs2IT;xQ6EubLIl z+?+nMGeQQhh~??0!s4iQ#gm3!BpMpnY?04kK375e((Uc7B3RMj;wE?BCoQGu=UlZt!EZ1Q*auI)dj3Jj{Ujgt zW5hd~-HWBLI_3HuO) zNrb^XzPsTIb=*a69wAAA3J6AAZZ1VsYbIG}a`=d6?PjM)3EPaDpW2YP$|GrBX{q*! z$KBHNif)OKMBCFP5>!1d=DK>8u+Upm-{hj5o|Wn$vh1&K!lVfDB&47lw$tJ?d5|=B z^(_9=(1T3Fte)z^>|3**n}mIX;mMN5v2F#l(q*CvU{Ga`@VMp#%rQkDBy7kYbmb-q z<5!4iuB#Q_lLZ8}h|hPODI^U6`gzLJre9u3k3c#%86IKI*^H-@I48Bi*@avYm4v!n0+v zWu{M{&F8#p9cx+gF0yTB_<2QUrjMPo9*7^-uP#~gGW~y3nfPAoV%amgr>PSyVAd@l)}8#X zR5zV6t*uKJZL}?NYvPVK6J0v4iVpwiN|>+t3aYiZSp;m0!(1`bHO}TEtWR1tY%BPB z(W!0DmXbZAsT$iC13p4f>u*ZAy@JoLAkJhzFf1#4;#1deO8#8d&89}en&z!W&A3++^1(;>0SB1*54d@y&9Pn;^IAf3GiXbfT`_>{R+Xv; zQvgL>+0#8-laO!j#-WB~(I>l0NCMt_;@Gp_f0#^c)t?&#Xh1-7RR0@zPyBz!U#0Av zT?}n({(p?p7!4S2ZBw)#KdCG)uPnZe+U|0{BW!m)9 zi_9$F?m<`2!`JNFv+w8MK_K)qJ^aO@7-Ig>cM4-r0bi=>?B_2mFNJ}aE3<+QCzRr*NA!QjHw# z`1OsvcoD0?%jq{*7b!l|L1+Tw0TTAM4XMq7*ntc-Ived>Sj_ZtS|uVdpfg1_I9knY z2{GM_j5sDC7(W&}#s{jqbybqJWyn?{PW*&cQIU|*v8YGOKKlGl@?c#TCnmnAkAzV- zmK={|1G90zz=YUvC}+fMqts0d4vgA%t6Jhjv?d;(Z}(Ep8fTZfHA9``fdUHkA+z3+ zhh{ohP%Bj?T~{i0sYCQ}uC#5BwN`skI7`|c%kqkyWIQ;!ysvA8H`b-t()n6>GJj6xlYDu~8qX{AFo$Cm3d|XFL=4uvc?Keb zzb0ZmMoXca6Mob>JqkNuoP>B2Z>D`Q(TvrG6m`j}-1rGP!g|qoL=$FVQYxJQjFn33lODt3Wb1j8VR zlR++vIT6^DtYxAv_hxupbLLN3e0%A%a+hWTKDV3!Fjr^cWJ{scsAdfhpI)`Bms^M6 zQG$waKgFr=c|p9Piug=fcJvZ1ThMnNhQvBAg-8~b1?6wL*WyqXhtj^g(Ke}mEfZVM zJuLNTUVh#WsE*a6uqiz`b#9ZYg3+2%=C(6AvZGc=u&<6??!slB1a9K)=VL zY9EL^mfyKnD zSJyYBc_>G;5RRnrNgzJz#Rkn3S1`mZgO`(r5;Hw6MveN(URf_XS-r58Cn80K)ArH4 z#Rrd~LG1W&@ttw85cjp8xV&>$b%nSXH_*W}7Ch2pg$$c0BdEo-HWRTZcxngIBJad> z;C>b{jIXjb_9Jis?NZJsdm^EG}e*pR&DAy0EaSGi3XWTa(>C%tz1n$u?5Fb z1qtl?;_yjYo)(gB^iQq?=jusF%kywm?CJP~zEHi0NbZ);$(H$w(Hy@{i>$wcVRD_X|w-~(0Z9BJyh zhNh;+eQ9BEIs;tPz%jSVnfCP!3L&9YtEP;svoj_bNzeGSQIAjd zBss@A;)R^WAu-37RQrM%{DfBNRx>v!G31Z}8-El9IOJlb_MSoMu2}GDYycNaf>uny z+8xykD-7ONCM!APry_Lw6-yT>5!tR}W;W`C)1>pxSs5o1z#j7%m=&=7O4hz+Lsqm` z*>{+xsabZPr&X=}G@obTb{nPTkccJX8w3CG7X+1+t{JcMabv~UNv+G?txRqXib~c^Mo}`q{$`;EBNJ;#F*{gvS12kV?AZ%O0SFB$^ zn+}!HbmEj}w{Vq(G)OGAzH}R~kS^;(-s&=ectz8vN!_)Yl$$U@HNTI-pV`LSj7Opu zTZ5zZ)-S_{GcEQPIQXLQ#oMS`HPu{`SQiAZ)m1at*Hy%3xma|>o`h%E%8BEbi9p0r zVjcsh<{NBKQ4eKlXU|}@XJ#@uQw*$4BxKn6#W~I4T<^f99~(=}a`&3(ur8R9t+|AQ zWkQx7l}wa48-jO@ft2h+7qn%SJtL%~890FG0s5g*kNbL3I&@brh&f6)TlM`K^(bhr zJWM6N6x3flOw$@|C@kPi7yP&SP?bzP-E|HSXQXG>7gk|R9BTj`e=4de9C6+H7H7n# z#GJeVs1mtHhLDmVO?LkYRQc`DVOJ_vdl8VUihO-j#t=0T3%Fc1f9F73ufJz*adn*p zc%&vi(4NqHu^R>sAT_0EDjVR8bc%wTz#$;%NU-kbDyL_dg0%TFafZwZ?5KZpcuaO54Z9hX zD$u>q!-9`U6-D`E#`W~fIfiIF5_m6{fvM)b1NG3xf4Auw;Go~Fu7cth#DlUn{@~yu z=B;RT*dp?bO}o%4x7k9v{r=Y@^YQ^UUm(Qmliw8brO^=NP+UOohLYiaEB3^DB56&V zK?4jV61B|1Uj_5fBKW;8LdwOFZKWp)g{B%7g1~DgO&N& z#lisxf?R~Z@?3E$Mms$$JK8oe@X`5m98V*aV6Ua}8Xs2#A!{x?IP|N(%nxsH?^c{& z@vY&R1QmQs83BW28qAmJfS7MYi=h(YK??@EhjL-t*5W!p z^gYX!Q6-vBqcv~ruw@oMaU&qp0Fb(dbVzm5xJN%0o_^@fWq$oa3X?9s%+b)x4w-q5Koe(@j6Ez7V@~NRFvd zfBH~)U5!ix3isg`6be__wBJp=1@yfsCMw1C@y+9WYD9_C%{Q~7^0AF2KFryfLlUP# zwrtJEcH)jm48!6tUcxiurAMaiD04C&tPe6DI0#aoqz#Bt0_7_*X*TsF7u*zv(iEfA z;$@?XVu~oX#1YXtceQL{dSneL&*nDug^OW$DSLF0M1Im|sSX8R26&)<0Fbh^*l6!5wfSu8MpMoh=2l z^^0Sr$UpZp*9oqa23fcCfm7`ya2<4wzJ`Axt7e4jJrRFVf?nY~2&tRL* zd;6_njcz01c>$IvN=?K}9ie%Z(BO@JG2J}fT#BJQ+f5LFSgup7i!xWRKw6)iITjZU z%l6hPZia>R!`aZjwCp}I zg)%20;}f+&@t;(%5;RHL>K_&7MH^S+7<|(SZH!u zznW|jz$uA`P9@ZWtJgv$EFp>)K&Gt+4C6#*khZQXS*S~6N%JDT$r`aJDs9|uXWdbg zBwho$phWx}x!qy8&}6y5Vr$G{yGSE*r$^r{}pw zVTZKvikRZ`J_IJrjc=X1uw?estdwm&bEahku&D04HD+0Bm~q#YGS6gp!KLf$A{%Qd z&&yX@Hp>~(wU{|(#U&Bf92+1i&Q*-S+=y=3pSZy$#8Uc$#7oiJUuO{cE6=tsPhwPe| zxQpK>`Dbka`V)$}e6_OXKLB%i76~4N*zA?X+PrhH<&)}prET;kel24kW%+9))G^JI zsq7L{P}^#QsZViX%KgxBvEugr>ZmFqe^oAg?{EI=&_O#e)F3V#rc z8$4}0Zr19qd3tE4#$3_f=Bbx9oV6VO!d3(R===i-7p=Vj`520w0D3W6lQfY48}!D* z&)lZMG;~er2qBoI2gsX+Ts-hnpS~NYRDtPd^FPzn!^&yxRy#CSz(b&E*tL|jIkq|l zf%>)7Dtu>jCf`-7R#*GhGn4FkYf;B$+9IxmqH|lf6$4irg{0ept__%)V*R_OK=T06 zyT_m-o@Kp6U{l5h>W1hGq*X#8*y@<;vsOFqEjTQXFEotR+{3}ODDnj;o0@!bB5x=N z394FojuGOtVKBlVRLtHp%EJv_G5q=AgF)SKyRN5=cGBjDWv4LDn$IL`*=~J7u&Dy5 zrMc83y+w^F&{?X(KOOAl-sWZDb{9X9#jrQtmrEXD?;h-}SYT7yM(X_6qksM=K_a;Z z3u0qT0TtaNvDER_8x*rxXw&C^|h{P1qxK|@pS7vdlZ#P z7PdB7MmC2}%sdzAxt>;WM1s0??`1983O4nFK|hVAbHcZ3x{PzytQLkCVk7hA!Lo` zEJH?4qw|}WH{dc4z%aB=0XqsFW?^p=X}4xnCJXK%c#ItOSjdSO`UXJyuc8bh^Cf}8 z@Ht|vXd^6{Fgai8*tmyRGmD_s_nv~r^Fy7j`Bu`6=G)5H$i7Q7lvQnmea&TGvJp9a|qOrUymZ$6G|Ly z#zOCg++$3iB$!6!>215A4!iryregKuUT344X)jQb3|9qY>c0LO{6Vby05n~VFzd?q zgGZv&FGlkiH*`fTurp>B8v&nSxNz)=5IF$=@rgND4d`!AaaX;_lK~)-U8la_Wa8i?NJC@BURO*sUW)E9oyv3RG^YGfN%BmxzjlT)bp*$<| zX3tt?EAy<&K+bhIuMs-g#=d1}N_?isY)6Ay$mDOKRh z4v1asEGWoAp=srraLW^h&_Uw|6O+r;wns=uwYm=JN4Q!quD8SQRSeEcGh|Eb5Jg8m zOT}u;N|x@aq)=&;wufCc^#)5U^VcZw;d_wwaoh9$p@Xrc{DD6GZUqZ ziC6OT^zSq@-lhbgR8B+e;7_Giv;DK5gn^$bs<6~SUadiosfewWDJu`XsBfOd1|p=q zE>m=zF}!lObA%ePey~gqU8S6h-^J2Y?>7)L2+%8kV}Gp=h`Xm_}rlm)SyUS=`=S7msKu zC|T!gPiI1rWGb1z$Md?0YJQ;%>uPLOXf1Z>N~`~JHJ!^@D5kSXQ4ugnFZ>^`zH8CAiZmp z6Ms|#2gcGsQ{{u7+Nb9sA?U>(0e$5V1|WVwY`Kn)rsnnZ4=1u=7u!4WexZD^IQ1Jk zfF#NLe>W$3m&C^ULjdw+5|)-BSHwpegdyt9NYC{3@QtMfd8GrIWDu`gd0nv-3LpGCh@wgBaG z176tikL!_NXM+Bv#7q^cyn9$XSeZR6#!B4JE@GVH zoobHZN_*RF#@_SVYKkQ_igme-Y5U}cV(hkR#k1c{bQNMji zU7aE`?dHyx=1`kOYZo_8U7?3-7vHOp`Qe%Z*i+FX!s?6huNp0iCEW-Z7E&jRWmUW_ z67j>)Ew!yq)hhG4o?^z}HWH-e=es#xJUhDRc4B51M4~E-l5VZ!&zQq`gWe`?}#b~7w1LH4Xa-UCT5LXkXQWheBa2YJYbyQ zl1pXR%b(KCXMO0OsXgl0P0Og<{(@&z1aokU-Pq`eQq*JYgt8xdFQ6S z6Z3IFSua8W&M#`~*L#r>Jfd6*BzJ?JFdBR#bDv$_0N!_5vnmo@!>vULcDm`MFU823 zpG9pqjqz^FE5zMDoGqhs5OMmC{Y3iVcl>F}5Rs24Y5B^mYQ;1T&ks@pIApHOdrzXF z-SdX}Hf{X;TaSxG_T$0~#RhqKISGKNK47}0*x&nRIPtmdwxc&QT3$8&!3fWu1eZ_P zJveQj^hJL#Sn!*4k`3}(d(aasl&7G0j0-*_2xtAnoX1@9+h zO#c>YQg60Z;o{Bi=3i7S`Ic+ZE>K{(u|#)9y}q*j8uKQ1^>+(BI}m%1v3$=4ojGBc zm+o1*!T&b}-lVvZqIUBc8V}QyFEgm#oyIuC{8WqUNV{Toz`oxhYpP!_p2oHHh5P@iB*NVo~2=GQm+8Yrkm2Xjc_VyHg1c0>+o~@>*Qzo zHVBJS>$$}$_4EniTI;b1WShX<5-p#TPB&!;lP!lBVBbLOOxh6FuYloD%m;n{r|;MU3!q4AVkua~fieeWu2 zQAQ$ue(IklX6+V;F1vCu-&V?I3d42FgWgsb_e^29ol}HYft?{SLf>DrmOp9o!t>I^ zY7fBCk+E8n_|apgM|-;^=#B?6RnFKlN`oR)`e$+;D=yO-(U^jV;rft^G_zl`n7qnM zL z*-Y4Phq+ZI1$j$F-f;`CD#|`-T~OM5Q>x}a>B~Gb3-+9i>Lfr|Ca6S^8g*{*?_5!x zH_N!SoRP=gX1?)q%>QTY!r77e2j9W(I!uAz{T`NdNmPBBUzi2{`XMB^zJGGwFWeA9 z{fk33#*9SO0)DjROug+(M)I-pKA!CX;IY(#gE!UxXVsa)X!UftIN98{pt#4MJHOhY zM$_l}-TJlxY?LS6Nuz1T<44m<4i^8k@D$zuCPrkmz@sdv+{ciyFJG2Zwy&%c7;atIeTdh!a(R^QXnu1Oq1b42*OQFWnyQ zWeQrdvP|w_idy53Wa<{QH^lFmEd+VlJkyiC>6B#s)F;w-{c;aKIm;Kp50HnA-o3lY z9B~F$gJ@yYE#g#X&3ADx&tO+P_@mnQTz9gv30_sTsaGXkfNYXY{$(>*PEN3QL>I!k zp)KibPhrfX3%Z$H6SY`rXGYS~143wZrG2;=FLj50+VM6soI~up_>fU(2Wl@{BRsMi zO%sL3x?2l1cXTF)k&moNsHfQrQ+wu(gBt{sk#CU=UhrvJIncy@tJX5klLjgMn>~h= zg|FR&;@eh|C7`>s_9c~0-{IAPV){l|Ts`i=)AW;d9&KPc3fMeoTS%8@V~D8*h;&(^>yjT84MM}=%#LS7shLAuuj(0VAYoozhWjq z4LEr?wUe2^WGwdTIgWBkDUJa>YP@5d9^Rs$kCXmMRxuF*YMVrn?0NFyPl}>`&dqZb z<5eqR=ZG3>n2{6v6BvJ`YBZeeTtB88TAY(x0a58EWyuf>+^|x8Qa6wA|1Nb_p|nA zWWa}|z8a)--Wj`LqyFk_a3gN2>5{Rl_wbW?#by7&i*^hRknK%jwIH6=dQ8*-_{*x0j^DUfMX0`|K@6C<|1cgZ~D(e5vBFFm;HTZF(!vT8=T$K+|F)x3kqzBV4-=p1V(lzi(s7jdu0>LD#N=$Lk#3HkG!a zIF<7>%B7sRNzJ66KrFV76J<2bdYhxll0y2^_rdG=I%AgW4~)1Nvz=$1UkE^J%BxLo z+lUci`UcU062os*=`-j4IfSQA{w@y|3}Vk?i;&SSdh8n+$iHA#%ERL{;EpXl6u&8@ zzg}?hkEOUOJt?ZL=pWZFJ19mI1@P=$U5*Im1e_8Z${JsM>Ov?nh8Z zP5QvI!{Jy@&BP48%P2{Jr_VgzW;P@7)M9n|lDT|Ep#}7C$&ud&6>C^5ZiwKIg2McPU(4jhM!BD@@L(Gd*Nu$ji(ljZ<{FIeW_1Mmf;76{LU z-ywN~=uNN)Xi6$<12A9y)K%X|(W0p|&>>4OXB?IiYr||WKDOJPxiSe01NSV-h24^L z_>m$;|C+q!Mj**-qQ$L-*++en(g|hw;M!^%_h-iDjFHLo-n3JpB;p?+o2;`*jpvJU zLY^lt)Un4joij^^)O(CKs@7E%*!w>!HA4Q?0}oBJ7Nr8NQ7QmY^4~jvf0-`%waOLn zdNjAPaC0_7c|RVhw)+71NWjRi!y>C+Bl;Z`NiL^zn2*0kmj5gyhCLCxts*cWCdRI| zjsd=sT5BVJc^$GxP~YF$-U{-?kW6r@^vHXB%{CqYzU@1>dzf#3SYedJG-Rm6^RB7s zGM5PR(yKPKR)>?~vpUIeTP7A1sc8-knnJk*9)3t^e%izbdm>Y=W{$wm(cy1RB-19i za#828DMBY+ps#7Y8^6t)=Ea@%Nkt)O6JCx|ybC;Ap}Z@Zw~*}3P>MZLPb4Enxz9Wf zssobT^(R@KuShj8>@!1M7tm|2%-pYYDxz-5`rCbaTCG5{;Uxm z*g=+H1X8{NUvFGzz~wXa%Eo};I;~`37*WrRU&K0dPSB$yk(Z*@K&+mFal^?c zurbqB-+|Kb5|sznT;?Pj!+kgFY1#Dr;_%A(GIQC{3ct|{*Bji%FNa6c-thbpBkA;U zURV!Dr&X{0J}iht#-Qp2=xzuh(fM>zRoiGrYl5ttw2#r34gC41CCOC31m~^UPTK@s z6;A@)7O7_%C)>bnAXerYuAHdE93>j2N}H${zEc6&SbZ|-fiG*-qtGuy-qDelH(|u$ zorf8_T6Zqe#Ub!+e3oSyrskt_HyW_^5lrWt#30l)tHk|j$@YyEkXUOV;6B51L;M@=NIWZXU;GrAa(LGxO%|im%7F<-6N;en0Cr zLH>l*y?pMwt`1*cH~LdBPFY_l;~`N!Clyfr;7w<^X;&(ZiVdF1S5e(+Q%60zgh)s4 zn2yj$+mE=miVERP(g8}G4<85^-5f@qxh2ec?n+$A_`?qN=iyT1?U@t?V6DM~BIlBB z>u~eXm-aE>R0sQy!-I4xtCNi!!qh?R1!kKf6BoH2GG{L4%PAz0{Sh6xpuyI%*~u)s z%rLuFl)uQUCBQAtMyN;%)zFMx4loh7uTfKeB2Xif`lN?2gq6NhWhfz0u5WP9J>=V2 zo{mLtSy&BA!mSzs&CrKWq^y40JF5a&GSXIi2= z{EYb59J4}VwikL4P=>+mc6{($FNE@e=VUwG+KV21;<@lrN`mnz5jYGASyvz7BOG_6(p^eTxD-4O#lROgon;R35=|nj#eHIfJBYPWG>H>`dHKCDZ3`R{-?HO0mE~(5_WYcFmp8sU?wr*UkAQiNDGc6T zA%}GOLXlOWqL?WwfHO8MB#8M8*~Y*gz;1rWWoVSXP&IbKxbQ8+s%4Jnt?kDsq7btI zCDr0PZ)b;B%!lu&CT#RJzm{l{2fq|BcY85`w~3LSK<><@(2EdzFLt9Y_`;WXL6x`0 zDoQ?=?I@Hbr;*VVll1Gmd8*%tiXggMK81a+T(5Gx6;eNb8=uYn z5BG-0g>pP21NPn>$ntBh>`*})Fl|38oC^9Qz>~MAazH%3Q~Qb!ALMf$srexgPZ2@&c~+hxRi1;}+)-06)!#Mq<6GhP z-Q?qmgo${aFBApb5p}$1OJKTClfi8%PpnczyVKkoHw7Ml9e7ikrF0d~UB}i3vizos zXW4DN$SiEV9{faLt5bHy2a>33K%7Td-n5C*N;f&ZqAg#2hIqEb(y<&f4u5BWJ>2^4 z414GosL=Aom#m&=x_v<0-fp1r%oVJ{T-(xnomNJ(Dryv zh?vj+%=II_nV+@NR+(!fZZVM&(W6{6%9cm+o+Z6}KqzLw{(>E86uA1`_K$HqINlb1 zKelh3-jr2I9V?ych`{hta9wQ2c9=MM`2cC{m6^MhlL2{DLv7C^j z$xXBCnDl_;l|bPGMX@*tV)B!c|4oZyftUlP*?$YU9C_eAsuVHJ58?)zpbr30P*C`T z7y#ao`uE-SOG(Pi+`$=e^mle~)pRrdwL5)N;o{gpW21of(QE#U6w%*C~`v-z0QqBML!!5EeYA5IQB0 z^l01c;L6E(iytN!LhL}wfwP7W9PNAkb+)Cst?qg#$n;z41O4&v+8-zPs+XNb-q zIeeBCh#ivnFLUCwfS;p{LC0O7tm+Sf9Jn)~b%uwP{%69;QC)Ok0t%*a5M+=;y8j=v z#!*pp$9@!x;UMIs4~hP#pnfVc!%-D<+wsG@R2+J&%73lK|2G!EQC)O05TCV=&3g)C!lT=czLpZ@Sa%TYuoE?v8T8`V;e$#Zf2_Nj6nvBgh1)2 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/settings.gradle.kts b/settings.gradle.kts index 47236bc..3f70b9c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -25,7 +25,6 @@ pluginManagement { } plugins { - // Use the Foojay Toolchains plugin to automatically download JDKs required by subprojects. id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } @@ -34,3 +33,4 @@ plugins { // Learn more about structuring projects with Gradle - https://docs.gradle.org/8.7/userguide/multi_project_builds.html include(":MC20.5-21.1") include(":MC20-20.4") +include("MC21.2")