minecraft-mods/firefly_bush_backport
Private
Public Access
1
0
Fork 0
Code Issues 1 Projects Releases 3 Wiki Activity

Partial port of data gen. Blocks and Items.

Browse Source
This commit is contained in:
Micle
2026-05-01 18:06:12 +01:00
parent 83a6acc443
commit f85204ef4b
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/dev/micle/firefly_bush_backport/data/DataGenerators.java
View File

@ -1,6 +1,5 @@
package dev.micle.firefly_bush_backport.data;
import dev.micle.firefly_bush_backport.FireflyBushBackport;
import dev.micle.firefly_bush_backport.data.client.ModBlockStateProvider;
import dev.micle.firefly_bush_backport.data.client.ModItemModelProvider;
import dev.micle.firefly_bush_backport.data.client.ModSoundDefinitionsProvider;
@ -8,14 +7,14 @@ import dev.micle.firefly_bush_backport.data.server.ModLootTableProvider;
import dev.micle.firefly_bush_backport.data.server.ModWorldGenProvider;
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 net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.common.EventBusSubscriber;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
import net.neoforged.neoforge.data.event.GatherDataEvent;
import java.util.concurrent.CompletableFuture;
@Mod.EventBusSubscriber(modid = FireflyBushBackport.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
@EventBusSubscriber
public class DataGenerators {
@SubscribeEvent
public static void gatherData(GatherDataEvent event) {

8
src/main/java/dev/micle/firefly_bush_backport/data/client/ModBlockStateProvider.java
View File

@ -5,9 +5,9 @@ import dev.micle.firefly_bush_backport.block.ModBlocks;
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.common.data.ExistingFileHelper;
import net.minecraftforge.registries.RegistryObject;
import net.neoforged.neoforge.client.model.generators.BlockStateProvider;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
import net.neoforged.neoforge.registries.DeferredHolder;
import java.util.Objects;
@ -21,7 +21,7 @@ public class ModBlockStateProvider extends BlockStateProvider {
crossEmissiveBlock(ModBlocks.FIREFLY_BUSH);
}
private void crossEmissiveBlock(RegistryObject<Block> block) {
private void crossEmissiveBlock(DeferredHolder<Block, ? extends Block> block) {
String name = Objects.requireNonNull(block.getId()).getPath();
simpleBlock(block.get(), models()
.withExistingParent(name, ResourceLocation.fromNamespaceAndPath(FireflyBushBackport.MOD_ID, "block/cross_emissive"))

15
src/main/java/dev/micle/firefly_bush_backport/data/client/ModItemModelProvider.java
View File

@ -5,12 +5,11 @@ import dev.micle.firefly_bush_backport.block.ModBlocks;
import net.minecraft.data.DataGenerator;
import net.minecraft.world.item.Items;
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 net.neoforged.neoforge.client.model.generators.ItemModelBuilder;
import net.neoforged.neoforge.client.model.generators.ItemModelProvider;
import net.neoforged.neoforge.client.model.generators.ModelFile;
import net.neoforged.neoforge.common.data.ExistingFileHelper;
import net.neoforged.neoforge.registries.DeferredHolder;
import java.util.Objects;
@ -21,11 +20,11 @@ public class ModItemModelProvider extends ItemModelProvider {
@Override
protected void registerModels() {
ModBlocks.BLOCKS.getEntries().stream().map(RegistryObject::get).forEach(this::blockItemModel);
ModBlocks.BLOCKS.getEntries().stream().map(DeferredHolder::get).forEach(this::blockItemModel);
}
private void blockItemModel(Block block) {
String name = Objects.requireNonNull(ForgeRegistries.BLOCKS.getKey(block)).getPath();
String name = Objects.requireNonNull(ModBlocks.BLOCKS.getRegistryName()).getPath();
if (block == ModBlocks.FIREFLY_BUSH.get()) {
builder(getExistingFile(mcLoc("item/generated")), name);