From 6ee252e545bc2e1b807d15353d2e07c6ef6b13f7 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 18:52:15 +0100 Subject: [PATCH 01/37] Updated template files. --- build.gradle | 135 ++++++------------ gradle.properties | 57 ++------ settings.gradle | 3 +- .../micle/wildflowers_backport/Config.java | 51 ------- .../WildflowersBackport.java | 111 +------------- src/main/resources/META-INF/mods.toml | 75 +++------- .../wildflowers_backport.mixins.json | 14 ++ 7 files changed, 95 insertions(+), 351 deletions(-) delete mode 100644 src/main/java/dev/micle/wildflowers_backport/Config.java create mode 100644 src/main/resources/wildflowers_backport.mixins.json diff --git a/build.gradle b/build.gradle index 8d62beb..9ce4280 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,28 @@ +buildscript { + repositories { + // These repositories are only for Gradle plugins, put any other repositories in the repository block further below + maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } + mavenCentral() + } + dependencies { + classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' + } +} + plugins { id 'eclipse' id 'idea' id 'net.minecraftforge.gradle' version '[6.0.16,6.2)' + id 'org.parchmentmc.librarian.forgegradle' version '1.+' } +apply plugin: 'org.spongepowered.mixin' group = mod_group_id version = mod_version base { - archivesName = mod_id + archivesName = "${mod_id}-${minecraft_version}" } java { @@ -17,62 +30,18 @@ java { } minecraft { - // The mappings can be changed at any time and must be in the following format. - // Channel: Version: - // official MCVersion Official field/method names from Mojang mapping files - // parchment YYYY.MM.DD-MCVersion Open community-sourced parameter names and javadocs layered on top of official - // - // You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. - // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md - // - // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge - // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started - // - // Use non-default mappings at your own risk. They may not always work. - // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: mapping_channel, version: mapping_version + mappings channel: mapping_channel, version: "$mapping_version-$minecraft_version" - // When true, this property will have all Eclipse/IntelliJ IDEA run configurations run the "prepareX" task for the given run configuration before launching the game. - // In most cases, it is not necessary to enable. - // enableEclipsePrepareRuns = true - // enableIdeaPrepareRuns = true - - // This property allows configuring Gradle's ProcessResources task(s) to run on IDE output locations before launching the game. - // It is REQUIRED to be set to true for this template to function. - // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html copyIdeResources = true - - // When true, this property will add the folder name of all declared run configurations to generated IDE run configurations. - // The folder name can be set on a run configuration using the "folderName" property. - // By default, the folder name of a run configuration is the name of the Gradle project containing it. // generateRunFolders = true + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ - // This property enables access transformers for use in development. - // They will be applied to the Minecraft artifact. - // The access transformer file can be anywhere in the project. - // However, it must be at "META-INF/accesstransformer.cfg" in the final mod jar to be loaded by Forge. - // This default location is a best practice to automatically put the file in the right place in the final jar. - // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information. - // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') - - // Default run configurations. - // These can be tweaked, removed, or duplicated as needed. runs { // applies to all the run configs below configureEach { workingDirectory project.file('run') - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. property 'forge.logging.markers', 'REGISTRIES' - - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' mods { @@ -83,7 +52,6 @@ minecraft { } client { - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. property 'forge.enabledGameTestNamespaces', mod_id } @@ -92,72 +60,53 @@ minecraft { args '--nogui' } - // This run config launches GameTestServer and runs all registered gametests, then exits. - // By default, the server will crash when no gametests are provided. - // The gametest system is also enabled by default for other run configs under the /test command. gameTestServer { property 'forge.enabledGameTestNamespaces', mod_id } data { - // example of overriding the workingDirectory set in configureEach above workingDirectory project.file('run-data') - - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') } } } -// Include resources generated by data generators. -sourceSets.main.resources { srcDir 'src/generated/resources' } +mixin { + add sourceSets.main, "${mod_id}.refmap.json" + + config "${mod_id}.mixins.json" +} + +sourceSets.main.resources { + srcDir 'src/generated/resources' +} repositories { - // Put repositories for dependencies here - // ForgeGradle automatically adds the Forge maven and Maven Central for you - - // If you have mod jar dependencies in ./libs, you can declare them as a repository like so. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html#sub:flat_dir_resolver - // flatDir { - // dir 'libs' - // } + exclusiveContent { + forRepository { + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + } + } + forRepositories(fg.repository) // Only add this if you're using ForgeGradle, otherwise remove this line + filter { + includeGroup "maven.modrinth" + } + } } dependencies { - // Specify the version of Minecraft to use. - // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. - // The "userdev" classifier will be requested and setup by ForgeGradle. - // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], - // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - - // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings - // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime - // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-common-api:${jei_version}") - // compileOnly fg.deobf("mezz.jei:jei-${mc_version}-forge-api:${jei_version}") - // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}") - - // Example mod dependency using a mod jar from ./libs with a flat dir repository - // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar - // The group id is ignored when searching -- in this case, it is "blank" - // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") - - // For more info: - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - + annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' } -// This block of code expands all declared replace properties in the specified resource targets. -// A missing property will result in an error. Properties are expanded using ${} Groovy notation. -// When "copyIdeResources" is enabled, this will also run before the game launches in IDE environments. -// See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html tasks.named('processResources', ProcessResources).configure { var replaceProperties = [minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, forge_version : forge_version, forge_version_range: forge_version_range, loader_version_range: loader_version_range, mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, - mod_authors : mod_authors, mod_description: mod_description,] + mod_authors : mod_authors, mod_description: mod_description] inputs.properties replaceProperties @@ -166,22 +115,20 @@ tasks.named('processResources', ProcessResources).configure { } } -// Example for how to get properties into the manifest for reading at runtime. tasks.named('jar', Jar).configure { manifest { attributes(["Specification-Title" : mod_id, "Specification-Vendor" : mod_authors, - "Specification-Version" : "1", // We are version 1 of ourselves + "Specification-Version" : "1", "Implementation-Title" : project.name, "Implementation-Version" : project.jar.archiveVersion, "Implementation-Vendor" : mod_authors, "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")]) } - // This is the preferred method to reobfuscate your jar file finalizedBy 'reobfJar' } tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation + options.encoding = 'UTF-8' } diff --git a/gradle.properties b/gradle.properties index 5a80f96..8a6fd51 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,49 +1,20 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -# The Minecraft version must agree with the Forge version to get a valid artifact -minecraft_version=1.20.1 -# The Minecraft version range can use any release version of Minecraft as bounds. -# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly -# as they do not follow standard versioning conventions. -minecraft_version_range=[1.20.1,1.21) -# The Forge version must agree with the Minecraft version to get a valid artifact -forge_version=47.4.20 -# The Forge version range can use any version of Forge as bounds or match the loader version range -forge_version_range=[47,) -# The loader version range can only use the major version of Forge/FML as bounds -loader_version_range=[47,) -# The mapping channel to use for mappings. -# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"]. -# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin. -# -# | Channel | Version | | -# |-----------|----------------------|--------------------------------------------------------------------------------| -# | official | MCVersion | Official field/method names from Mojang mapping files | -# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official | -# -# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings. -# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md -# -# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge. -# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started -mapping_channel=official -# The mapping version to query from the mapping channel. -# This must match the format required by the mapping channel. -mapping_version=1.20.1 -# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} -# Must match the String constant located in the main mod class annotated with @Mod. + mod_id=wildflowers_backport -# The human-readable display name for the mod. -mod_name=wildflowers_backport -# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_name=Wildflowers Backport mod_license=All Rights Reserved -# The mod version. See https://semver.org/ mod_version=1.0.0 -# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. -# This should match the base package used for the mod sources. -# See https://maven.apache.org/guides/mini/guide-naming-conventions.html mod_group_id=dev.micle -# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. -mod_authors= -# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. -mod_description= +mod_authors=Micle +mod_description=Wildflowers backport from 1.21.5. + +minecraft_version=1.20.1 +minecraft_version_range=[1.20.1,1.21) + +forge_version=47.4.20 +forge_version_range=[47,) +loader_version_range=[47,) + +mapping_channel=parchment +mapping_version=2023.09.03 diff --git a/settings.gradle b/settings.gradle index e1bf54c..45fe14b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,6 +5,7 @@ pluginManagement { name = 'MinecraftForge' url = 'https://maven.minecraftforge.net/' } + maven { url = 'https://maven.parchmentmc.org' } } } @@ -12,4 +13,4 @@ plugins { id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' } -rootProject.name = 'wildflowers_backport' +rootProject.name = "${mod_id}-${minecraft_version}" diff --git a/src/main/java/dev/micle/wildflowers_backport/Config.java b/src/main/java/dev/micle/wildflowers_backport/Config.java deleted file mode 100644 index 9f8a295..0000000 --- a/src/main/java/dev/micle/wildflowers_backport/Config.java +++ /dev/null @@ -1,51 +0,0 @@ -package dev.micle.wildflowers_backport; - -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.config.ModConfigEvent; -import net.minecraftforge.registries.ForgeRegistries; - -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -// An example config class. This is not required, but it's a good idea to have one to keep your config organized. -// Demonstrates how to use Forge's config APIs -@Mod.EventBusSubscriber(modid = WildflowersBackport.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class Config { - private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder(); - - private static final ForgeConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER.comment("Whether to log the dirt block on common setup").define("logDirtBlock", true); - - private static final ForgeConfigSpec.IntValue MAGIC_NUMBER = BUILDER.comment("A magic number").defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE); - - public static final ForgeConfigSpec.ConfigValue MAGIC_NUMBER_INTRODUCTION = BUILDER.comment("What you want the introduction message to be for the magic number").define("magicNumberIntroduction", "The magic number is... "); - - // a list of strings that are treated as resource locations for items - private static final ForgeConfigSpec.ConfigValue> ITEM_STRINGS = BUILDER.comment("A list of items to log on common setup.").defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), Config::validateItemName); - - static final ForgeConfigSpec SPEC = BUILDER.build(); - - public static boolean logDirtBlock; - public static int magicNumber; - public static String magicNumberIntroduction; - public static Set items; - - private static boolean validateItemName(final Object obj) { - return obj instanceof final String itemName && ForgeRegistries.ITEMS.containsKey(new ResourceLocation(itemName)); - } - - @SubscribeEvent - static void onLoad(final ModConfigEvent event) { - logDirtBlock = LOG_DIRT_BLOCK.get(); - magicNumber = MAGIC_NUMBER.get(); - magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get(); - - // convert the list of strings into a set of items - items = ITEM_STRINGS.get().stream().map(itemName -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(itemName))).collect(Collectors.toSet()); - } -} diff --git a/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java b/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java index b08f109..0a2bbd9 100644 --- a/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java +++ b/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java @@ -1,118 +1,13 @@ package dev.micle.wildflowers_backport; import com.mojang.logging.LogUtils; -import net.minecraft.client.Minecraft; -import net.minecraft.core.registries.Registries; -import net.minecraft.world.food.FoodProperties; -import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.CreativeModeTabs; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.MapColor; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; -import net.minecraftforge.event.server.ServerStartingEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.config.ModConfig; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.registries.DeferredRegister; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; import org.slf4j.Logger; -// The value here should match an entry in the META-INF/mods.toml file -@Mod(WildflowersBackport.MODID) +@Mod(WildflowersBackport.MOD_ID) public class WildflowersBackport { - - // Define mod id in a common place for everything to reference - public static final String MODID = "wildflowers_backport"; - // Directly reference a slf4j logger + public static final String MOD_ID = "wildflowers_backport"; private static final Logger LOGGER = LogUtils.getLogger(); - // Create a Deferred Register to hold Blocks which will all be registered under the "wildflowers_backport" namespace - public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID); - // Create a Deferred Register to hold Items which will all be registered under the "wildflowers_backport" namespace - public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID); - // Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "wildflowers_backport" namespace - public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID); - // Creates a new Block with the id "wildflowers_backport:example_block", combining the namespace and path - public static final RegistryObject EXAMPLE_BLOCK = BLOCKS.register("example_block", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE))); - // Creates a new BlockItem with the id "wildflowers_backport:example_block", combining the namespace and path - public static final RegistryObject EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties())); - - // Creates a new food item with the id "wildflowers_backport:example_id", nutrition 1 and saturation 2 - public static final RegistryObject EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties().food(new FoodProperties.Builder().alwaysEat().nutrition(1).saturationMod(2f).build()))); - - // Creates a creative tab with the id "wildflowers_backport:example_tab" for the example item, that is placed after the combat tab - public static final RegistryObject EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder().withTabsBefore(CreativeModeTabs.COMBAT).icon(() -> EXAMPLE_ITEM.get().getDefaultInstance()).displayItems((parameters, output) -> { - output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event - }).build()); - - public WildflowersBackport() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - - // Register the commonSetup method for modloading - modEventBus.addListener(this::commonSetup); - - // Register the Deferred Register to the mod event bus so blocks get registered - BLOCKS.register(modEventBus); - // Register the Deferred Register to the mod event bus so items get registered - ITEMS.register(modEventBus); - // Register the Deferred Register to the mod event bus so tabs get registered - CREATIVE_MODE_TABS.register(modEventBus); - - // Register ourselves for server and other game events we are interested in - MinecraftForge.EVENT_BUS.register(this); - - // Register the item to a creative tab - modEventBus.addListener(this::addCreative); - - // Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us - ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC); - } - - private void commonSetup(final FMLCommonSetupEvent event) { - // Some common setup code - LOGGER.info("HELLO FROM COMMON SETUP"); - LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT)); - - if (Config.logDirtBlock) LOGGER.info("DIRT BLOCK >> {}", ForgeRegistries.BLOCKS.getKey(Blocks.DIRT)); - - LOGGER.info(Config.magicNumberIntroduction + Config.magicNumber); - - Config.items.forEach((item) -> LOGGER.info("ITEM >> {}", item.toString())); - } - - // Add the example block item to the building blocks tab - private void addCreative(BuildCreativeModeTabContentsEvent event) { - if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) event.accept(EXAMPLE_BLOCK_ITEM); - } - - // You can use SubscribeEvent and let the Event Bus discover methods to call - @SubscribeEvent - public void onServerStarting(ServerStartingEvent event) { - // Do something when the server starts - LOGGER.info("HELLO from server starting"); - } - - // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent - @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) - public static class ClientModEvents { - - @SubscribeEvent - public static void onClientSetup(FMLClientSetupEvent event) { - // Some client setup code - LOGGER.info("HELLO FROM CLIENT SETUP"); - LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName()); - } - } + public WildflowersBackport() {} } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 5e979d0..40836c9 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,63 +1,30 @@ -# This is an example mods.toml file. It contains the data relating to the loading mods. -# There are several mandatory fields (#mandatory), and many more that are optional (#optional). -# The overall format is standard TOML format, v0.5.0. -# Note that there are a couple of TOML lists in this file. -# Find more information on toml format here: https://github.com/toml-lang/toml -# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml -modLoader = "javafml" #mandatory -# A version range to match for said mod loader - for regular FML @Mod it will be the forge version -loaderVersion = "${loader_version_range}" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions. -# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. -# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +modLoader = "javafml" +loaderVersion = "${loader_version_range}" license = "${mod_license}" -# A URL to refer people to when problems occur with this mod -#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional -# A list of mods - how many allowed here is determined by the individual mod loader -[[mods]] #mandatory -# The modid of the mod -modId = "${mod_id}" #mandatory -# The version number of the mod -version = "${mod_version}" #mandatory -# A display name for the mod -displayName = "${mod_name}" #mandatory -# A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ -#updateJSONURL="https://change.me.example.invalid/updates.json" #optional -# A URL for the "homepage" for this mod, displayed in the mod UI -#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional -# A file name (in the root of the mod JAR) containing a logo for display -#logoFile="wildflowers_backport.png" #optional -# A text field displayed in the mod UI -#credits="Thanks for this example mod goes to Java" #optional -# A text field displayed in the mod UI -authors = "${mod_authors}" #optional -# Display Test controls the display for your mod in the server connection screen -# MATCH_VERSION means that your mod will cause a red X if the versions on client and server differ. This is the default behaviour and should be what you choose if you have server and client elements to your mod. -# IGNORE_SERVER_VERSION means that your mod will not cause a red X if it's present on the server but not on the client. This is what you should use if you're a server only mod. -# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component. -# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value. -# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. -#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) +issueTrackerURL="https://gitea.micle.dev/minecraft-mods/wildflowers_backport/issues" -# The description text for the mod (multi line!) (#mandatory) +[[mods]] +modId = "${mod_id}" +version = "${mod_version}" +displayName = "${mod_name}" +#updateJSONURL="https://change.me.example.invalid/updates.json" # https://docs.minecraftforge.net/en/latest/misc/updatechecker/ +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" +logoFile="logo.jpg" +#credits="" +authors = "${mod_authors}" +displayTest="MATCH_VERSION" # MATCH_VERSION, IGNORE_SERVER_VERSION (server only), IGNORE_ALL_VERSION (client only), NONE (IExtensionPoint.DisplayTest) description = '''${mod_description}''' -# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. -[[dependencies."${mod_id}"]] #optional -# the modid of the dependency -modId = "forge" #mandatory -# Does this dependency have to exist - if not, ordering below must be specified -mandatory = true #mandatory -# The version range of the dependency -versionRange = "${forge_version_range}" #mandatory -# An ordering relationship for the dependency - BEFORE or AFTER required if the dependency is not mandatory -# BEFORE - This mod is loaded BEFORE the dependency -# AFTER - This mod is loaded AFTER the dependency -ordering = "NONE" -# Side this dependency is applied on - BOTH, CLIENT, or SERVER -side = "BOTH"# Here's another dependency + +[[dependencies."${mod_id}"]] +modId = "forge" +mandatory = true +versionRange = "${forge_version_range}" +ordering = "NONE" # BEFORE, AFTER, NONE +side = "BOTH" # BOTH, CLIENT, SERVER + [[dependencies."${mod_id}"]] modId = "minecraft" mandatory = true -# This version range declares a minimum of the current minecraft version up to but not including the next major version versionRange = "${minecraft_version_range}" ordering = "NONE" side = "BOTH" diff --git a/src/main/resources/wildflowers_backport.mixins.json b/src/main/resources/wildflowers_backport.mixins.json new file mode 100644 index 0000000..7facd74 --- /dev/null +++ b/src/main/resources/wildflowers_backport.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "dev.micle.wildflowers_backport.mixin", + "compatibilityLevel": "JAVA_8", + "refmap": "firefly_bush_backport.refmap.json", + "mixins": [ + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + } +} From d6d8f86148d79f3dabfcece6c49186ef50518032 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 18:57:54 +0100 Subject: [PATCH 02/37] Implemented proxy. --- .../WildflowersBackport.java | 23 +++- .../wildflowers_backport/proxy/IProxy.java | 11 ++ .../wildflowers_backport/proxy/Proxy.java | 103 ++++++++++++++++++ 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 src/main/java/dev/micle/wildflowers_backport/proxy/IProxy.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java diff --git a/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java b/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java index 0a2bbd9..83e639e 100644 --- a/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java +++ b/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java @@ -1,13 +1,34 @@ package dev.micle.wildflowers_backport; import com.mojang.logging.LogUtils; +import dev.micle.wildflowers_backport.proxy.IProxy; +import dev.micle.wildflowers_backport.proxy.Proxy; +import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.slf4j.Logger; @Mod(WildflowersBackport.MOD_ID) public class WildflowersBackport { public static final String MOD_ID = "wildflowers_backport"; private static final Logger LOGGER = LogUtils.getLogger(); + private static FMLJavaModLoadingContext fmlJavaModLoadingContext; + private static IProxy proxy; - public WildflowersBackport() {} + public WildflowersBackport(FMLJavaModLoadingContext context) { + fmlJavaModLoadingContext = context; + + proxy = DistExecutor.safeRunForDist( + () -> Proxy.Client::new, + () -> Proxy.Server::new + ); + } + + public static FMLJavaModLoadingContext getFmlJavaModLoadingContext() { + return fmlJavaModLoadingContext; + } + + public static IProxy getProxy() { + return proxy; + } } diff --git a/src/main/java/dev/micle/wildflowers_backport/proxy/IProxy.java b/src/main/java/dev/micle/wildflowers_backport/proxy/IProxy.java new file mode 100644 index 0000000..3c140e6 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/proxy/IProxy.java @@ -0,0 +1,11 @@ +package dev.micle.wildflowers_backport.proxy; + +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; + +public interface IProxy { + MinecraftServer getServer(); + Player getClientPlayer(); + Level getClientLevel(); +} diff --git a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java new file mode 100644 index 0000000..90b42dc --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java @@ -0,0 +1,103 @@ +package dev.micle.wildflowers_backport.proxy; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import net.minecraft.client.Minecraft; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.Level; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.AddReloadListenerEvent; +import net.minecraftforge.event.server.ServerStartedEvent; +import net.minecraftforge.event.server.ServerStoppingEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.event.lifecycle.*; + +public class Proxy implements IProxy { + private static MinecraftServer server = null; + + // Common setup + public Proxy() { + IEventBus modEventBus = WildflowersBackport.getFmlJavaModLoadingContext().getModEventBus(); + + // Register mod event bus listeners + modEventBus.addListener(Proxy::setup); + modEventBus.addListener(Proxy::imcEnqueue); + modEventBus.addListener(Proxy::imcProcess); + + // Register event bus listeners + MinecraftForge.EVENT_BUS.addListener(Proxy::onAddReloadListeners); + MinecraftForge.EVENT_BUS.addListener(Proxy::serverStarted); + MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping); + } + + private static void setup(FMLCommonSetupEvent event) {} + + private static void imcEnqueue(InterModEnqueueEvent event) {} + + private static void imcProcess(InterModProcessEvent event) {} + + private static void onAddReloadListeners(AddReloadListenerEvent event) {} + + private static void serverStarted(ServerStartedEvent event) { + server = event.getServer(); + } + + private static void serverStopping(ServerStoppingEvent event) { + server = null; + } + + @Override + public MinecraftServer getServer() { + return server; + } + + @Override + public Player getClientPlayer() { + return null; + } + + @Override + public Level getClientLevel() { + return null; + } + + // Client setup + public static class Client extends Proxy { + public Client() { + IEventBus modEventBus = WildflowersBackport.getFmlJavaModLoadingContext().getModEventBus(); + + // Register mod event bus listeners + modEventBus.addListener(Client::setup); + modEventBus.addListener(Client::postSetup); + } + + private static void setup(FMLClientSetupEvent event) {} + + private static void postSetup(FMLLoadCompleteEvent event) {} + + @Override + @OnlyIn(Dist.CLIENT) + public Player getClientPlayer() { + return Minecraft.getInstance().player; + } + + @Override + @OnlyIn(Dist.CLIENT) + public Level getClientLevel() { + return Minecraft.getInstance().level; + } + } + + // Server setup + public static class Server extends Proxy { + public Server() { + // Register mod event bus listeners + IEventBus modEventBus = WildflowersBackport.getFmlJavaModLoadingContext().getModEventBus(); + modEventBus.addListener(Server::setup); + } + + private static void setup(FMLDedicatedServerSetupEvent event) {} + } +} From 5764fba7c9224f85dbd6277a4379e8c13235818d Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 19:01:26 +0100 Subject: [PATCH 03/37] Implemented base creative mode tab. --- .../wildflowers_backport/proxy/Proxy.java | 3 +++ .../tab/ModCreativeTabs.java | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 src/main/java/dev/micle/wildflowers_backport/tab/ModCreativeTabs.java diff --git a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java index 90b42dc..1316fe1 100644 --- a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java +++ b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java @@ -1,6 +1,7 @@ package dev.micle.wildflowers_backport.proxy; import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.tab.ModCreativeTabs; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; @@ -21,6 +22,8 @@ public class Proxy implements IProxy { public Proxy() { IEventBus modEventBus = WildflowersBackport.getFmlJavaModLoadingContext().getModEventBus(); + ModCreativeTabs.register(modEventBus); + // Register mod event bus listeners modEventBus.addListener(Proxy::setup); modEventBus.addListener(Proxy::imcEnqueue); diff --git a/src/main/java/dev/micle/wildflowers_backport/tab/ModCreativeTabs.java b/src/main/java/dev/micle/wildflowers_backport/tab/ModCreativeTabs.java new file mode 100644 index 0000000..aaf1814 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/tab/ModCreativeTabs.java @@ -0,0 +1,23 @@ +package dev.micle.wildflowers_backport.tab; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.RegistryObject; + +public class ModCreativeTabs { + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, WildflowersBackport.MOD_ID); + + public static final RegistryObject MAIN_TAB = CREATIVE_MODE_TABS.register("main", + () -> CreativeModeTab.builder() + .title(Component.translatable(String.format("itemGroup.%s.main", WildflowersBackport.MOD_ID))) + .build() + ); + + public static void register(IEventBus modEventBus) { + CREATIVE_MODE_TABS.register(modEventBus); + } +} From 6ce207ad1438bbd4a3f202b0c8ff195a6ca5c725 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 20:54:53 +0100 Subject: [PATCH 04/37] Implemented SegmentableBlock as is in 1.21.5, including all needed misc classes etc. --- .../block/SegmentableBlock.java | 57 ++++++++++++ .../properties/ModBlockStateProperties.java | 7 ++ .../wildflowers_backport/math/Quadrant.java | 34 +++++++ .../mixin/ArrayVoxelShapeAccessor.java | 15 +++ .../mixin/CubeVoxelShapeAccessor.java | 14 +++ .../mixin/OctahedralGroupAccessor.java | 12 +++ .../mixin/VoxelShapeAccessor.java | 18 ++++ .../util/DirectionAxisUtils.java | 13 +++ .../util/OctahedralGroupUtils.java | 37 ++++++++ .../util/ShapesUtils.java | 93 +++++++++++++++++++ .../util/VoxelShapeUtils.java | 20 ++++ .../wildflowers_backport.mixins.json | 4 + 12 files changed, 324 insertions(+) create mode 100644 src/main/java/dev/micle/wildflowers_backport/block/SegmentableBlock.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/block/state/properties/ModBlockStateProperties.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/math/Quadrant.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/mixin/ArrayVoxelShapeAccessor.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/mixin/CubeVoxelShapeAccessor.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/mixin/OctahedralGroupAccessor.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/mixin/VoxelShapeAccessor.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/util/DirectionAxisUtils.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/util/OctahedralGroupUtils.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/util/ShapesUtils.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/util/VoxelShapeUtils.java diff --git a/src/main/java/dev/micle/wildflowers_backport/block/SegmentableBlock.java b/src/main/java/dev/micle/wildflowers_backport/block/SegmentableBlock.java new file mode 100644 index 0000000..d2804d2 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/block/SegmentableBlock.java @@ -0,0 +1,57 @@ +package dev.micle.wildflowers_backport.block; + +import dev.micle.wildflowers_backport.block.state.properties.ModBlockStateProperties; +import dev.micle.wildflowers_backport.util.ShapesUtils; +import dev.micle.wildflowers_backport.util.VoxelShapeUtils; +import net.minecraft.core.Direction; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.level.block.state.properties.IntegerProperty; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; + +import java.util.Map; +import java.util.function.Function; + +public interface SegmentableBlock { + int MIN_SEGMENT = 1; + int MAX_SEGMENT = 4; + IntegerProperty AMOUNT = ModBlockStateProperties.SEGMENT_AMOUNT; + + default Function getShapeCalculator(EnumProperty dir, IntegerProperty property) { + Map map = ShapesUtils.rotateHorizontal(Block.box(0.0, 0.0, 0.0, 8.0, this.getShapeHeight(), 8.0)); + return x -> { + VoxelShape voxelShape = Shapes.empty(); + Direction direction = x.getValue(dir); + int i = x.getValue(property); + + for (int j = 0; j < i; j++) { + voxelShape = Shapes.or(voxelShape, map.get(direction)); + direction = direction.getCounterClockWise(); + } + + return VoxelShapeUtils.singleEncompassing(voxelShape); + }; + } + + default IntegerProperty getSegmentAmountProperty() { + return AMOUNT; + } + + default double getShapeHeight() { + return 1.0; + } + + default boolean canBeReplaced(BlockState blockState, BlockPlaceContext blockPlaceContext, IntegerProperty property) { + return !blockPlaceContext.isSecondaryUseActive() && blockPlaceContext.getItemInHand().is(blockState.getBlock().asItem()) && blockState.getValue(property) < 4; + } + + default BlockState getStateForPlacement(BlockPlaceContext blockPlaceContext, Block block, IntegerProperty property, EnumProperty dir) { + BlockState blockState = blockPlaceContext.getLevel().getBlockState(blockPlaceContext.getClickedPos()); + return blockState.is(block) + ? blockState.setValue(property, Math.min(4, blockState.getValue(property) + 1)) + : block.defaultBlockState().setValue(dir, blockPlaceContext.getHorizontalDirection().getOpposite()); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/block/state/properties/ModBlockStateProperties.java b/src/main/java/dev/micle/wildflowers_backport/block/state/properties/ModBlockStateProperties.java new file mode 100644 index 0000000..af4eb1e --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/block/state/properties/ModBlockStateProperties.java @@ -0,0 +1,7 @@ +package dev.micle.wildflowers_backport.block.state.properties; + +import net.minecraft.world.level.block.state.properties.IntegerProperty; + +public class ModBlockStateProperties { + public static final IntegerProperty SEGMENT_AMOUNT = IntegerProperty.create("segment_amount", 1, 4); +} diff --git a/src/main/java/dev/micle/wildflowers_backport/math/Quadrant.java b/src/main/java/dev/micle/wildflowers_backport/math/Quadrant.java new file mode 100644 index 0000000..9ae503a --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/math/Quadrant.java @@ -0,0 +1,34 @@ +package dev.micle.wildflowers_backport.math; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.DataResult; +import net.minecraft.util.Mth; + +public enum Quadrant { + R0(0), + R90(1), + R180(2), + R270(3); + + public static final Codec CODEC = Codec.INT.comapFlatMap(x -> { + return switch (Mth.positiveModulo(x, 360)) { + case 0 -> DataResult.success(R0); + case 90 -> DataResult.success(R90); + case 180 -> DataResult.success(R180); + case 270 -> DataResult.success(R270); + default -> DataResult.error(() -> "Invalid rotation " + x + " found, only 0/90/180/270 allowed"); + }; + }, y -> { + return switch (y) { + case R0 -> 0; + case R90 -> 90; + case R180 -> 180; + case R270 -> 270; + }; + }); + public final int shift; + + Quadrant(final int shift) { + this.shift = shift; + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/mixin/ArrayVoxelShapeAccessor.java b/src/main/java/dev/micle/wildflowers_backport/mixin/ArrayVoxelShapeAccessor.java new file mode 100644 index 0000000..aef58fc --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/mixin/ArrayVoxelShapeAccessor.java @@ -0,0 +1,15 @@ +package dev.micle.wildflowers_backport.mixin; + +import it.unimi.dsi.fastutil.doubles.DoubleList; +import net.minecraft.world.phys.shapes.ArrayVoxelShape; +import net.minecraft.world.phys.shapes.DiscreteVoxelShape; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(ArrayVoxelShape.class) +public interface ArrayVoxelShapeAccessor { + @Invoker("") + static ArrayVoxelShape newArrayVoxelShape(DiscreteVoxelShape pShape, DoubleList pXs, DoubleList pYs, DoubleList pZs) { + throw new AssertionError(); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/mixin/CubeVoxelShapeAccessor.java b/src/main/java/dev/micle/wildflowers_backport/mixin/CubeVoxelShapeAccessor.java new file mode 100644 index 0000000..91ff12c --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/mixin/CubeVoxelShapeAccessor.java @@ -0,0 +1,14 @@ +package dev.micle.wildflowers_backport.mixin; + +import net.minecraft.world.phys.shapes.CubeVoxelShape; +import net.minecraft.world.phys.shapes.DiscreteVoxelShape; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(CubeVoxelShape.class) +public interface CubeVoxelShapeAccessor { + @Invoker("") + static CubeVoxelShape newCubeVoxelShape(DiscreteVoxelShape pShape) { + throw new AssertionError(); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/mixin/OctahedralGroupAccessor.java b/src/main/java/dev/micle/wildflowers_backport/mixin/OctahedralGroupAccessor.java new file mode 100644 index 0000000..15bde0e --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/mixin/OctahedralGroupAccessor.java @@ -0,0 +1,12 @@ +package dev.micle.wildflowers_backport.mixin; + +import com.mojang.math.OctahedralGroup; +import com.mojang.math.SymmetricGroup3; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(OctahedralGroup.class) +public interface OctahedralGroupAccessor { + @Accessor("permutation") + SymmetricGroup3 wildflowers_backport$getPermutation(); +} diff --git a/src/main/java/dev/micle/wildflowers_backport/mixin/VoxelShapeAccessor.java b/src/main/java/dev/micle/wildflowers_backport/mixin/VoxelShapeAccessor.java new file mode 100644 index 0000000..4de5825 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/mixin/VoxelShapeAccessor.java @@ -0,0 +1,18 @@ +package dev.micle.wildflowers_backport.mixin; + +import it.unimi.dsi.fastutil.doubles.DoubleList; +import net.minecraft.core.Direction; +import net.minecraft.world.phys.shapes.DiscreteVoxelShape; +import net.minecraft.world.phys.shapes.VoxelShape; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(VoxelShape.class) +public interface VoxelShapeAccessor { + @Accessor("shape") + DiscreteVoxelShape wildflowers_backport$getShape(); + + @Invoker("getCoords") + DoubleList wildflowers_backport$getCoords(Direction.Axis pAxis); +} diff --git a/src/main/java/dev/micle/wildflowers_backport/util/DirectionAxisUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/DirectionAxisUtils.java new file mode 100644 index 0000000..edbaa89 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/util/DirectionAxisUtils.java @@ -0,0 +1,13 @@ +package dev.micle.wildflowers_backport.util; + +import net.minecraft.core.Direction; + +public class DirectionAxisUtils { + public static boolean choose(Direction.Axis axis, boolean x, boolean y, boolean z) { + return switch (axis) { + case X -> x; + case Y -> y; + case Z -> z; + }; + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/util/OctahedralGroupUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/OctahedralGroupUtils.java new file mode 100644 index 0000000..2d68256 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/util/OctahedralGroupUtils.java @@ -0,0 +1,37 @@ +package dev.micle.wildflowers_backport.util; + +import com.mojang.math.OctahedralGroup; +import dev.micle.wildflowers_backport.math.Quadrant; +import dev.micle.wildflowers_backport.mixin.OctahedralGroupAccessor; +import net.minecraft.Util; +import net.minecraft.core.Direction; + +public class OctahedralGroupUtils { + private static final Direction.Axis[] AXES = Direction.Axis.values(); + private static final OctahedralGroup[][] XY_TABLE = Util.make(new OctahedralGroup[Quadrant.values().length][Quadrant.values().length], x -> { + for (Quadrant quadrant : Quadrant.values()) { + for (Quadrant quadrant1 : Quadrant.values()) { + OctahedralGroup octahedralGroup = OctahedralGroup.IDENTITY; + + for (int i = 0; i < quadrant1.shift; i++) { + octahedralGroup = octahedralGroup.compose(OctahedralGroup.ROT_90_Y_NEG); + } + + for (int j = 0; j < quadrant.shift; j++) { + octahedralGroup = octahedralGroup.compose(OctahedralGroup.ROT_90_X_NEG); + } + + x[quadrant.ordinal()][quadrant1.ordinal()] = octahedralGroup; + } + } + }); + + public static Direction.Axis permute(OctahedralGroup octahedralGroup, Direction.Axis axis) { + return AXES[((OctahedralGroupAccessor) (Object) octahedralGroup).wildflowers_backport$getPermutation().permutation(axis.ordinal())]; + } + + + public static OctahedralGroup fromXYAngles(Quadrant quadrant, Quadrant quadrant1) { + return XY_TABLE[quadrant.ordinal()][quadrant1.ordinal()]; + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/util/ShapesUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/ShapesUtils.java new file mode 100644 index 0000000..016cae4 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/util/ShapesUtils.java @@ -0,0 +1,93 @@ +package dev.micle.wildflowers_backport.util; + +import com.google.common.collect.Maps; +import com.mojang.math.OctahedralGroup; +import dev.micle.wildflowers_backport.math.Quadrant; +import dev.micle.wildflowers_backport.mixin.ArrayVoxelShapeAccessor; +import dev.micle.wildflowers_backport.mixin.CubeVoxelShapeAccessor; +import dev.micle.wildflowers_backport.mixin.VoxelShapeAccessor; +import it.unimi.dsi.fastutil.doubles.DoubleArrayList; +import it.unimi.dsi.fastutil.doubles.DoubleList; +import net.minecraft.core.Direction; +import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.shapes.CubeVoxelShape; +import net.minecraft.world.phys.shapes.DiscreteVoxelShape; +import net.minecraft.world.phys.shapes.VoxelShape; + +import java.util.Map; + +public class ShapesUtils { + private static final Vec3 BLOCK_CENTER = new Vec3(0.5, 0.5, 0.5); + + public static VoxelShape rotate(VoxelShape voxelShape, OctahedralGroup octahedralGroup) { + return rotate(voxelShape, octahedralGroup, BLOCK_CENTER); + } + + public static VoxelShape rotate(VoxelShape voxelShape, OctahedralGroup octahedralGroup, Vec3 vec3) { + if (octahedralGroup == OctahedralGroup.IDENTITY) { + return voxelShape; + } else { + DiscreteVoxelShape discreteVoxelShape = ((VoxelShapeAccessor) voxelShape).wildflowers_backport$getShape(); + if (voxelShape instanceof CubeVoxelShape && BLOCK_CENTER.equals(vec3)) { + return CubeVoxelShapeAccessor.newCubeVoxelShape(discreteVoxelShape); + } else { + Direction.Axis direction$axis = OctahedralGroupUtils.permute(octahedralGroup, Direction.Axis.X); + Direction.Axis direction$axis1 = OctahedralGroupUtils.permute(octahedralGroup, Direction.Axis.Y); + Direction.Axis direction$axis2 = OctahedralGroupUtils.permute(octahedralGroup, Direction.Axis.Z); + + DoubleList doubleList = ((VoxelShapeAccessor) voxelShape).wildflowers_backport$getCoords(direction$axis); + DoubleList doubleList1 = ((VoxelShapeAccessor) voxelShape).wildflowers_backport$getCoords(direction$axis1); + DoubleList doubleList2 = ((VoxelShapeAccessor) voxelShape).wildflowers_backport$getCoords(direction$axis2); + + boolean flag = octahedralGroup.inverts(direction$axis); + boolean flag1 = octahedralGroup.inverts(direction$axis1); + boolean flag2 = octahedralGroup.inverts(direction$axis2); + boolean flag3 = DirectionAxisUtils.choose(direction$axis, flag, flag1, flag2); + boolean flag4 = DirectionAxisUtils.choose(direction$axis1, flag, flag1, flag2); + boolean flag5 = DirectionAxisUtils.choose(direction$axis2, flag, flag1, flag2); + + return ArrayVoxelShapeAccessor.newArrayVoxelShape( + discreteVoxelShape, + makeAxis(doubleList, flag3, vec3.get(direction$axis), vec3.x), + makeAxis(doubleList1, flag4, vec3.get(direction$axis1), vec3.y), + makeAxis(doubleList2, flag5, vec3.get(direction$axis2), vec3.z) + ); + } + } + } + + public static Map rotateHorizontal(VoxelShape voxelShape) { + return rotateHorizontal(voxelShape, BLOCK_CENTER); + } + + public static Map rotateHorizontal(VoxelShape voxelShape, Vec3 vec3) { + return Maps.newEnumMap( + Map.of( + Direction.NORTH, + voxelShape, + Direction.EAST, + rotate(voxelShape, OctahedralGroupUtils.fromXYAngles(Quadrant.R0, Quadrant.R90), vec3), + Direction.SOUTH, + rotate(voxelShape, OctahedralGroupUtils.fromXYAngles(Quadrant.R0, Quadrant.R180), vec3), + Direction.WEST, + rotate(voxelShape, OctahedralGroupUtils.fromXYAngles(Quadrant.R0, Quadrant.R270), vec3) + ) + ); + } + + public static DoubleList makeAxis(DoubleList doubleList, boolean flag, double d1, double d2) { + if (!flag && d1 == d2) { + return doubleList; + } else { + int i = doubleList.size(); + DoubleList doubleList1 = new DoubleArrayList(i); + int j = flag ? -1 : 1; + + for (int k = flag ? i - 1 : 0; k >= 0 && k < i; k += j) { + doubleList1.add(d2 + j * (doubleList.getDouble(k) - d1)); + } + + return doubleList1; + } + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/util/VoxelShapeUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/VoxelShapeUtils.java new file mode 100644 index 0000000..68ba5c0 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/util/VoxelShapeUtils.java @@ -0,0 +1,20 @@ +package dev.micle.wildflowers_backport.util; + +import net.minecraft.core.Direction; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; + +public class VoxelShapeUtils { + public static VoxelShape singleEncompassing(VoxelShape voxelShape) { + return voxelShape.isEmpty() + ? Shapes.empty() + : Shapes.box( + voxelShape.min(Direction.Axis.X), + voxelShape.min(Direction.Axis.Y), + voxelShape.min(Direction.Axis.Z), + voxelShape.min(Direction.Axis.X), + voxelShape.min(Direction.Axis.Y), + voxelShape.min(Direction.Axis.Z) + ); + } +} diff --git a/src/main/resources/wildflowers_backport.mixins.json b/src/main/resources/wildflowers_backport.mixins.json index 7facd74..9fb047d 100644 --- a/src/main/resources/wildflowers_backport.mixins.json +++ b/src/main/resources/wildflowers_backport.mixins.json @@ -5,6 +5,10 @@ "compatibilityLevel": "JAVA_8", "refmap": "firefly_bush_backport.refmap.json", "mixins": [ + "OctahedralGroupAccessor", + "VoxelShapeAccessor", + "ArrayVoxelShapeAccessor", + "CubeVoxelShapeAccessor" ], "client": [ ], From f753548f7dc607eaaad0b3b3a5c97160ebb1b3e4 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 21:29:08 +0100 Subject: [PATCH 05/37] Technically implemented FlowerBedBlock. --- .../block/FlowerBedBlock.java | 110 ++++++++++++++++++ .../mixin/BlockBehaviourAccessor.java | 11 ++ .../util/BlockBehaviourUtils.java | 22 ++++ .../wildflowers_backport.mixins.json | 1 + 4 files changed, 144 insertions(+) create mode 100644 src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java diff --git a/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java b/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java new file mode 100644 index 0000000..7a1b62d --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java @@ -0,0 +1,110 @@ +package dev.micle.wildflowers_backport.block; + +import com.google.common.collect.ImmutableMap; +import com.mojang.serialization.MapCodec; +import dev.micle.wildflowers_backport.util.BlockBehaviourUtils; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.RandomSource; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.EnumProperty; +import net.minecraft.world.level.block.state.properties.IntegerProperty; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.function.Function; + +public class FlowerBedBlock extends BushBlock implements BonemealableBlock, SegmentableBlock { + public static final MapCodec CODEC = BlockBehaviourUtils.simpleCodec(FlowerBedBlock::new); + public static final EnumProperty FACING = BlockStateProperties.HORIZONTAL_FACING; + public static final IntegerProperty AMOUNT = BlockStateProperties.FLOWER_AMOUNT; + private final Function shapes; + + public FlowerBedBlock(Properties pProperties) { + super(pProperties); + this.registerDefaultState(this.getStateDefinition().any().setValue(FACING, Direction.NORTH).setValue(AMOUNT, 1)); + this.shapes = this.makeShapes(); + } + + private Function makeShapes() { + return this.stateDefinition.getPossibleStates().stream().collect(ImmutableMap.toImmutableMap(Function.identity(), this.getShapeCalculator(FACING, AMOUNT)))::get; + } + + @Override + public BlockState rotate(BlockState blockState, LevelAccessor levelAccessor, BlockPos blockPos, Rotation rotation) { + return blockState.setValue(FACING, rotation.rotate(blockState.getValue(FACING))); + } + + @Override + public @NotNull BlockState mirror(BlockState blockState, Mirror mirror) { + return blockState.rotate(mirror.getRotation(blockState.getValue(FACING))); + } + + @Override + @ParametersAreNonnullByDefault + public boolean canBeReplaced(BlockState blockState, BlockPlaceContext blockPlaceContext) { + return this.canBeReplaced(blockState, blockPlaceContext, AMOUNT) ? true : super.canBeReplaced(blockState, blockPlaceContext); + } + + @Override + @ParametersAreNonnullByDefault + public @NotNull VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext) { + return this.shapes.apply(blockState); + } + + @Override + public double getShapeHeight() { + return 3.0; + } + + @Override + public IntegerProperty getSegmentAmountProperty() { + return AMOUNT; + } + + @Override + @ParametersAreNonnullByDefault + public BlockState getStateForPlacement(BlockPlaceContext blockPlaceContext) { + return this.getStateForPlacement(blockPlaceContext, this, AMOUNT, FACING); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + builder.add(FACING, AMOUNT); + } + + @Override + @ParametersAreNonnullByDefault + public boolean isValidBonemealTarget(LevelReader levelReader, BlockPos blockPos, BlockState blockState, boolean isClient) { + return true; + } + + @Override + @ParametersAreNonnullByDefault + public boolean isBonemealSuccess(Level level, RandomSource randomSource, BlockPos blockPos, BlockState blockState) { + return true; + } + + @Override + @ParametersAreNonnullByDefault + public void performBonemeal(ServerLevel serverLevel, RandomSource randomSource, BlockPos blockPos, BlockState blockState) { + int i = blockState.getValue(AMOUNT); + if (i < 4) { + serverLevel.setBlock(blockPos, blockState.setValue(AMOUNT, i + 1), 2); + } else { + popResource(serverLevel, blockPos, new ItemStack(this)); + } + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java b/src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java new file mode 100644 index 0000000..ca69491 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java @@ -0,0 +1,11 @@ +package dev.micle.wildflowers_backport.mixin; + +import net.minecraft.world.level.block.state.BlockBehaviour; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(BlockBehaviour.class) +public interface BlockBehaviourAccessor { + @Accessor("properties") + BlockBehaviour.Properties wildflowers_backport$getProperties(); +} diff --git a/src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java new file mode 100644 index 0000000..242d660 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java @@ -0,0 +1,22 @@ +package dev.micle.wildflowers_backport.util; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import dev.micle.wildflowers_backport.mixin.BlockBehaviourAccessor; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; + +import java.util.function.Function; + +public class BlockBehaviourUtils { + public static final Codec PROPERTIES_CODEC = Codec.unit(BlockBehaviour.Properties::of); + + public static RecordCodecBuilder propertiesCodec() { + return PROPERTIES_CODEC.fieldOf("properties").forGetter(x -> ((BlockBehaviourAccessor) x).wildflowers_backport$getProperties()); + } + + public static MapCodec simpleCodec(Function blockPropertiesFunc) { + return RecordCodecBuilder.mapCodec(x -> x.group(propertiesCodec()).apply(x, blockPropertiesFunc)); + } +} diff --git a/src/main/resources/wildflowers_backport.mixins.json b/src/main/resources/wildflowers_backport.mixins.json index 9fb047d..c9cbf28 100644 --- a/src/main/resources/wildflowers_backport.mixins.json +++ b/src/main/resources/wildflowers_backport.mixins.json @@ -5,6 +5,7 @@ "compatibilityLevel": "JAVA_8", "refmap": "firefly_bush_backport.refmap.json", "mixins": [ + "BlockBehaviourAccessor", "OctahedralGroupAccessor", "VoxelShapeAccessor", "ArrayVoxelShapeAccessor", From f03b24f00ff23b9b3181a2f2ba50b0f8123b8c63 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 21:33:39 +0100 Subject: [PATCH 06/37] Registered wildflowers block. --- .../wildflowers_backport/block/ModBlocks.java | 29 +++++++++++++++++++ .../wildflowers_backport/proxy/Proxy.java | 2 ++ .../tab/ModCreativeTabs.java | 5 ++++ 3 files changed, 36 insertions(+) create mode 100644 src/main/java/dev/micle/wildflowers_backport/block/ModBlocks.java diff --git a/src/main/java/dev/micle/wildflowers_backport/block/ModBlocks.java b/src/main/java/dev/micle/wildflowers_backport/block/ModBlocks.java new file mode 100644 index 0000000..6a09e88 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/block/ModBlocks.java @@ -0,0 +1,29 @@ +package dev.micle.wildflowers_backport.block; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModBlocks { + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, WildflowersBackport.MOD_ID); + + public static RegistryObject WILDFLOWERS = BLOCKS.register("wildflowers", + () -> new FlowerBedBlock(BlockBehaviour.Properties.of() + .mapColor(MapColor.PLANT) + .noCollission() + .sound(SoundType.PINK_PETALS) + .pushReaction(PushReaction.DESTROY) + ) + ); + + public static void register(IEventBus modEventBus) { + BLOCKS.register(modEventBus); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java index 1316fe1..3504e67 100644 --- a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java +++ b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java @@ -1,6 +1,7 @@ package dev.micle.wildflowers_backport.proxy; import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.block.ModBlocks; import dev.micle.wildflowers_backport.tab.ModCreativeTabs; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; @@ -22,6 +23,7 @@ public class Proxy implements IProxy { public Proxy() { IEventBus modEventBus = WildflowersBackport.getFmlJavaModLoadingContext().getModEventBus(); + ModBlocks.register(modEventBus); ModCreativeTabs.register(modEventBus); // Register mod event bus listeners diff --git a/src/main/java/dev/micle/wildflowers_backport/tab/ModCreativeTabs.java b/src/main/java/dev/micle/wildflowers_backport/tab/ModCreativeTabs.java index aaf1814..b571274 100644 --- a/src/main/java/dev/micle/wildflowers_backport/tab/ModCreativeTabs.java +++ b/src/main/java/dev/micle/wildflowers_backport/tab/ModCreativeTabs.java @@ -1,6 +1,7 @@ package dev.micle.wildflowers_backport.tab; import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.block.ModBlocks; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; @@ -14,6 +15,10 @@ public class ModCreativeTabs { public static final RegistryObject MAIN_TAB = CREATIVE_MODE_TABS.register("main", () -> CreativeModeTab.builder() .title(Component.translatable(String.format("itemGroup.%s.main", WildflowersBackport.MOD_ID))) + .icon(ModBlocks.WILDFLOWERS.get().asItem()::getDefaultInstance) + .displayItems((itemDisplayParams, output) -> { + output.accept(ModBlocks.WILDFLOWERS.get()); + }) .build() ); From d7faca25359069b0e465d81f66e26c92a2d8e096 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 21:35:12 +0100 Subject: [PATCH 07/37] Created lang file. --- .../resources/assets/wildflowers_backport/lang/en_us.json | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/main/resources/assets/wildflowers_backport/lang/en_us.json diff --git a/src/main/resources/assets/wildflowers_backport/lang/en_us.json b/src/main/resources/assets/wildflowers_backport/lang/en_us.json new file mode 100644 index 0000000..90c3c9b --- /dev/null +++ b/src/main/resources/assets/wildflowers_backport/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "itemGroup.wildflowers_backport.main": "Wildflowers Backport", + "block.wildflowers_backport.wildflowers": "Wildflowers" +} \ No newline at end of file From c98979a87132c1f8160c57b9209db5f6a9afd231 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 22:37:00 +0100 Subject: [PATCH 08/37] Data gen, block state, model, and textures. --- .../blockstates/wildflowers.json | 160 ++++++++++++++++++ .../models/block/wildflowers_1.json | 7 + .../models/block/wildflowers_2.json | 7 + .../models/block/wildflowers_3.json | 7 + .../models/block/wildflowers_4.json | 7 + .../WildflowersBackport.java | 2 +- .../data/DataGenerators.java | 24 +++ .../data/client/ModBlockStateProvider.java | 53 ++++++ .../util/DirectionUtils.java | 14 ++ .../models/block/flowerbed_1.json | 70 ++++++++ .../models/block/flowerbed_2.json | 42 +++++ .../models/block/flowerbed_3.json | 70 ++++++++ .../models/block/flowerbed_4.json | 34 ++++ .../textures/block/wildflowers.png | 3 + .../textures/block/wildflowers_stem.png | 3 + 15 files changed, 502 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/assets/wildflowers_backport/blockstates/wildflowers.json create mode 100644 src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_1.json create mode 100644 src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_2.json create mode 100644 src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_3.json create mode 100644 src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_4.json create mode 100644 src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/data/client/ModBlockStateProvider.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/util/DirectionUtils.java create mode 100644 src/main/resources/assets/wildflowers_backport/models/block/flowerbed_1.json create mode 100644 src/main/resources/assets/wildflowers_backport/models/block/flowerbed_2.json create mode 100644 src/main/resources/assets/wildflowers_backport/models/block/flowerbed_3.json create mode 100644 src/main/resources/assets/wildflowers_backport/models/block/flowerbed_4.json create mode 100644 src/main/resources/assets/wildflowers_backport/textures/block/wildflowers.png create mode 100644 src/main/resources/assets/wildflowers_backport/textures/block/wildflowers_stem.png diff --git a/src/generated/resources/assets/wildflowers_backport/blockstates/wildflowers.json b/src/generated/resources/assets/wildflowers_backport/blockstates/wildflowers.json new file mode 100644 index 0000000..f738311 --- /dev/null +++ b/src/generated/resources/assets/wildflowers_backport/blockstates/wildflowers.json @@ -0,0 +1,160 @@ +{ + "multipart": [ + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_1" + }, + "when": { + "facing": "north", + "flower_amount": "1|2|3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_1", + "y": 90 + }, + "when": { + "facing": "east", + "flower_amount": "1|2|3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_1", + "y": 180 + }, + "when": { + "facing": "south", + "flower_amount": "1|2|3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_1", + "y": 270 + }, + "when": { + "facing": "west", + "flower_amount": "1|2|3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_2" + }, + "when": { + "facing": "north", + "flower_amount": "2|3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_2", + "y": 90 + }, + "when": { + "facing": "east", + "flower_amount": "2|3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_2", + "y": 180 + }, + "when": { + "facing": "south", + "flower_amount": "2|3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_2", + "y": 270 + }, + "when": { + "facing": "west", + "flower_amount": "2|3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_3" + }, + "when": { + "facing": "north", + "flower_amount": "3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_3", + "y": 90 + }, + "when": { + "facing": "east", + "flower_amount": "3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_3", + "y": 180 + }, + "when": { + "facing": "south", + "flower_amount": "3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_3", + "y": 270 + }, + "when": { + "facing": "west", + "flower_amount": "3|4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_4" + }, + "when": { + "facing": "north", + "flower_amount": "4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_4", + "y": 90 + }, + "when": { + "facing": "east", + "flower_amount": "4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_4", + "y": 180 + }, + "when": { + "facing": "south", + "flower_amount": "4" + } + }, + { + "apply": { + "model": "wildflowers_backport:block/wildflowers_4", + "y": 270 + }, + "when": { + "facing": "west", + "flower_amount": "4" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_1.json b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_1.json new file mode 100644 index 0000000..6b157aa --- /dev/null +++ b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_1.json @@ -0,0 +1,7 @@ +{ + "parent": "wildflowers_backport:block/flowerbed_1", + "textures": { + "flowerbed": "wildflowers_backport:block/wildflowers", + "stem": "wildflowers_backport:block/wildflowers_stem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_2.json b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_2.json new file mode 100644 index 0000000..b44c8b9 --- /dev/null +++ b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_2.json @@ -0,0 +1,7 @@ +{ + "parent": "wildflowers_backport:block/flowerbed_2", + "textures": { + "flowerbed": "wildflowers_backport:block/wildflowers", + "stem": "wildflowers_backport:block/wildflowers_stem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_3.json b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_3.json new file mode 100644 index 0000000..c12c2a2 --- /dev/null +++ b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_3.json @@ -0,0 +1,7 @@ +{ + "parent": "wildflowers_backport:block/flowerbed_3", + "textures": { + "flowerbed": "wildflowers_backport:block/wildflowers", + "stem": "wildflowers_backport:block/wildflowers_stem" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_4.json b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_4.json new file mode 100644 index 0000000..b43b6de --- /dev/null +++ b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_4.json @@ -0,0 +1,7 @@ +{ + "parent": "wildflowers_backport:block/flowerbed_4", + "textures": { + "flowerbed": "wildflowers_backport:block/wildflowers", + "stem": "wildflowers_backport:block/wildflowers_stem" + } +} \ No newline at end of file diff --git a/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java b/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java index 83e639e..1d50128 100644 --- a/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java +++ b/src/main/java/dev/micle/wildflowers_backport/WildflowersBackport.java @@ -11,7 +11,7 @@ import org.slf4j.Logger; @Mod(WildflowersBackport.MOD_ID) public class WildflowersBackport { public static final String MOD_ID = "wildflowers_backport"; - private static final Logger LOGGER = LogUtils.getLogger(); + public static final Logger LOGGER = LogUtils.getLogger(); private static FMLJavaModLoadingContext fmlJavaModLoadingContext; private static IProxy proxy; diff --git a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java new file mode 100644 index 0000000..92d4789 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java @@ -0,0 +1,24 @@ +package dev.micle.wildflowers_backport.data; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.data.client.ModBlockStateProvider; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.data.event.GatherDataEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +import java.util.concurrent.CompletableFuture; + +@Mod.EventBusSubscriber(modid = WildflowersBackport.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class DataGenerators { + @SubscribeEvent + public static void gatherData(GatherDataEvent event) { + DataGenerator generator = event.getGenerator(); + ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); + CompletableFuture lookupProvider = event.getLookupProvider(); + + generator.addProvider(event.includeClient(), new ModBlockStateProvider(generator, existingFileHelper)); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/data/client/ModBlockStateProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/client/ModBlockStateProvider.java new file mode 100644 index 0000000..9f2379f --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/data/client/ModBlockStateProvider.java @@ -0,0 +1,53 @@ +package dev.micle.wildflowers_backport.data.client; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.block.FlowerBedBlock; +import dev.micle.wildflowers_backport.block.ModBlocks; +import dev.micle.wildflowers_backport.util.DirectionUtils; +import net.minecraft.core.Direction; +import net.minecraft.data.DataGenerator; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.client.model.generators.BlockStateProvider; +import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.RegistryObject; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + +public class ModBlockStateProvider extends BlockStateProvider { + public ModBlockStateProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator.getPackOutput(), WildflowersBackport.MOD_ID, existingFileHelper); + } + + @Override + protected void registerStatesAndModels() { + flowerBedBlock(ModBlocks.WILDFLOWERS); + } + + private void flowerBedBlock(RegistryObject block) { + String name = Objects.requireNonNull(block.getId()).getPath(); + MultiPartBlockStateBuilder builder = getMultipartBuilder(block.get()); + + List amounts = new ArrayList<>(List.of(1, 2, 3, 4)); + for (int i = 1; i < 5; i++) { + for (Direction direction : Direction.Plane.HORIZONTAL) { + int yRot = DirectionUtils.getYRotation(direction); + + builder.part() + .modelFile(models().withExistingParent(name + "_" + i, ResourceLocation.fromNamespaceAndPath(WildflowersBackport.MOD_ID, "block/flowerbed_" + i)) + .texture("flowerbed", "block/" + name) + .texture("stem", "block/" + name + "_stem") + ) + .rotationY(yRot) + .addModel() + .condition(FlowerBedBlock.FACING, direction) + .condition(FlowerBedBlock.AMOUNT, amounts.toArray(new Integer[0])) + .end(); + } + amounts.remove(0); + } + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/util/DirectionUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/DirectionUtils.java new file mode 100644 index 0000000..610ec27 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/util/DirectionUtils.java @@ -0,0 +1,14 @@ +package dev.micle.wildflowers_backport.util; + +import net.minecraft.core.Direction; + +public class DirectionUtils { + public static int getYRotation(Direction direction) { + return switch (direction) { + case EAST -> 90; + case SOUTH -> 180; + case WEST -> 270; + default -> 0; + }; + } +} diff --git a/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_1.json b/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_1.json new file mode 100644 index 0000000..5b7ba90 --- /dev/null +++ b/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_1.json @@ -0,0 +1,70 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#flowerbed" + }, + "elements": [ + { + "from": [0, 2.99, 0], + "to": [8, 2.99, 8], + "faces": { + "up": {"uv": [0, 0, 8, 8], "texture": "#flowerbed"}, + "down": {"uv": [0, 8, 8, 0], "texture": "#flowerbed"} + } + }, + { + "from": [4.25, 0, -2.6], + "to": [4.25, 2.99, -1.6], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "east": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1}, + "west": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [3.75, 0, -2.1], + "to": [4.75, 2.99, -2.1], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1}, + "south": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [4.9, 0, 2.3], + "to": [4.9, 2.99, 3.3], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "east": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1}, + "west": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [4.4, 0, 2.8], + "to": [5.4, 2.99, 2.8], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1}, + "south": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [9.15, 0, -0.45], + "to": [9.15, 2.99, 0.55], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "east": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1}, + "west": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [8.65, 0, 0.05], + "to": [9.65, 2.99, 0.05], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1}, + "south": {"uv": [0, 4, 1, 7], "texture": "#stem", "tintindex": 1} + } + } + ] +} diff --git a/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_2.json b/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_2.json new file mode 100644 index 0000000..de654b8 --- /dev/null +++ b/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_2.json @@ -0,0 +1,42 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#flowerbed" + }, + "elements": [ + { + "from": [0, 1, 8], + "to": [8, 1, 16], + "faces": { + "up": {"uv": [0, 8, 8, 16], "texture": "#flowerbed"}, + "down": {"uv": [0, 16, 8, 8], "texture": "#flowerbed"} + } + }, + { + "from": [0, 1, 8], + "to": [8, 1, 16], + "faces": { + "up": {"uv": [0, 8, 8, 16], "texture": "#flowerbed"}, + "down": {"uv": [0, 16, 8, 8], "texture": "#flowerbed"} + } + }, + { + "from": [10.15, 0, 5.25], + "to": [11.15, 1, 5.25], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 1]}, + "faces": { + "north": {"uv": [0, 6, 1, 7], "texture": "#stem", "tintindex": 1}, + "south": {"uv": [0, 6, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [10.65, 0, 4.75], + "to": [10.65, 1, 5.75], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 1]}, + "faces": { + "east": {"uv": [0, 6, 1, 7], "texture": "#stem", "tintindex": 1}, + "west": {"uv": [0, 6, 1, 7], "texture": "#stem", "tintindex": 1} + } + } + ] +} diff --git a/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_3.json b/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_3.json new file mode 100644 index 0000000..1d3ba0f --- /dev/null +++ b/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_3.json @@ -0,0 +1,70 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#flowerbed" + }, + "elements": [ + { + "from": [8, 2, 8], + "to": [16, 2, 16], + "faces": { + "up": {"uv": [8, 8, 16, 16], "texture": "#flowerbed"}, + "down": {"uv": [8, 16, 16, 8], "texture": "#flowerbed"} + } + }, + { + "from": [17.65, 0, 1.9], + "to": [18.65, 2, 1.9], + "rotation": {"angle": -45, "axis": "y", "origin": [0.5, 0, 0.5]}, + "faces": { + "north": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1}, + "south": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [18.15, 0, 1.4], + "to": [18.15, 2, 2.4], + "rotation": {"angle": -45, "axis": "y", "origin": [0.5, 0, 0.5]}, + "faces": { + "east": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1}, + "west": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [17.65, 0, -3.35], + "to": [17.65, 2, -2.35], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "east": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1}, + "west": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [17.15, 0, -2.85], + "to": [18.15, 2, -2.85], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1}, + "south": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [13.4, 0, -0.5], + "to": [13.4, 2, 0.5], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "east": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1}, + "west": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [12.9, 0, 0], + "to": [13.9, 2, 0], + "rotation": {"angle": -45, "axis": "y", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1}, + "south": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1} + } + } + ] +} diff --git a/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_4.json b/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_4.json new file mode 100644 index 0000000..3559fe2 --- /dev/null +++ b/src/main/resources/assets/wildflowers_backport/models/block/flowerbed_4.json @@ -0,0 +1,34 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#flowerbed" + }, + "elements": [ + { + "from": [8, 2, 0], + "to": [16, 2, 8], + "faces": { + "up": {"uv": [8, 0, 16, 8], "texture": "#flowerbed"}, + "down": {"uv": [8, 8, 16, 0], "texture": "#flowerbed"} + } + }, + { + "from": [12.4, 0, -7.7], + "to": [12.4, 2, -6.7], + "rotation": {"angle": -45, "axis": "y", "origin": [-1, 0, -3]}, + "faces": { + "east": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1}, + "west": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1} + } + }, + { + "from": [11.9, 0, -7.2], + "to": [12.9, 2, -7.2], + "rotation": {"angle": -45, "axis": "y", "origin": [-1, 0, -3]}, + "faces": { + "north": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1}, + "south": {"uv": [0, 5, 1, 7], "texture": "#stem", "tintindex": 1} + } + } + ] +} diff --git a/src/main/resources/assets/wildflowers_backport/textures/block/wildflowers.png b/src/main/resources/assets/wildflowers_backport/textures/block/wildflowers.png new file mode 100644 index 0000000..ed5453a --- /dev/null +++ b/src/main/resources/assets/wildflowers_backport/textures/block/wildflowers.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5105f8ae7b1903b835e4d312898f4f2b57e60bae91bc7a33e7a362c8d909145 +size 187 diff --git a/src/main/resources/assets/wildflowers_backport/textures/block/wildflowers_stem.png b/src/main/resources/assets/wildflowers_backport/textures/block/wildflowers_stem.png new file mode 100644 index 0000000..3438db9 --- /dev/null +++ b/src/main/resources/assets/wildflowers_backport/textures/block/wildflowers_stem.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86622b67af968e48c78539b8d9d958123890af17c5a03f28348015d6f10b42f5 +size 80 From 44a63b753ff86e2e52a8cb2f6bbd7419aa9946bd Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 22:48:53 +0100 Subject: [PATCH 09/37] Implemented item. --- .../models/item/wildflowers.json | 6 +++ .../data/DataGenerators.java | 2 + .../data/client/ModItemModelProvider.java | 39 +++++++++++++++++++ .../wildflowers_backport/item/ModItems.java | 27 +++++++++++++ .../wildflowers_backport/proxy/Proxy.java | 2 + .../textures/item/wildflowers.png | 3 ++ 6 files changed, 79 insertions(+) create mode 100644 src/generated/resources/assets/wildflowers_backport/models/item/wildflowers.json create mode 100644 src/main/java/dev/micle/wildflowers_backport/data/client/ModItemModelProvider.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/item/ModItems.java create mode 100644 src/main/resources/assets/wildflowers_backport/textures/item/wildflowers.png diff --git a/src/generated/resources/assets/wildflowers_backport/models/item/wildflowers.json b/src/generated/resources/assets/wildflowers_backport/models/item/wildflowers.json new file mode 100644 index 0000000..f30df05 --- /dev/null +++ b/src/generated/resources/assets/wildflowers_backport/models/item/wildflowers.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "wildflowers_backport:item/wildflowers" + } +} \ No newline at end of file diff --git a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java index 92d4789..2dd1d3a 100644 --- a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java +++ b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java @@ -2,6 +2,7 @@ package dev.micle.wildflowers_backport.data; import dev.micle.wildflowers_backport.WildflowersBackport; import dev.micle.wildflowers_backport.data.client.ModBlockStateProvider; +import dev.micle.wildflowers_backport.data.client.ModItemModelProvider; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.ExistingFileHelper; @@ -20,5 +21,6 @@ public class DataGenerators { CompletableFuture lookupProvider = event.getLookupProvider(); generator.addProvider(event.includeClient(), new ModBlockStateProvider(generator, existingFileHelper)); + generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper)); } } diff --git a/src/main/java/dev/micle/wildflowers_backport/data/client/ModItemModelProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/client/ModItemModelProvider.java new file mode 100644 index 0000000..590e368 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/data/client/ModItemModelProvider.java @@ -0,0 +1,39 @@ +package dev.micle.wildflowers_backport.data.client; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.block.ModBlocks; +import net.minecraft.data.DataGenerator; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.client.model.generators.ItemModelBuilder; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.client.model.generators.ModelFile; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +import java.util.Objects; + +public class ModItemModelProvider extends ItemModelProvider { + public ModItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { + super(generator.getPackOutput(), WildflowersBackport.MOD_ID, existingFileHelper); + } + + @Override + public void registerModels() { + ModBlocks.BLOCKS.getEntries().stream().map(RegistryObject::get).forEach(this::blockItemModel); + } + + private void blockItemModel(Block block) { + String name = Objects.requireNonNull(ForgeRegistries.BLOCKS.getKey(block)).getPath(); + + if (block == ModBlocks.WILDFLOWERS.get()) { + builder(getExistingFile(mcLoc("item/generated")), name); + } else { + withExistingParent(name, mcLoc("block/" + name)); + } + } + + private ItemModelBuilder builder(ModelFile itemGenerated, String name) { + return getBuilder(name).parent(itemGenerated).texture("layer0", "item/" + name); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/item/ModItems.java b/src/main/java/dev/micle/wildflowers_backport/item/ModItems.java new file mode 100644 index 0000000..6371412 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/item/ModItems.java @@ -0,0 +1,27 @@ +package dev.micle.wildflowers_backport.item; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.block.ModBlocks; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +import java.util.Objects; + +public class ModItems { + public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, WildflowersBackport.MOD_ID); + + public static final RegistryObject WILDFLOWERS = registerBlock(ModBlocks.WILDFLOWERS); + + public static void register(IEventBus modEventBus) { + ITEMS.register(modEventBus); + } + + private static RegistryObject registerBlock(RegistryObject block) { + return ITEMS.register(Objects.requireNonNull(block.getId()).getPath(), () -> new BlockItem(block.get(), new Item.Properties())); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java index 3504e67..a8ebe7b 100644 --- a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java +++ b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java @@ -2,6 +2,7 @@ package dev.micle.wildflowers_backport.proxy; import dev.micle.wildflowers_backport.WildflowersBackport; import dev.micle.wildflowers_backport.block.ModBlocks; +import dev.micle.wildflowers_backport.item.ModItems; import dev.micle.wildflowers_backport.tab.ModCreativeTabs; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; @@ -24,6 +25,7 @@ public class Proxy implements IProxy { IEventBus modEventBus = WildflowersBackport.getFmlJavaModLoadingContext().getModEventBus(); ModBlocks.register(modEventBus); + ModItems.register(modEventBus); ModCreativeTabs.register(modEventBus); // Register mod event bus listeners diff --git a/src/main/resources/assets/wildflowers_backport/textures/item/wildflowers.png b/src/main/resources/assets/wildflowers_backport/textures/item/wildflowers.png new file mode 100644 index 0000000..ebcc688 --- /dev/null +++ b/src/main/resources/assets/wildflowers_backport/textures/item/wildflowers.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f87d03cc998cbc0dfb81c208deb1308d472f7f4cd48e995c064a0aa2adc0f38 +size 192 From 0dffb5c006b5b523d14745cce23d087b0c2e11a6 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 22:59:07 +0100 Subject: [PATCH 10/37] Fixed transparency of block. --- .../assets/wildflowers_backport/models/block/wildflowers_1.json | 1 + .../assets/wildflowers_backport/models/block/wildflowers_2.json | 1 + .../assets/wildflowers_backport/models/block/wildflowers_3.json | 1 + .../assets/wildflowers_backport/models/block/wildflowers_4.json | 1 + .../wildflowers_backport/data/client/ModBlockStateProvider.java | 1 + 5 files changed, 5 insertions(+) diff --git a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_1.json b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_1.json index 6b157aa..92636c0 100644 --- a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_1.json +++ b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_1.json @@ -1,5 +1,6 @@ { "parent": "wildflowers_backport:block/flowerbed_1", + "render_type": "minecraft:cutout", "textures": { "flowerbed": "wildflowers_backport:block/wildflowers", "stem": "wildflowers_backport:block/wildflowers_stem" diff --git a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_2.json b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_2.json index b44c8b9..d092169 100644 --- a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_2.json +++ b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_2.json @@ -1,5 +1,6 @@ { "parent": "wildflowers_backport:block/flowerbed_2", + "render_type": "minecraft:cutout", "textures": { "flowerbed": "wildflowers_backport:block/wildflowers", "stem": "wildflowers_backport:block/wildflowers_stem" diff --git a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_3.json b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_3.json index c12c2a2..db508d7 100644 --- a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_3.json +++ b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_3.json @@ -1,5 +1,6 @@ { "parent": "wildflowers_backport:block/flowerbed_3", + "render_type": "minecraft:cutout", "textures": { "flowerbed": "wildflowers_backport:block/wildflowers", "stem": "wildflowers_backport:block/wildflowers_stem" diff --git a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_4.json b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_4.json index b43b6de..36934c6 100644 --- a/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_4.json +++ b/src/generated/resources/assets/wildflowers_backport/models/block/wildflowers_4.json @@ -1,5 +1,6 @@ { "parent": "wildflowers_backport:block/flowerbed_4", + "render_type": "minecraft:cutout", "textures": { "flowerbed": "wildflowers_backport:block/wildflowers", "stem": "wildflowers_backport:block/wildflowers_stem" diff --git a/src/main/java/dev/micle/wildflowers_backport/data/client/ModBlockStateProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/client/ModBlockStateProvider.java index 9f2379f..1d144fe 100644 --- a/src/main/java/dev/micle/wildflowers_backport/data/client/ModBlockStateProvider.java +++ b/src/main/java/dev/micle/wildflowers_backport/data/client/ModBlockStateProvider.java @@ -40,6 +40,7 @@ public class ModBlockStateProvider extends BlockStateProvider { .modelFile(models().withExistingParent(name + "_" + i, ResourceLocation.fromNamespaceAndPath(WildflowersBackport.MOD_ID, "block/flowerbed_" + i)) .texture("flowerbed", "block/" + name) .texture("stem", "block/" + name + "_stem") + .renderType("cutout") ) .rotationY(yRot) .addModel() From 8b0a037effc8823daadc7cdb987e463d43e65bf1 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 23:07:07 +0100 Subject: [PATCH 11/37] Registering block color. --- .../micle/wildflowers_backport/proxy/Proxy.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java index a8ebe7b..8ddc102 100644 --- a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java +++ b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java @@ -5,11 +5,13 @@ import dev.micle.wildflowers_backport.block.ModBlocks; import dev.micle.wildflowers_backport.item.ModItems; import dev.micle.wildflowers_backport.tab.ModCreativeTabs; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BiomeColors; import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.RegisterColorHandlersEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.AddReloadListenerEvent; import net.minecraftforge.event.server.ServerStartedEvent; @@ -78,12 +80,24 @@ public class Proxy implements IProxy { // Register mod event bus listeners modEventBus.addListener(Client::setup); modEventBus.addListener(Client::postSetup); + + modEventBus.addListener(Client::registerBlockColors); } private static void setup(FMLClientSetupEvent event) {} private static void postSetup(FMLLoadCompleteEvent event) {} + private static void registerBlockColors(RegisterColorHandlersEvent.Block event) { + event.register( + (blockState, level, blockPos, tintIndex) -> { + if (level == null || blockPos == null) return 0; + return BiomeColors.getAverageGrassColor(level, blockPos); + }, + ModBlocks.WILDFLOWERS.get() + ); + } + @Override @OnlyIn(Dist.CLIENT) public Player getClientPlayer() { From 73fe5db0051b92601fa64fdd5d15e8adf33f8560 Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 23:29:49 +0100 Subject: [PATCH 12/37] Fixed block collision box. --- .../micle/wildflowers_backport/util/VoxelShapeUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/micle/wildflowers_backport/util/VoxelShapeUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/VoxelShapeUtils.java index 68ba5c0..281416e 100644 --- a/src/main/java/dev/micle/wildflowers_backport/util/VoxelShapeUtils.java +++ b/src/main/java/dev/micle/wildflowers_backport/util/VoxelShapeUtils.java @@ -12,9 +12,9 @@ public class VoxelShapeUtils { voxelShape.min(Direction.Axis.X), voxelShape.min(Direction.Axis.Y), voxelShape.min(Direction.Axis.Z), - voxelShape.min(Direction.Axis.X), - voxelShape.min(Direction.Axis.Y), - voxelShape.min(Direction.Axis.Z) + voxelShape.max(Direction.Axis.X), + voxelShape.max(Direction.Axis.Y), + voxelShape.max(Direction.Axis.Z) ); } } From 5c87e4a0eb1b3f6223e18d7e89bda6e8fccfb2dd Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 23:45:42 +0100 Subject: [PATCH 13/37] Implemented block loot table. --- .../loot_tables/blocks/wildflowers.json | 92 +++++++++++++++++++ .../data/DataGenerators.java | 3 + .../data/loot/ModBlockLootTableProvider.java | 53 +++++++++++ .../data/server/ModLootTableProvider.java | 17 ++++ 4 files changed, 165 insertions(+) create mode 100644 src/generated/resources/data/wildflowers_backport/loot_tables/blocks/wildflowers.json create mode 100644 src/main/java/dev/micle/wildflowers_backport/data/loot/ModBlockLootTableProvider.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/data/server/ModLootTableProvider.java diff --git a/src/generated/resources/data/wildflowers_backport/loot_tables/blocks/wildflowers.json b/src/generated/resources/data/wildflowers_backport/loot_tables/blocks/wildflowers.json new file mode 100644 index 0000000..61d0e34 --- /dev/null +++ b/src/generated/resources/data/wildflowers_backport/loot_tables/blocks/wildflowers.json @@ -0,0 +1,92 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "wildflowers_backport:wildflowers", + "condition": "minecraft:block_state_property", + "properties": { + "flower_amount": "1" + } + } + ], + "functions": [ + { + "add": false, + "count": 1.0, + "function": "minecraft:set_count" + } + ], + "name": "wildflowers_backport:wildflowers" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "wildflowers_backport:wildflowers", + "condition": "minecraft:block_state_property", + "properties": { + "flower_amount": "2" + } + } + ], + "functions": [ + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "wildflowers_backport:wildflowers" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "wildflowers_backport:wildflowers", + "condition": "minecraft:block_state_property", + "properties": { + "flower_amount": "3" + } + } + ], + "functions": [ + { + "add": false, + "count": 3.0, + "function": "minecraft:set_count" + } + ], + "name": "wildflowers_backport:wildflowers" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "wildflowers_backport:wildflowers", + "condition": "minecraft:block_state_property", + "properties": { + "flower_amount": "4" + } + } + ], + "functions": [ + { + "add": false, + "count": 4.0, + "function": "minecraft:set_count" + } + ], + "name": "wildflowers_backport:wildflowers" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "wildflowers_backport:blocks/wildflowers" +} \ No newline at end of file diff --git a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java index 2dd1d3a..705e26c 100644 --- a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java +++ b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java @@ -3,6 +3,7 @@ package dev.micle.wildflowers_backport.data; import dev.micle.wildflowers_backport.WildflowersBackport; import dev.micle.wildflowers_backport.data.client.ModBlockStateProvider; import dev.micle.wildflowers_backport.data.client.ModItemModelProvider; +import dev.micle.wildflowers_backport.data.server.ModLootTableProvider; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.ExistingFileHelper; @@ -22,5 +23,7 @@ public class DataGenerators { generator.addProvider(event.includeClient(), new ModBlockStateProvider(generator, existingFileHelper)); generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper)); + + generator.addProvider(event.includeServer(), new ModLootTableProvider(generator)); } } diff --git a/src/main/java/dev/micle/wildflowers_backport/data/loot/ModBlockLootTableProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/loot/ModBlockLootTableProvider.java new file mode 100644 index 0000000..f908c76 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/data/loot/ModBlockLootTableProvider.java @@ -0,0 +1,53 @@ +package dev.micle.wildflowers_backport.data.loot; + +import dev.micle.wildflowers_backport.block.FlowerBedBlock; +import dev.micle.wildflowers_backport.block.ModBlocks; +import net.minecraft.advancements.critereon.StatePropertiesPredicate; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.world.flag.FeatureFlags; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; +import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition; +import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; +import net.minecraftforge.registries.RegistryObject; +import org.jetbrains.annotations.NotNull; + +import java.util.Set; + +public class ModBlockLootTableProvider extends BlockLootSubProvider { + public ModBlockLootTableProvider() { + super(Set.of(), FeatureFlags.REGISTRY.allFlags()); + } + + @Override + protected void generate() { + this.add(ModBlocks.WILDFLOWERS.get(), this::wildflowersLootTable); + } + + private LootTable.Builder wildflowersLootTable(Block block) { + LootPool.Builder pool = LootPool.lootPool(); + + for (int amount = FlowerBedBlock.MIN_SEGMENT; amount <= FlowerBedBlock.MAX_SEGMENT; amount++) { + pool.add( + LootItem.lootTableItem(block) + .when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(block) + .setProperties( + StatePropertiesPredicate.Builder.properties() + .hasProperty(FlowerBedBlock.AMOUNT, amount) + ) + ) + .apply(SetItemCountFunction.setCount(ConstantValue.exactly(amount))) + ); + } + + return LootTable.lootTable().withPool(pool); + } + + @Override + protected @NotNull Iterable getKnownBlocks() { + return ModBlocks.BLOCKS.getEntries().stream().map(RegistryObject::get)::iterator; + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/data/server/ModLootTableProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/server/ModLootTableProvider.java new file mode 100644 index 0000000..2722715 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/data/server/ModLootTableProvider.java @@ -0,0 +1,17 @@ +package dev.micle.wildflowers_backport.data.server; + +import dev.micle.wildflowers_backport.data.loot.ModBlockLootTableProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; + +import java.util.List; +import java.util.Set; + +public class ModLootTableProvider extends LootTableProvider { + public ModLootTableProvider(DataGenerator generator) { + super(generator.getPackOutput(), Set.of(), List.of( + new LootTableProvider.SubProviderEntry(ModBlockLootTableProvider::new, LootContextParamSets.BLOCK) + )); + } +} From 20607ac42ea9d5ed5361f619774c6c6892eb367a Mon Sep 17 00:00:00 2001 From: Micle Date: Tue, 9 Jun 2026 23:49:12 +0100 Subject: [PATCH 14/37] Renamed mixin methods to follow convention. --- .../wildflowers_backport/mixin/ArrayVoxelShapeAccessor.java | 2 +- .../wildflowers_backport/mixin/CubeVoxelShapeAccessor.java | 2 +- .../java/dev/micle/wildflowers_backport/util/ShapesUtils.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/dev/micle/wildflowers_backport/mixin/ArrayVoxelShapeAccessor.java b/src/main/java/dev/micle/wildflowers_backport/mixin/ArrayVoxelShapeAccessor.java index aef58fc..7a30436 100644 --- a/src/main/java/dev/micle/wildflowers_backport/mixin/ArrayVoxelShapeAccessor.java +++ b/src/main/java/dev/micle/wildflowers_backport/mixin/ArrayVoxelShapeAccessor.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(ArrayVoxelShape.class) public interface ArrayVoxelShapeAccessor { @Invoker("") - static ArrayVoxelShape newArrayVoxelShape(DiscreteVoxelShape pShape, DoubleList pXs, DoubleList pYs, DoubleList pZs) { + static ArrayVoxelShape wildflowers_backport$newArrayVoxelShape(DiscreteVoxelShape pShape, DoubleList pXs, DoubleList pYs, DoubleList pZs) { throw new AssertionError(); } } diff --git a/src/main/java/dev/micle/wildflowers_backport/mixin/CubeVoxelShapeAccessor.java b/src/main/java/dev/micle/wildflowers_backport/mixin/CubeVoxelShapeAccessor.java index 91ff12c..2b8aca4 100644 --- a/src/main/java/dev/micle/wildflowers_backport/mixin/CubeVoxelShapeAccessor.java +++ b/src/main/java/dev/micle/wildflowers_backport/mixin/CubeVoxelShapeAccessor.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(CubeVoxelShape.class) public interface CubeVoxelShapeAccessor { @Invoker("") - static CubeVoxelShape newCubeVoxelShape(DiscreteVoxelShape pShape) { + static CubeVoxelShape wildflowers_backport$newCubeVoxelShape(DiscreteVoxelShape pShape) { throw new AssertionError(); } } diff --git a/src/main/java/dev/micle/wildflowers_backport/util/ShapesUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/ShapesUtils.java index 016cae4..9914671 100644 --- a/src/main/java/dev/micle/wildflowers_backport/util/ShapesUtils.java +++ b/src/main/java/dev/micle/wildflowers_backport/util/ShapesUtils.java @@ -29,7 +29,7 @@ public class ShapesUtils { } else { DiscreteVoxelShape discreteVoxelShape = ((VoxelShapeAccessor) voxelShape).wildflowers_backport$getShape(); if (voxelShape instanceof CubeVoxelShape && BLOCK_CENTER.equals(vec3)) { - return CubeVoxelShapeAccessor.newCubeVoxelShape(discreteVoxelShape); + return CubeVoxelShapeAccessor.wildflowers_backport$newCubeVoxelShape(discreteVoxelShape); } else { Direction.Axis direction$axis = OctahedralGroupUtils.permute(octahedralGroup, Direction.Axis.X); Direction.Axis direction$axis1 = OctahedralGroupUtils.permute(octahedralGroup, Direction.Axis.Y); @@ -46,7 +46,7 @@ public class ShapesUtils { boolean flag4 = DirectionAxisUtils.choose(direction$axis1, flag, flag1, flag2); boolean flag5 = DirectionAxisUtils.choose(direction$axis2, flag, flag1, flag2); - return ArrayVoxelShapeAccessor.newArrayVoxelShape( + return ArrayVoxelShapeAccessor.wildflowers_backport$newArrayVoxelShape( discreteVoxelShape, makeAxis(doubleList, flag3, vec3.get(direction$axis), vec3.x), makeAxis(doubleList1, flag4, vec3.get(direction$axis1), vec3.y), From 6f13dac9aa123f2a898b23ef25c81d3bf4ecb70f Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 17:28:58 +0100 Subject: [PATCH 15/37] Made wildflowers compostable. --- .../java/dev/micle/wildflowers_backport/proxy/Proxy.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java index 8ddc102..f8b25e9 100644 --- a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java +++ b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java @@ -9,6 +9,7 @@ import net.minecraft.client.renderer.BiomeColors; import net.minecraft.server.MinecraftServer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.ComposterBlock; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RegisterColorHandlersEvent; @@ -41,7 +42,9 @@ public class Proxy implements IProxy { MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping); } - private static void setup(FMLCommonSetupEvent event) {} + private static void setup(FMLCommonSetupEvent event) { + ComposterBlock.COMPOSTABLES.put(ModItems.WILDFLOWERS.get().asItem(), 0.3F); + } private static void imcEnqueue(InterModEnqueueEvent event) {} From 0e54f9ee51fbc3ef2d6a36c4908e325ecc6f1a4c Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 17:36:18 +0100 Subject: [PATCH 16/37] Created wandering trader trade. --- .../event/WandererTradesEventHandler.java | 14 ++++++++++++++ .../micle/wildflowers_backport/proxy/Proxy.java | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/main/java/dev/micle/wildflowers_backport/event/WandererTradesEventHandler.java diff --git a/src/main/java/dev/micle/wildflowers_backport/event/WandererTradesEventHandler.java b/src/main/java/dev/micle/wildflowers_backport/event/WandererTradesEventHandler.java new file mode 100644 index 0000000..4450708 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/event/WandererTradesEventHandler.java @@ -0,0 +1,14 @@ +package dev.micle.wildflowers_backport.event; + +import dev.micle.wildflowers_backport.item.ModItems; +import net.minecraft.world.item.ItemStack; +import net.minecraftforge.common.BasicItemListing; +import net.minecraftforge.event.village.WandererTradesEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +public class WandererTradesEventHandler { + @SubscribeEvent + public void onWandererTradesEvent(WandererTradesEvent event) { + event.getGenericTrades().add(new BasicItemListing(1, new ItemStack(ModItems.WILDFLOWERS.get(), 1), 12, 1)); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java index f8b25e9..57e1870 100644 --- a/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java +++ b/src/main/java/dev/micle/wildflowers_backport/proxy/Proxy.java @@ -2,6 +2,7 @@ package dev.micle.wildflowers_backport.proxy; import dev.micle.wildflowers_backport.WildflowersBackport; import dev.micle.wildflowers_backport.block.ModBlocks; +import dev.micle.wildflowers_backport.event.WandererTradesEventHandler; import dev.micle.wildflowers_backport.item.ModItems; import dev.micle.wildflowers_backport.tab.ModCreativeTabs; import net.minecraft.client.Minecraft; @@ -40,6 +41,9 @@ public class Proxy implements IProxy { MinecraftForge.EVENT_BUS.addListener(Proxy::onAddReloadListeners); MinecraftForge.EVENT_BUS.addListener(Proxy::serverStarted); MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping); + + // Register event handlers + MinecraftForge.EVENT_BUS.register(new WandererTradesEventHandler()); } private static void setup(FMLCommonSetupEvent event) { @@ -83,7 +87,6 @@ public class Proxy implements IProxy { // Register mod event bus listeners modEventBus.addListener(Client::setup); modEventBus.addListener(Client::postSetup); - modEventBus.addListener(Client::registerBlockColors); } From 40a1f5509a1bbf84cc5ceb8279dade9763df21d8 Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 17:49:19 +0100 Subject: [PATCH 17/37] Setup for creating configured features. --- .../worldgen/ModConfiguredFeatures.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java diff --git a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java new file mode 100644 index 0000000..a8c60cf --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java @@ -0,0 +1,31 @@ +package dev.micle.wildflowers_backport.worldgen; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; + +public class ModConfiguredFeatures { + public static final ResourceKey> WILDFLOWERS_MEADOW = registerKey("wildflowers_meadow"); + + public static final ResourceKey> WILDFLOWERS_BIRCH_FOREST = registerKey("wildflowers_birch_forest"); + + public static void bootstrap(BootstapContext> context) { + + } + + public static ResourceKey> registerKey(String name) { + return ResourceKey.create(Registries.CONFIGURED_FEATURE, ResourceLocation.fromNamespaceAndPath(WildflowersBackport.MOD_ID, name)); + } + + private static > void register( + BootstapContext> context, + ResourceKey> key, F feature, FC configuration + ) { + context.register(key, new ConfiguredFeature<>(feature, configuration)); + } +} From cd5ff6c497c4ab4802c3360ea9da0e3943c9cc48 Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 18:14:26 +0100 Subject: [PATCH 18/37] Implemented both configured features. --- .../worldgen/ModConfiguredFeatures.java | 45 ++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java index a8c60cf..a3d4c0e 100644 --- a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java +++ b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java @@ -1,21 +1,52 @@ package dev.micle.wildflowers_backport.worldgen; import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.block.FlowerBedBlock; +import dev.micle.wildflowers_backport.block.ModBlocks; +import net.minecraft.core.Direction; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.data.worldgen.placement.PlacementUtils; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.random.SimpleWeightedRandomList; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.RandomPatchConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.SimpleBlockConfiguration; +import net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider; public class ModConfiguredFeatures { public static final ResourceKey> WILDFLOWERS_MEADOW = registerKey("wildflowers_meadow"); - public static final ResourceKey> WILDFLOWERS_BIRCH_FOREST = registerKey("wildflowers_birch_forest"); public static void bootstrap(BootstapContext> context) { + register(context, WILDFLOWERS_MEADOW, Feature.FLOWER, new RandomPatchConfiguration( + 8, + 6, + 2, + PlacementUtils.onlyWhenEmpty( + Feature.SIMPLE_BLOCK, + new SimpleBlockConfiguration( + new WeightedStateProvider(createAllPossibleFlowerBedBlockEntries(ModBlocks.WILDFLOWERS.get())) + ) + ) + )); + register(context, WILDFLOWERS_BIRCH_FOREST, Feature.FLOWER, new RandomPatchConfiguration( + 64, + 6, + 2, + PlacementUtils.onlyWhenEmpty( + Feature.SIMPLE_BLOCK, + new SimpleBlockConfiguration( + new WeightedStateProvider(createAllPossibleFlowerBedBlockEntries(ModBlocks.WILDFLOWERS.get())) + ) + ) + )); } public static ResourceKey> registerKey(String name) { @@ -28,4 +59,16 @@ public class ModConfiguredFeatures { ) { context.register(key, new ConfiguredFeature<>(feature, configuration)); } + + private static SimpleWeightedRandomList createAllPossibleFlowerBedBlockEntries(Block block) { + SimpleWeightedRandomList.Builder builder = SimpleWeightedRandomList.builder(); + + for (Direction direction : Direction.Plane.HORIZONTAL) { + for (int i = FlowerBedBlock.MIN_SEGMENT; i <= FlowerBedBlock.MAX_SEGMENT; i++) { + builder.add(block.defaultBlockState().setValue(FlowerBedBlock.FACING, direction).setValue(FlowerBedBlock.AMOUNT, i), 1); + } + } + + return builder.build(); + } } From 8c4e39162b75049b81a199860a1f753f31eeacbf Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 18:20:16 +0100 Subject: [PATCH 19/37] Implemented world gen data gen. --- .../wildflowers_birch_forest.json | 189 ++++++++++++++++++ .../wildflowers_meadow.json | 189 ++++++++++++++++++ .../data/DataGenerators.java | 2 + .../data/server/ModWorldGenProvider.java | 21 ++ .../worldgen/ModConfiguredFeatures.java | 4 +- 5 files changed, 403 insertions(+), 2 deletions(-) create mode 100644 src/generated/resources/data/wildflowers_backport/worldgen/configured_feature/wildflowers_birch_forest.json create mode 100644 src/generated/resources/data/wildflowers_backport/worldgen/configured_feature/wildflowers_meadow.json create mode 100644 src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java diff --git a/src/generated/resources/data/wildflowers_backport/worldgen/configured_feature/wildflowers_birch_forest.json b/src/generated/resources/data/wildflowers_backport/worldgen/configured_feature/wildflowers_birch_forest.json new file mode 100644 index 0000000..69accab --- /dev/null +++ b/src/generated/resources/data/wildflowers_backport/worldgen/configured_feature/wildflowers_birch_forest.json @@ -0,0 +1,189 @@ +{ + "type": "minecraft:flower", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "north", + "flower_amount": "1" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "east", + "flower_amount": "1" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "south", + "flower_amount": "1" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "west", + "flower_amount": "1" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "north", + "flower_amount": "2" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "east", + "flower_amount": "2" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "south", + "flower_amount": "2" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "west", + "flower_amount": "2" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "north", + "flower_amount": "3" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "east", + "flower_amount": "3" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "south", + "flower_amount": "3" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "west", + "flower_amount": "3" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "north", + "flower_amount": "4" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "east", + "flower_amount": "4" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "south", + "flower_amount": "4" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "west", + "flower_amount": "4" + } + }, + "weight": 1 + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + }, + "tries": 64, + "xz_spread": 6, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/src/generated/resources/data/wildflowers_backport/worldgen/configured_feature/wildflowers_meadow.json b/src/generated/resources/data/wildflowers_backport/worldgen/configured_feature/wildflowers_meadow.json new file mode 100644 index 0000000..6396c85 --- /dev/null +++ b/src/generated/resources/data/wildflowers_backport/worldgen/configured_feature/wildflowers_meadow.json @@ -0,0 +1,189 @@ +{ + "type": "minecraft:flower", + "config": { + "feature": { + "feature": { + "type": "minecraft:simple_block", + "config": { + "to_place": { + "type": "minecraft:weighted_state_provider", + "entries": [ + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "north", + "flower_amount": "1" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "east", + "flower_amount": "1" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "south", + "flower_amount": "1" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "west", + "flower_amount": "1" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "north", + "flower_amount": "2" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "east", + "flower_amount": "2" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "south", + "flower_amount": "2" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "west", + "flower_amount": "2" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "north", + "flower_amount": "3" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "east", + "flower_amount": "3" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "south", + "flower_amount": "3" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "west", + "flower_amount": "3" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "north", + "flower_amount": "4" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "east", + "flower_amount": "4" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "south", + "flower_amount": "4" + } + }, + "weight": 1 + }, + { + "data": { + "Name": "wildflowers_backport:wildflowers", + "Properties": { + "facing": "west", + "flower_amount": "4" + } + }, + "weight": 1 + } + ] + } + } + }, + "placement": [ + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:matching_blocks", + "blocks": "minecraft:air" + } + } + ] + }, + "tries": 8, + "xz_spread": 6, + "y_spread": 2 + } +} \ No newline at end of file diff --git a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java index 705e26c..1f6f1c0 100644 --- a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java +++ b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java @@ -4,6 +4,7 @@ import dev.micle.wildflowers_backport.WildflowersBackport; import dev.micle.wildflowers_backport.data.client.ModBlockStateProvider; import dev.micle.wildflowers_backport.data.client.ModItemModelProvider; import dev.micle.wildflowers_backport.data.server.ModLootTableProvider; +import dev.micle.wildflowers_backport.data.server.ModWorldGenProvider; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.ExistingFileHelper; @@ -25,5 +26,6 @@ public class DataGenerators { generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper)); generator.addProvider(event.includeServer(), new ModLootTableProvider(generator)); + generator.addProvider(event.includeServer(), new ModWorldGenProvider(generator, lookupProvider)); } } diff --git a/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java new file mode 100644 index 0000000..815678f --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java @@ -0,0 +1,21 @@ +package dev.micle.wildflowers_backport.data.server; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.worldgen.ModConfiguredFeatures; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.RegistrySetBuilder; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.DataGenerator; +import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider; + +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +public class ModWorldGenProvider extends DatapackBuiltinEntriesProvider { + public static final RegistrySetBuilder BUILDER = new RegistrySetBuilder() + .add(Registries.CONFIGURED_FEATURE, ModConfiguredFeatures::bootstrap); + + public ModWorldGenProvider(DataGenerator generator, CompletableFuture registries) { + super(generator.getPackOutput(), registries, BUILDER, Set.of(WildflowersBackport.MOD_ID)); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java index a3d4c0e..27f9d7f 100644 --- a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java +++ b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModConfiguredFeatures.java @@ -63,8 +63,8 @@ public class ModConfiguredFeatures { private static SimpleWeightedRandomList createAllPossibleFlowerBedBlockEntries(Block block) { SimpleWeightedRandomList.Builder builder = SimpleWeightedRandomList.builder(); - for (Direction direction : Direction.Plane.HORIZONTAL) { - for (int i = FlowerBedBlock.MIN_SEGMENT; i <= FlowerBedBlock.MAX_SEGMENT; i++) { + for (int i = FlowerBedBlock.MIN_SEGMENT; i <= FlowerBedBlock.MAX_SEGMENT; i++) { + for (Direction direction : Direction.Plane.HORIZONTAL) { builder.add(block.defaultBlockState().setValue(FlowerBedBlock.FACING, direction).setValue(FlowerBedBlock.AMOUNT, i), 1); } } From bb2e8521fdc995740c5247aac4a3b1961abde99b Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 18:24:49 +0100 Subject: [PATCH 20/37] Setup for placed features. --- .../worldgen/ModPlacedFeatures.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/main/java/dev/micle/wildflowers_backport/worldgen/ModPlacedFeatures.java diff --git a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModPlacedFeatures.java b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModPlacedFeatures.java new file mode 100644 index 0000000..e13220c --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModPlacedFeatures.java @@ -0,0 +1,35 @@ +package dev.micle.wildflowers_backport.worldgen; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import net.minecraft.core.Holder; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; +import net.minecraft.world.level.levelgen.placement.PlacementModifier; + +import java.util.List; + +public class ModPlacedFeatures { + public static final ResourceKey WILDFLOWERS_MEADOW = registerKey("wildflowers_meadow"); + public static final ResourceKey WILDFLOWERS_BIRCH_FOREST = registerKey("wildflowers_birch_forest"); + + public static void bootstrap(BootstapContext context) { + + } + + private static ResourceKey registerKey(String name) { + return ResourceKey.create(Registries.PLACED_FEATURE, ResourceLocation.fromNamespaceAndPath(WildflowersBackport.MOD_ID, name)); + } + + private static void register( + BootstapContext context, + ResourceKey key, + Holder> featureHolder, + List modifiers + ) { + context.register(key, new PlacedFeature(featureHolder, List.copyOf(modifiers))); + } +} From 90ac49ef3b468d0fe89d9399e1f489ffb64e951e Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 18:30:39 +0100 Subject: [PATCH 21/37] Implemented placed features. --- .../worldgen/ModPlacedFeatures.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModPlacedFeatures.java b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModPlacedFeatures.java index e13220c..a2bc843 100644 --- a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModPlacedFeatures.java +++ b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModPlacedFeatures.java @@ -2,13 +2,14 @@ package dev.micle.wildflowers_backport.worldgen; import dev.micle.wildflowers_backport.WildflowersBackport; import net.minecraft.core.Holder; +import net.minecraft.core.HolderGetter; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstapContext; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; +import net.minecraft.world.level.levelgen.placement.*; import java.util.List; @@ -17,7 +18,22 @@ public class ModPlacedFeatures { public static final ResourceKey WILDFLOWERS_BIRCH_FOREST = registerKey("wildflowers_birch_forest"); public static void bootstrap(BootstapContext context) { + HolderGetter> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE); + register(context, WILDFLOWERS_MEADOW, configuredFeatures.getOrThrow(ModConfiguredFeatures.WILDFLOWERS_MEADOW), List.of( + NoiseThresholdCountPlacement.of(-0.8, 5, 10), + InSquarePlacement.spread(), + HeightmapPlacement.onHeightmap(Heightmap.Types.MOTION_BLOCKING), + BiomeFilter.biome() + )); + + register(context, WILDFLOWERS_BIRCH_FOREST, configuredFeatures.getOrThrow(ModConfiguredFeatures.WILDFLOWERS_BIRCH_FOREST), List.of( + CountPlacement.of(3), + RarityFilter.onAverageOnceEvery(2), + InSquarePlacement.spread(), + HeightmapPlacement.onHeightmap(Heightmap.Types.MOTION_BLOCKING), + BiomeFilter.biome() + )); } private static ResourceKey registerKey(String name) { From dac069ff364caaf02f344de9ccb940f2d36f1256 Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 18:30:51 +0100 Subject: [PATCH 22/37] Added placed features to data gen. --- .../wildflowers_birch_forest.json | 23 +++++++++++++++++++ .../placed_feature/wildflowers_meadow.json | 21 +++++++++++++++++ .../data/server/ModWorldGenProvider.java | 4 +++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/data/wildflowers_backport/worldgen/placed_feature/wildflowers_birch_forest.json create mode 100644 src/generated/resources/data/wildflowers_backport/worldgen/placed_feature/wildflowers_meadow.json diff --git a/src/generated/resources/data/wildflowers_backport/worldgen/placed_feature/wildflowers_birch_forest.json b/src/generated/resources/data/wildflowers_backport/worldgen/placed_feature/wildflowers_birch_forest.json new file mode 100644 index 0000000..4293c7b --- /dev/null +++ b/src/generated/resources/data/wildflowers_backport/worldgen/placed_feature/wildflowers_birch_forest.json @@ -0,0 +1,23 @@ +{ + "feature": "wildflowers_backport:wildflowers_birch_forest", + "placement": [ + { + "type": "minecraft:count", + "count": 3 + }, + { + "type": "minecraft:rarity_filter", + "chance": 2 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/wildflowers_backport/worldgen/placed_feature/wildflowers_meadow.json b/src/generated/resources/data/wildflowers_backport/worldgen/placed_feature/wildflowers_meadow.json new file mode 100644 index 0000000..95f37d0 --- /dev/null +++ b/src/generated/resources/data/wildflowers_backport/worldgen/placed_feature/wildflowers_meadow.json @@ -0,0 +1,21 @@ +{ + "feature": "wildflowers_backport:wildflowers_meadow", + "placement": [ + { + "type": "minecraft:noise_threshold_count", + "above_noise": 10, + "below_noise": 5, + "noise_level": -0.8 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:heightmap", + "heightmap": "MOTION_BLOCKING" + }, + { + "type": "minecraft:biome" + } + ] +} \ No newline at end of file diff --git a/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java index 815678f..b0bcefc 100644 --- a/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java +++ b/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java @@ -2,6 +2,7 @@ package dev.micle.wildflowers_backport.data.server; import dev.micle.wildflowers_backport.WildflowersBackport; import dev.micle.wildflowers_backport.worldgen.ModConfiguredFeatures; +import dev.micle.wildflowers_backport.worldgen.ModPlacedFeatures; import net.minecraft.core.HolderLookup; import net.minecraft.core.RegistrySetBuilder; import net.minecraft.core.registries.Registries; @@ -13,7 +14,8 @@ import java.util.concurrent.CompletableFuture; public class ModWorldGenProvider extends DatapackBuiltinEntriesProvider { public static final RegistrySetBuilder BUILDER = new RegistrySetBuilder() - .add(Registries.CONFIGURED_FEATURE, ModConfiguredFeatures::bootstrap); + .add(Registries.CONFIGURED_FEATURE, ModConfiguredFeatures::bootstrap) + .add(Registries.PLACED_FEATURE, ModPlacedFeatures::bootstrap); public ModWorldGenProvider(DataGenerator generator, CompletableFuture registries) { super(generator.getPackOutput(), registries, BUILDER, Set.of(WildflowersBackport.MOD_ID)); From 24190beb667162e3650510f86275790feadc8df3 Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 18:33:33 +0100 Subject: [PATCH 23/37] Setup for biome modifiers. --- .../worldgen/ModBiomeModifiers.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/java/dev/micle/wildflowers_backport/worldgen/ModBiomeModifiers.java diff --git a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModBiomeModifiers.java b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModBiomeModifiers.java new file mode 100644 index 0000000..80a4447 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModBiomeModifiers.java @@ -0,0 +1,21 @@ +package dev.micle.wildflowers_backport.worldgen; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import net.minecraft.data.worldgen.BootstapContext; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraftforge.common.world.BiomeModifier; +import net.minecraftforge.registries.ForgeRegistries; + +public class ModBiomeModifiers { + public static final ResourceKey ADD_WILDFLOWERS_MEADOW = registerKey("add_wildflowers_meadow"); + public static final ResourceKey ADD_WILDFLOWERS_BIRCH_FOREST = registerKey("add_wildflowers_birch_forest"); + + public static void bootstrap(BootstapContext context) { + + } + + private static ResourceKey registerKey(String name) { + return ResourceKey.create(ForgeRegistries.Keys.BIOME_MODIFIERS, ResourceLocation.fromNamespaceAndPath(WildflowersBackport.MOD_ID, name)); + } +} From c548d93c8e44bda570c121c8d78356382976dd81 Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 18:41:45 +0100 Subject: [PATCH 24/37] Implemented biome modifiers. --- .../worldgen/ModBiomeModifiers.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModBiomeModifiers.java b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModBiomeModifiers.java index 80a4447..79766f0 100644 --- a/src/main/java/dev/micle/wildflowers_backport/worldgen/ModBiomeModifiers.java +++ b/src/main/java/dev/micle/wildflowers_backport/worldgen/ModBiomeModifiers.java @@ -1,10 +1,18 @@ package dev.micle.wildflowers_backport.worldgen; import dev.micle.wildflowers_backport.WildflowersBackport; +import net.minecraft.core.HolderGetter; +import net.minecraft.core.HolderSet; +import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstapContext; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.level.biome.Biomes; +import net.minecraft.world.level.levelgen.GenerationStep; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.minecraftforge.common.world.BiomeModifier; +import net.minecraftforge.common.world.ForgeBiomeModifiers; import net.minecraftforge.registries.ForgeRegistries; public class ModBiomeModifiers { @@ -12,7 +20,20 @@ public class ModBiomeModifiers { public static final ResourceKey ADD_WILDFLOWERS_BIRCH_FOREST = registerKey("add_wildflowers_birch_forest"); public static void bootstrap(BootstapContext context) { + HolderGetter placedFeatures = context.lookup(Registries.PLACED_FEATURE); + HolderGetter biomes = context.lookup(Registries.BIOME); + context.register(ADD_WILDFLOWERS_MEADOW, new ForgeBiomeModifiers.AddFeaturesBiomeModifier( + HolderSet.direct(biomes.getOrThrow(Biomes.MEADOW)), + HolderSet.direct(placedFeatures.getOrThrow(ModPlacedFeatures.WILDFLOWERS_MEADOW)), + GenerationStep.Decoration.VEGETAL_DECORATION + )); + + context.register(ADD_WILDFLOWERS_BIRCH_FOREST, new ForgeBiomeModifiers.AddFeaturesBiomeModifier( + HolderSet.direct(biomes.getOrThrow(Biomes.BIRCH_FOREST), biomes.getOrThrow(Biomes.OLD_GROWTH_BIRCH_FOREST)), + HolderSet.direct(placedFeatures.getOrThrow(ModPlacedFeatures.WILDFLOWERS_BIRCH_FOREST)), + GenerationStep.Decoration.VEGETAL_DECORATION + )); } private static ResourceKey registerKey(String name) { From 428f210b8879a0616f369433ae652facd0d5995c Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 18:42:57 +0100 Subject: [PATCH 25/37] Added biome modifiers to data gen. --- .../biome_modifier/add_wildflowers_birch_forest.json | 9 +++++++++ .../forge/biome_modifier/add_wildflowers_meadow.json | 6 ++++++ .../data/server/ModWorldGenProvider.java | 5 ++++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/data/wildflowers_backport/forge/biome_modifier/add_wildflowers_birch_forest.json create mode 100644 src/generated/resources/data/wildflowers_backport/forge/biome_modifier/add_wildflowers_meadow.json diff --git a/src/generated/resources/data/wildflowers_backport/forge/biome_modifier/add_wildflowers_birch_forest.json b/src/generated/resources/data/wildflowers_backport/forge/biome_modifier/add_wildflowers_birch_forest.json new file mode 100644 index 0000000..6b8a0ad --- /dev/null +++ b/src/generated/resources/data/wildflowers_backport/forge/biome_modifier/add_wildflowers_birch_forest.json @@ -0,0 +1,9 @@ +{ + "type": "forge:add_features", + "biomes": [ + "minecraft:birch_forest", + "minecraft:old_growth_birch_forest" + ], + "features": "wildflowers_backport:wildflowers_birch_forest", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/generated/resources/data/wildflowers_backport/forge/biome_modifier/add_wildflowers_meadow.json b/src/generated/resources/data/wildflowers_backport/forge/biome_modifier/add_wildflowers_meadow.json new file mode 100644 index 0000000..13f5297 --- /dev/null +++ b/src/generated/resources/data/wildflowers_backport/forge/biome_modifier/add_wildflowers_meadow.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "minecraft:meadow", + "features": "wildflowers_backport:wildflowers_meadow", + "step": "vegetal_decoration" +} \ No newline at end of file diff --git a/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java index b0bcefc..0e58362 100644 --- a/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java +++ b/src/main/java/dev/micle/wildflowers_backport/data/server/ModWorldGenProvider.java @@ -1,6 +1,7 @@ package dev.micle.wildflowers_backport.data.server; import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.worldgen.ModBiomeModifiers; import dev.micle.wildflowers_backport.worldgen.ModConfiguredFeatures; import dev.micle.wildflowers_backport.worldgen.ModPlacedFeatures; import net.minecraft.core.HolderLookup; @@ -8,6 +9,7 @@ import net.minecraft.core.RegistrySetBuilder; import net.minecraft.core.registries.Registries; import net.minecraft.data.DataGenerator; import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider; +import net.minecraftforge.registries.ForgeRegistries; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -15,7 +17,8 @@ import java.util.concurrent.CompletableFuture; public class ModWorldGenProvider extends DatapackBuiltinEntriesProvider { public static final RegistrySetBuilder BUILDER = new RegistrySetBuilder() .add(Registries.CONFIGURED_FEATURE, ModConfiguredFeatures::bootstrap) - .add(Registries.PLACED_FEATURE, ModPlacedFeatures::bootstrap); + .add(Registries.PLACED_FEATURE, ModPlacedFeatures::bootstrap) + .add(ForgeRegistries.Keys.BIOME_MODIFIERS, ModBiomeModifiers::bootstrap); public ModWorldGenProvider(DataGenerator generator, CompletableFuture registries) { super(generator.getPackOutput(), registries, BUILDER, Set.of(WildflowersBackport.MOD_ID)); From d47979acc6b941e16f8a3d6150682dc04544b2c6 Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 19:05:31 +0100 Subject: [PATCH 26/37] Implemented recipe for yellow dye from wildflowers. --- .../misc/yellow_dye_from_wildflowers.json | 35 +++++++++++++++++++ .../recipes/yellow_dye_from_wildflowers.json | 13 +++++++ .../data/DataGenerators.java | 2 ++ .../data/server/ModRecipeProvider.java | 30 ++++++++++++++++ 4 files changed, 80 insertions(+) create mode 100644 src/generated/resources/data/wildflowers_backport/advancements/recipes/misc/yellow_dye_from_wildflowers.json create mode 100644 src/generated/resources/data/wildflowers_backport/recipes/yellow_dye_from_wildflowers.json create mode 100644 src/main/java/dev/micle/wildflowers_backport/data/server/ModRecipeProvider.java diff --git a/src/generated/resources/data/wildflowers_backport/advancements/recipes/misc/yellow_dye_from_wildflowers.json b/src/generated/resources/data/wildflowers_backport/advancements/recipes/misc/yellow_dye_from_wildflowers.json new file mode 100644 index 0000000..ae5d059 --- /dev/null +++ b/src/generated/resources/data/wildflowers_backport/advancements/recipes/misc/yellow_dye_from_wildflowers.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "wildflowers_backport:yellow_dye_from_wildflowers" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_wildflowers": { + "conditions": { + "items": [ + { + "items": [ + "wildflowers_backport:wildflowers" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_wildflowers", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "wildflowers_backport:yellow_dye_from_wildflowers" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/wildflowers_backport/recipes/yellow_dye_from_wildflowers.json b/src/generated/resources/data/wildflowers_backport/recipes/yellow_dye_from_wildflowers.json new file mode 100644 index 0000000..cbba3cd --- /dev/null +++ b/src/generated/resources/data/wildflowers_backport/recipes/yellow_dye_from_wildflowers.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "yellow_dye", + "ingredients": [ + { + "item": "wildflowers_backport:wildflowers" + } + ], + "result": { + "item": "minecraft:yellow_dye" + } +} \ No newline at end of file diff --git a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java index 1f6f1c0..7d6690d 100644 --- a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java +++ b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java @@ -4,6 +4,7 @@ import dev.micle.wildflowers_backport.WildflowersBackport; import dev.micle.wildflowers_backport.data.client.ModBlockStateProvider; import dev.micle.wildflowers_backport.data.client.ModItemModelProvider; import dev.micle.wildflowers_backport.data.server.ModLootTableProvider; +import dev.micle.wildflowers_backport.data.server.ModRecipeProvider; import dev.micle.wildflowers_backport.data.server.ModWorldGenProvider; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; @@ -25,6 +26,7 @@ public class DataGenerators { generator.addProvider(event.includeClient(), new ModBlockStateProvider(generator, existingFileHelper)); generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper)); + generator.addProvider(event.includeServer(), new ModRecipeProvider(generator)); generator.addProvider(event.includeServer(), new ModLootTableProvider(generator)); generator.addProvider(event.includeServer(), new ModWorldGenProvider(generator, lookupProvider)); } diff --git a/src/main/java/dev/micle/wildflowers_backport/data/server/ModRecipeProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/server/ModRecipeProvider.java new file mode 100644 index 0000000..47305c0 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/data/server/ModRecipeProvider.java @@ -0,0 +1,30 @@ +package dev.micle.wildflowers_backport.data.server; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.item.ModItems; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.Items; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.function.Consumer; + +public class ModRecipeProvider extends RecipeProvider { + public ModRecipeProvider(DataGenerator generator) { + super(generator.getPackOutput()); + } + + @Override + @ParametersAreNonnullByDefault + protected void buildRecipes(Consumer consumer) { + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, Items.YELLOW_DYE, 1) + .requires(ModItems.WILDFLOWERS.get()) + .unlockedBy("has_wildflowers", has(ModItems.WILDFLOWERS.get())) + .group("yellow_dye") + .save(consumer, ResourceLocation.fromNamespaceAndPath(WildflowersBackport.MOD_ID, "yellow_dye_from_wildflowers")); + } +} From 6e5aabbaf6e527ffcdc99efb433c041370e67981 Mon Sep 17 00:00:00 2001 From: Micle Date: Wed, 10 Jun 2026 19:57:00 +0100 Subject: [PATCH 27/37] Implemented tag providers for data gen. Added block and item to various tags. --- .../data/minecraft/tags/blocks/flowers.json | 5 ++++ .../tags/blocks/inside_step_sound_blocks.json | 5 ++++ .../data/minecraft/tags/items/flowers.json | 5 ++++ .../data/DataGenerators.java | 9 ++++-- .../data/server/ModBlockTagsProvider.java | 28 +++++++++++++++++++ .../data/server/ModItemTagsProvider.java | 26 +++++++++++++++++ 6 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/flowers.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json create mode 100644 src/generated/resources/data/minecraft/tags/items/flowers.json create mode 100644 src/main/java/dev/micle/wildflowers_backport/data/server/ModBlockTagsProvider.java create mode 100644 src/main/java/dev/micle/wildflowers_backport/data/server/ModItemTagsProvider.java diff --git a/src/generated/resources/data/minecraft/tags/blocks/flowers.json b/src/generated/resources/data/minecraft/tags/blocks/flowers.json new file mode 100644 index 0000000..bcb613e --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/flowers.json @@ -0,0 +1,5 @@ +{ + "values": [ + "wildflowers_backport:wildflowers" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json new file mode 100644 index 0000000..bcb613e --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/inside_step_sound_blocks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "wildflowers_backport:wildflowers" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/flowers.json b/src/generated/resources/data/minecraft/tags/items/flowers.json new file mode 100644 index 0000000..bcb613e --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/flowers.json @@ -0,0 +1,5 @@ +{ + "values": [ + "wildflowers_backport:wildflowers" + ] +} \ No newline at end of file diff --git a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java index 7d6690d..64fc784 100644 --- a/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java +++ b/src/main/java/dev/micle/wildflowers_backport/data/DataGenerators.java @@ -3,11 +3,10 @@ package dev.micle.wildflowers_backport.data; import dev.micle.wildflowers_backport.WildflowersBackport; import dev.micle.wildflowers_backport.data.client.ModBlockStateProvider; import dev.micle.wildflowers_backport.data.client.ModItemModelProvider; -import dev.micle.wildflowers_backport.data.server.ModLootTableProvider; -import dev.micle.wildflowers_backport.data.server.ModRecipeProvider; -import dev.micle.wildflowers_backport.data.server.ModWorldGenProvider; +import dev.micle.wildflowers_backport.data.server.*; import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; +import net.minecraftforge.common.data.BlockTagsProvider; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -26,6 +25,10 @@ public class DataGenerators { generator.addProvider(event.includeClient(), new ModBlockStateProvider(generator, existingFileHelper)); generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper)); + BlockTagsProvider blockTagsProvider = new ModBlockTagsProvider(generator, lookupProvider, existingFileHelper); + generator.addProvider(event.includeServer(), blockTagsProvider); + generator.addProvider(event.includeServer(), new ModItemTagsProvider(generator, lookupProvider, blockTagsProvider.contentsGetter(), existingFileHelper)); + generator.addProvider(event.includeServer(), new ModRecipeProvider(generator)); generator.addProvider(event.includeServer(), new ModLootTableProvider(generator)); generator.addProvider(event.includeServer(), new ModWorldGenProvider(generator, lookupProvider)); diff --git a/src/main/java/dev/micle/wildflowers_backport/data/server/ModBlockTagsProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/server/ModBlockTagsProvider.java new file mode 100644 index 0000000..95bcac8 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/data/server/ModBlockTagsProvider.java @@ -0,0 +1,28 @@ +package dev.micle.wildflowers_backport.data.server; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.block.ModBlocks; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraft.tags.BlockTags; +import net.minecraftforge.common.data.BlockTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.concurrent.CompletableFuture; + +public class ModBlockTagsProvider extends BlockTagsProvider { + public ModBlockTagsProvider(DataGenerator generator, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) { + super(generator.getPackOutput(), lookupProvider, WildflowersBackport.MOD_ID, existingFileHelper); + } + + @Override + @ParametersAreNonnullByDefault + protected void addTags(HolderLookup.Provider lookupProvider) { + this.tag(BlockTags.FLOWERS) + .add(ModBlocks.WILDFLOWERS.get()); + + this.tag(BlockTags.INSIDE_STEP_SOUND_BLOCKS) + .add(ModBlocks.WILDFLOWERS.get()); + } +} diff --git a/src/main/java/dev/micle/wildflowers_backport/data/server/ModItemTagsProvider.java b/src/main/java/dev/micle/wildflowers_backport/data/server/ModItemTagsProvider.java new file mode 100644 index 0000000..1459507 --- /dev/null +++ b/src/main/java/dev/micle/wildflowers_backport/data/server/ModItemTagsProvider.java @@ -0,0 +1,26 @@ +package dev.micle.wildflowers_backport.data.server; + +import dev.micle.wildflowers_backport.WildflowersBackport; +import dev.micle.wildflowers_backport.item.ModItems; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.data.ExistingFileHelper; + +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.concurrent.CompletableFuture; + +public class ModItemTagsProvider extends ItemTagsProvider { + public ModItemTagsProvider(DataGenerator generator, CompletableFuture lookupProvider, CompletableFuture> blockTagLookup, ExistingFileHelper existingFileHelper) { + super(generator.getPackOutput(), lookupProvider, blockTagLookup, WildflowersBackport.MOD_ID, existingFileHelper); + } + + @Override + @ParametersAreNonnullByDefault + protected void addTags(HolderLookup.Provider pProvider) { + this.tag(ItemTags.FLOWERS) + .add(ModItems.WILDFLOWERS.get()); + } +} From 6a60589102ac5a457addeb8746600dcb6fb70f2b Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 13:05:43 +0100 Subject: [PATCH 28/37] World model exported with Mineways. --- assets/images/blender/world-Alpha.png | 3 +++ assets/images/blender/world-RGB.png | 3 +++ assets/images/blender/world-RGBA.png | 3 +++ assets/images/blender/world.mtl | 3 +++ assets/images/blender/world.obj | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 assets/images/blender/world-Alpha.png create mode 100644 assets/images/blender/world-RGB.png create mode 100644 assets/images/blender/world-RGBA.png create mode 100644 assets/images/blender/world.mtl create mode 100644 assets/images/blender/world.obj diff --git a/assets/images/blender/world-Alpha.png b/assets/images/blender/world-Alpha.png new file mode 100644 index 0000000..ed9b989 --- /dev/null +++ b/assets/images/blender/world-Alpha.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc45022a9d7cb1fadcd45baf3d9798b3507832c03a6ddb1f2a55732f3beb7181 +size 16136 diff --git a/assets/images/blender/world-RGB.png b/assets/images/blender/world-RGB.png new file mode 100644 index 0000000..068e952 --- /dev/null +++ b/assets/images/blender/world-RGB.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffc8e10b1f1bbf0c8c877e0118b09db2442af939fc045c6d0c539727df1e0c3d +size 469318 diff --git a/assets/images/blender/world-RGBA.png b/assets/images/blender/world-RGBA.png new file mode 100644 index 0000000..78e3c00 --- /dev/null +++ b/assets/images/blender/world-RGBA.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5889e225c3a2386152d8e507835587433ac7fa498de7c0b6c12cc0c56dec861e +size 521444 diff --git a/assets/images/blender/world.mtl b/assets/images/blender/world.mtl new file mode 100644 index 0000000..f536dcd --- /dev/null +++ b/assets/images/blender/world.mtl @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f89b22a7e99e8e35b5ce9a79e88ae4fc5efc65c1c0d701a11412bf65e437831 +size 5263 diff --git a/assets/images/blender/world.obj b/assets/images/blender/world.obj new file mode 100644 index 0000000..a278473 --- /dev/null +++ b/assets/images/blender/world.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cbf838efd5935edea5ccc47cecd8d801b635417966d591ee36b440fca78b4cf +size 2557835 From 50b398a3711c165a0e35de37be2b642971e60659 Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 13:08:00 +0100 Subject: [PATCH 29/37] Added asset readme. --- assets/images/README.md | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 assets/images/README.md diff --git a/assets/images/README.md b/assets/images/README.md new file mode 100644 index 0000000..50787fd --- /dev/null +++ b/assets/images/README.md @@ -0,0 +1,59 @@ +# Composition guidelines +The following are guidelines for rendering image assets. + +## General +### Color Management +- Filmic - Medium High Contrast + +### World +- Global Illumination - 1.0 + +### Sun +- Strength - 5.0 + +### Volume +- Fournier-Forand +- IOR 1.0 +- Density 0.01 + +## Icon +400 x 400 RGBA PNG + +### Item +- Item should have a damped track to Camera and vice versa. +- No DOF. + +### Block +- Camera position should be X=0.5, Y=1.0, Z=0.5. +- Camera angle should be X=90, Y=0, Z=150. +- Camera should have a damped track to block. +- Camera should have a rotation limit on the y axis. +- Camera no DOF. +- Camera orthographic @ scale 2.0. + +## Banner +1200 x 400 RGB PNG + +- Camera perspective @ focal length 50mm (1x). +- Camera DOF @ focus distance 5m (1x). +- Gap between icon and text should be 1 grid. +- Text is Minecraft font, size 72. +- Text has 4px stroke. +- Icon has default drop shadow. + +## Logo +400 x 400 RGB PNG + +- Camera perspective @ focal length 150mm (3x). +- Camera DOF @ focus distance 15m (3x). + +## Card +200 x 300 RGB PNG + +- Camera perspective @ focal length 150mm (3x). +- Camera DOF @ focus distance 15m (3x). +- Icon should be scaled down to half. +- Gap between icon and text should be 1 grid. +- Text is Minecraft font, size 26. +- Text has 2px stroke. +- Icon has default drop shadow. From 5c50708c6125a39a7f4eb1f8771fb02646814c2b Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 13:08:24 +0100 Subject: [PATCH 30/37] Added vignette renders. --- assets/images/renders/banner-vignette.png | 3 +++ assets/images/renders/card-vignette.png | 3 +++ assets/images/renders/logo-vignette.png | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 assets/images/renders/banner-vignette.png create mode 100644 assets/images/renders/card-vignette.png create mode 100644 assets/images/renders/logo-vignette.png diff --git a/assets/images/renders/banner-vignette.png b/assets/images/renders/banner-vignette.png new file mode 100644 index 0000000..8f299d6 --- /dev/null +++ b/assets/images/renders/banner-vignette.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e38485faaa515d5c0de9e06d2e659014769bbe3d5153da1a6d91648fe9ad42d +size 309368 diff --git a/assets/images/renders/card-vignette.png b/assets/images/renders/card-vignette.png new file mode 100644 index 0000000..4f337e1 --- /dev/null +++ b/assets/images/renders/card-vignette.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:430d3b44abfe6a63c56750805ec8d69f1607bc996c610e0e0ed6e2696e54ab58 +size 47073 diff --git a/assets/images/renders/logo-vignette.png b/assets/images/renders/logo-vignette.png new file mode 100644 index 0000000..6b047ff --- /dev/null +++ b/assets/images/renders/logo-vignette.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e6db277b054c9c6721138955d714436ec6397186d252752992d2e0910cdf3b3 +size 114464 From 5cdbccd02b6b021e2a7acbfa2f26d5522f3651e4 Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 13:12:58 +0100 Subject: [PATCH 31/37] Added blender project file. --- assets/images/blender/wildflowers_backport.blend | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 assets/images/blender/wildflowers_backport.blend diff --git a/assets/images/blender/wildflowers_backport.blend b/assets/images/blender/wildflowers_backport.blend new file mode 100644 index 0000000..4cfbf66 --- /dev/null +++ b/assets/images/blender/wildflowers_backport.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aabc0b6049f2cce81e4de6cc2e2f0813f7953559c68e55e25a0337055cb21083 +size 1555744 From edb8d1d107cc1cce550817a84ed1954179ba8a8d Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 13:13:07 +0100 Subject: [PATCH 32/37] Rendered images. --- assets/images/renders/banner.png | 3 +++ assets/images/renders/card.png | 3 +++ assets/images/renders/icon.png | 3 +++ assets/images/renders/logo.png | 3 +++ 4 files changed, 12 insertions(+) create mode 100644 assets/images/renders/banner.png create mode 100644 assets/images/renders/card.png create mode 100644 assets/images/renders/icon.png create mode 100644 assets/images/renders/logo.png diff --git a/assets/images/renders/banner.png b/assets/images/renders/banner.png new file mode 100644 index 0000000..b7d2a05 --- /dev/null +++ b/assets/images/renders/banner.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df53eab6421ebfe5b9b74927ce55bf483ffd7ff4820419e5bb871b065b1d7a3b +size 757615 diff --git a/assets/images/renders/card.png b/assets/images/renders/card.png new file mode 100644 index 0000000..23af0e5 --- /dev/null +++ b/assets/images/renders/card.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:872141e8e90ce257a0290899de964d7098654489321068c9649f9052319ebe5c +size 108110 diff --git a/assets/images/renders/icon.png b/assets/images/renders/icon.png new file mode 100644 index 0000000..b95803e --- /dev/null +++ b/assets/images/renders/icon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a674e262237a4f89be29781094c59112c2d14ef5112f9fbfa8d0d88751a3f253 +size 61448 diff --git a/assets/images/renders/logo.png b/assets/images/renders/logo.png new file mode 100644 index 0000000..260c123 --- /dev/null +++ b/assets/images/renders/logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b9b0996eaf2bd4d0cb6c8b300775fad81089a7ff529847a4e927a7e2195254f +size 274603 From ef351735731ac4b2fa41743026ad9924cc88d6b9 Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 13:53:36 +0100 Subject: [PATCH 33/37] Created all web assets. --- assets/images/web/banner.jpg | 3 +++ assets/images/web/banner.kra | 3 +++ assets/images/web/card.jpg | 3 +++ assets/images/web/card.kra | 3 +++ assets/images/web/logo.jpg | 3 +++ assets/images/web/logo.kra | 3 +++ assets/images/web/logo.png | 3 +++ 7 files changed, 21 insertions(+) create mode 100644 assets/images/web/banner.jpg create mode 100644 assets/images/web/banner.kra create mode 100644 assets/images/web/card.jpg create mode 100644 assets/images/web/card.kra create mode 100644 assets/images/web/logo.jpg create mode 100644 assets/images/web/logo.kra create mode 100644 assets/images/web/logo.png diff --git a/assets/images/web/banner.jpg b/assets/images/web/banner.jpg new file mode 100644 index 0000000..3603d93 --- /dev/null +++ b/assets/images/web/banner.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:540ac1da5130907cebbc57915c2bf94dbc0c6da9df40b0b1d59d386a3338fa80 +size 97780 diff --git a/assets/images/web/banner.kra b/assets/images/web/banner.kra new file mode 100644 index 0000000..e951ea0 --- /dev/null +++ b/assets/images/web/banner.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fb551b88db40b464631efabbf18a1066237c0b08c876a8011465157ef747eeb +size 2915449 diff --git a/assets/images/web/card.jpg b/assets/images/web/card.jpg new file mode 100644 index 0000000..859b9bc --- /dev/null +++ b/assets/images/web/card.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff569add0cf49f7864facfc4fd9c990458ff740d3e95ebbfef27388eced14426 +size 28198 diff --git a/assets/images/web/card.kra b/assets/images/web/card.kra new file mode 100644 index 0000000..a94feb4 --- /dev/null +++ b/assets/images/web/card.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1235b67920c6a107ba08f7a234a8d240390cdde6cbf170abed23dc76ccc51071 +size 523254 diff --git a/assets/images/web/logo.jpg b/assets/images/web/logo.jpg new file mode 100644 index 0000000..a03410b --- /dev/null +++ b/assets/images/web/logo.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8423ffa41261a322ed6ecce05442aab9af7772dc8401547ca43a7c4c320d2c84 +size 46389 diff --git a/assets/images/web/logo.kra b/assets/images/web/logo.kra new file mode 100644 index 0000000..3a41650 --- /dev/null +++ b/assets/images/web/logo.kra @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac8d4f18bea1b7ffe3dc4272cb25cd71233c0d5eba3229a9433a6acaf94a5032 +size 1197798 diff --git a/assets/images/web/logo.png b/assets/images/web/logo.png new file mode 100644 index 0000000..db64e89 --- /dev/null +++ b/assets/images/web/logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3038f30dfafb73ba4c9d838227f7d7331770c916427962056a3f2d756e66c22d +size 230630 From ff4175ba2302b6dfe75db94ccb310a55598e5963 Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 13:55:48 +0100 Subject: [PATCH 34/37] Added logo to mod. --- src/main/resources/logo.jpg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/main/resources/logo.jpg diff --git a/src/main/resources/logo.jpg b/src/main/resources/logo.jpg new file mode 100644 index 0000000..a03410b --- /dev/null +++ b/src/main/resources/logo.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8423ffa41261a322ed6ecce05442aab9af7772dc8401547ca43a7c4c320d2c84 +size 46389 From 9bec9a2b8e6ee7ffc0cd062135f8d5a5212f86aa Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 13:59:19 +0100 Subject: [PATCH 35/37] Included extra file types. --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index e636e58..5e6d3e6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,6 +22,8 @@ *.skp filter=lfs diff=lfs merge=lfs -text *.stl filter=lfs diff=lfs merge=lfs -text *.ztl filter=lfs diff=lfs merge=lfs -text +*.mtl filter=lfs diff=lfs merge=lfs -text +*.bbmodel filter=lfs diff=lfs merge=lfs -text # Audio *.aif filter=lfs diff=lfs merge=lfs -text *.aiff filter=lfs diff=lfs merge=lfs -text @@ -50,5 +52,3 @@ *.tif filter=lfs diff=lfs merge=lfs -text *.tiff filter=lfs diff=lfs merge=lfs -text *.kra filter=lfs diff=lfs merge=lfs -text -*.mtl filter=lfs diff=lfs merge=lfs -text -*.bbmodel filter=lfs diff=lfs merge=lfs -text From f0885d0302cdc54b2851b1715a0cf90712f2caba Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 14:07:43 +0100 Subject: [PATCH 36/37] Removed unnecessary codec logic. --- .../block/FlowerBedBlock.java | 3 --- .../mixin/BlockBehaviourAccessor.java | 11 ---------- .../util/BlockBehaviourUtils.java | 22 ------------------- .../wildflowers_backport.mixins.json | 1 - 4 files changed, 37 deletions(-) delete mode 100644 src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java delete mode 100644 src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java diff --git a/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java b/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java index 7a1b62d..ad21c37 100644 --- a/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java +++ b/src/main/java/dev/micle/wildflowers_backport/block/FlowerBedBlock.java @@ -1,8 +1,6 @@ package dev.micle.wildflowers_backport.block; import com.google.common.collect.ImmutableMap; -import com.mojang.serialization.MapCodec; -import dev.micle.wildflowers_backport.util.BlockBehaviourUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.server.level.ServerLevel; @@ -27,7 +25,6 @@ import javax.annotation.ParametersAreNonnullByDefault; import java.util.function.Function; public class FlowerBedBlock extends BushBlock implements BonemealableBlock, SegmentableBlock { - public static final MapCodec CODEC = BlockBehaviourUtils.simpleCodec(FlowerBedBlock::new); public static final EnumProperty FACING = BlockStateProperties.HORIZONTAL_FACING; public static final IntegerProperty AMOUNT = BlockStateProperties.FLOWER_AMOUNT; private final Function shapes; diff --git a/src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java b/src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java deleted file mode 100644 index ca69491..0000000 --- a/src/main/java/dev/micle/wildflowers_backport/mixin/BlockBehaviourAccessor.java +++ /dev/null @@ -1,11 +0,0 @@ -package dev.micle.wildflowers_backport.mixin; - -import net.minecraft.world.level.block.state.BlockBehaviour; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; - -@Mixin(BlockBehaviour.class) -public interface BlockBehaviourAccessor { - @Accessor("properties") - BlockBehaviour.Properties wildflowers_backport$getProperties(); -} diff --git a/src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java b/src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java deleted file mode 100644 index 242d660..0000000 --- a/src/main/java/dev/micle/wildflowers_backport/util/BlockBehaviourUtils.java +++ /dev/null @@ -1,22 +0,0 @@ -package dev.micle.wildflowers_backport.util; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import dev.micle.wildflowers_backport.mixin.BlockBehaviourAccessor; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockBehaviour; - -import java.util.function.Function; - -public class BlockBehaviourUtils { - public static final Codec PROPERTIES_CODEC = Codec.unit(BlockBehaviour.Properties::of); - - public static RecordCodecBuilder propertiesCodec() { - return PROPERTIES_CODEC.fieldOf("properties").forGetter(x -> ((BlockBehaviourAccessor) x).wildflowers_backport$getProperties()); - } - - public static MapCodec simpleCodec(Function blockPropertiesFunc) { - return RecordCodecBuilder.mapCodec(x -> x.group(propertiesCodec()).apply(x, blockPropertiesFunc)); - } -} diff --git a/src/main/resources/wildflowers_backport.mixins.json b/src/main/resources/wildflowers_backport.mixins.json index c9cbf28..9fb047d 100644 --- a/src/main/resources/wildflowers_backport.mixins.json +++ b/src/main/resources/wildflowers_backport.mixins.json @@ -5,7 +5,6 @@ "compatibilityLevel": "JAVA_8", "refmap": "firefly_bush_backport.refmap.json", "mixins": [ - "BlockBehaviourAccessor", "OctahedralGroupAccessor", "VoxelShapeAccessor", "ArrayVoxelShapeAccessor", From df5d38e637e8e57792c60bbb9de706fc6655d2dc Mon Sep 17 00:00:00 2001 From: Micle Date: Sat, 13 Jun 2026 14:53:13 +0100 Subject: [PATCH 37/37] Removed mixin refmap as it is no longer needed. --- build.gradle | 4 +--- gradle.properties | 2 +- src/main/resources/wildflowers_backport.mixins.json | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 9ce4280..7ff96b2 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ java { } minecraft { - mappings channel: mapping_channel, version: "$mapping_version-$minecraft_version" + mappings channel: mapping_channel, version: "$mapping_version" copyIdeResources = true // generateRunFolders = true @@ -72,8 +72,6 @@ minecraft { } mixin { - add sourceSets.main, "${mod_id}.refmap.json" - config "${mod_id}.mixins.json" } diff --git a/gradle.properties b/gradle.properties index 8a6fd51..1d5b329 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,4 +17,4 @@ forge_version_range=[47,) loader_version_range=[47,) mapping_channel=parchment -mapping_version=2023.09.03 +mapping_version=2023.09.03-1.20.1 diff --git a/src/main/resources/wildflowers_backport.mixins.json b/src/main/resources/wildflowers_backport.mixins.json index 9fb047d..7c902b6 100644 --- a/src/main/resources/wildflowers_backport.mixins.json +++ b/src/main/resources/wildflowers_backport.mixins.json @@ -3,7 +3,6 @@ "minVersion": "0.8", "package": "dev.micle.wildflowers_backport.mixin", "compatibilityLevel": "JAVA_8", - "refmap": "firefly_bush_backport.refmap.json", "mixins": [ "OctahedralGroupAccessor", "VoxelShapeAccessor",