Private
Public Access
1
0

Merge pull request 'Release 1.20.1/v1.1.1' (#48) from 1.20.1/dev into 1.20.1/main

Reviewed-on: #48
This commit is contained in:
2026-06-13 22:38:13 +00:00
3 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,5 @@
{
"values": [
"firefly_bush_backport:firefly_bush"
]
}

View File

@ -4,6 +4,7 @@ import dev.micle.firefly_bush_backport.FireflyBushBackport;
import dev.micle.firefly_bush_backport.data.client.ModBlockStateProvider; 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.ModItemModelProvider;
import dev.micle.firefly_bush_backport.data.client.ModSoundDefinitionsProvider; import dev.micle.firefly_bush_backport.data.client.ModSoundDefinitionsProvider;
import dev.micle.firefly_bush_backport.data.server.ModBlockTagsProvider;
import dev.micle.firefly_bush_backport.data.server.ModLootTableProvider; import dev.micle.firefly_bush_backport.data.server.ModLootTableProvider;
import dev.micle.firefly_bush_backport.data.server.ModWorldGenProvider; import dev.micle.firefly_bush_backport.data.server.ModWorldGenProvider;
import net.minecraft.core.HolderLookup; import net.minecraft.core.HolderLookup;
@ -27,6 +28,7 @@ public class DataGenerators {
generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper)); generator.addProvider(event.includeClient(), new ModItemModelProvider(generator, existingFileHelper));
generator.addProvider(event.includeClient(), new ModSoundDefinitionsProvider(generator, existingFileHelper)); generator.addProvider(event.includeClient(), new ModSoundDefinitionsProvider(generator, existingFileHelper));
generator.addProvider(event.includeServer(), new ModBlockTagsProvider(generator, lookupProvider, existingFileHelper));
generator.addProvider(event.includeServer(), new ModLootTableProvider(generator)); generator.addProvider(event.includeServer(), new ModLootTableProvider(generator));
generator.addProvider(event.includeServer(), new ModWorldGenProvider(generator, lookupProvider)); generator.addProvider(event.includeServer(), new ModWorldGenProvider(generator, lookupProvider));
} }

View File

@ -0,0 +1,25 @@
package dev.micle.firefly_bush_backport.data.server;
import dev.micle.firefly_bush_backport.FireflyBushBackport;
import dev.micle.firefly_bush_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<HolderLookup.Provider> lookupProvider, ExistingFileHelper existingFileHelper) {
super(generator.getPackOutput(), lookupProvider, FireflyBushBackport.MOD_ID, existingFileHelper);
}
@Override
@ParametersAreNonnullByDefault
protected void addTags(HolderLookup.Provider pProvider) {
this.tag(BlockTags.REPLACEABLE_BY_TREES)
.add(ModBlocks.FIREFLY_BUSH.get());
}
}