Skip to content

Commit 62ec70f

Browse files
axtroughaxtrough
committed
Datagen tags start + Datagen recipes
1 parent 2d3d589 commit 62ec70f

11 files changed

Lines changed: 119 additions & 21 deletions

File tree

‎src/main/java/com/wdiscute/starcatcher_delight/StarcatcherDelight.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.wdiscute.starcatcher_delight;
22

3-
import com.wdiscute.starcatcher_delight.registry.ModCreativeTab;
4-
import com.wdiscute.starcatcher_delight.registry.ModItems;
3+
import com.wdiscute.starcatcher_delight.registry.SDCreativeTab;
4+
import com.wdiscute.starcatcher_delight.registry.SDItems;
55
import org.slf4j.Logger;
66

77
import com.mojang.logging.LogUtils;
@@ -23,8 +23,8 @@ public class StarcatcherDelight {
2323
public StarcatcherDelight(IEventBus modEventBus, ModContainer modContainer) {
2424
modEventBus.addListener(this::commonSetup);
2525

26-
ModItems.register(modEventBus);
27-
ModCreativeTab.register(modEventBus);
26+
SDItems.register(modEventBus);
27+
SDCreativeTab.register(modEventBus);
2828

2929
NeoForge.EVENT_BUS.register(this);
3030
}

‎src/main/java/com/wdiscute/starcatcher_delight/datagen/DataGenerator.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.minecraft.data.PackOutput;
66
import net.neoforged.bus.api.SubscribeEvent;
77
import net.neoforged.fml.common.EventBusSubscriber;
8+
import net.neoforged.neoforge.common.data.BlockTagsProvider;
89
import net.neoforged.neoforge.common.data.ExistingFileHelper;
910
import net.neoforged.neoforge.data.event.GatherDataEvent;
1011

@@ -20,7 +21,12 @@ public static void gatherData(GatherDataEvent event) {
2021
ExistingFileHelper helper = event.getExistingFileHelper();
2122
CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
2223

23-
gen.addProvider(event.includeServer(), new ModItemModelProvider(output, helper));
24-
gen.addProvider(event.includeServer(), new ModRecipeProvider(output, lookupProvider));
24+
gen.addProvider(event.includeServer(), new SDItemModelProvider(output, helper));
25+
gen.addProvider(event.includeServer(), new SDRecipeProvider(output, lookupProvider));
26+
27+
BlockTagsProvider blockTagsProvider = new SDBlockTagsProvider(output, lookupProvider, helper);
28+
gen.addProvider(event.includeServer(), blockTagsProvider);
29+
30+
gen.addProvider(event.includeServer(), new SDItemTagsProvider(output, lookupProvider, blockTagsProvider.contentsGetter(), helper));
2531
}
2632
}

‎src/main/java/com/wdiscute/starcatcher_delight/datagen/SDBlockTagsProvider.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.wdiscute.starcatcher_delight.datagen;
2+
3+
import com.wdiscute.starcatcher_delight.StarcatcherDelight;
4+
import com.wdiscute.starcatcher_delight.registry.SDTags;
5+
import net.minecraft.core.HolderLookup;
6+
import net.minecraft.data.PackOutput;
7+
import net.neoforged.neoforge.common.data.BlockTagsProvider;
8+
import net.neoforged.neoforge.common.data.ExistingFileHelper;
9+
import org.jetbrains.annotations.Nullable;
10+
11+
import java.util.concurrent.CompletableFuture;
12+
13+
public class SDBlockTagsProvider extends BlockTagsProvider {
14+
public SDBlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
15+
super(output, lookupProvider, StarcatcherDelight.MOD_ID, existingFileHelper);
16+
}
17+
18+
@Override
19+
protected void addTags(HolderLookup.Provider provider) {
20+
tag(SDTags.Blocks.PLACEABLE_FISH_DISHES);
21+
}
22+
}

src/main/java/com/wdiscute/starcatcher_delight/datagen/ModItemModelProvider.java renamed to src/main/java/com/wdiscute/starcatcher_delight/datagen/SDItemModelProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package com.wdiscute.starcatcher_delight.datagen;
22

33
import com.wdiscute.starcatcher_delight.StarcatcherDelight;
4-
import com.wdiscute.starcatcher_delight.registry.ModItems;
4+
import com.wdiscute.starcatcher_delight.registry.SDItems;
55
import net.minecraft.data.PackOutput;
66
import net.neoforged.neoforge.client.model.generators.ItemModelProvider;
77
import net.neoforged.neoforge.common.data.ExistingFileHelper;
88

9-
public class ModItemModelProvider extends ItemModelProvider {
10-
public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
9+
public class SDItemModelProvider extends ItemModelProvider {
10+
public SDItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
1111
super(output, StarcatcherDelight.MOD_ID, existingFileHelper);
1212
}
1313

1414
@Override
1515
protected void registerModels() {
16-
basicItem(ModItems.CACTIFISH_STEW.get());
16+
basicItem(SDItems.CACTIFISH_STEW.get());
1717
}
1818
}

‎src/main/java/com/wdiscute/starcatcher_delight/datagen/SDItemTagsProvider.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.wdiscute.starcatcher_delight.datagen;
2+
3+
import com.wdiscute.starcatcher_delight.StarcatcherDelight;
4+
import com.wdiscute.starcatcher_delight.registry.SDTags;
5+
import net.minecraft.core.HolderLookup;
6+
import net.minecraft.data.PackOutput;
7+
import net.minecraft.data.tags.ItemTagsProvider;
8+
import net.minecraft.data.tags.TagsProvider;
9+
import net.minecraft.world.level.block.Block;
10+
import net.neoforged.neoforge.common.data.ExistingFileHelper;
11+
import org.jetbrains.annotations.Nullable;
12+
13+
import java.util.concurrent.CompletableFuture;
14+
15+
public class SDItemTagsProvider extends ItemTagsProvider {
16+
public SDItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider,
17+
CompletableFuture<TagsProvider.TagLookup<Block>> blockTags, @Nullable ExistingFileHelper existingFileHelper) {
18+
super(output, lookupProvider, blockTags, StarcatcherDelight.MOD_ID, existingFileHelper);
19+
}
20+
21+
@Override
22+
protected void addTags(HolderLookup.Provider provider) {
23+
tag(SDTags.Items.FILET_FISHES);
24+
25+
tag(SDTags.Items.POWDER_FISHES);
26+
}
27+
}

src/main/java/com/wdiscute/starcatcher_delight/datagen/ModRecipeProvider.java renamed to src/main/java/com/wdiscute/starcatcher_delight/datagen/SDRecipeProvider.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.wdiscute.starcatcher_delight.datagen;
22

3-
import com.wdiscute.starcatcher_delight.registry.ModItems;
3+
import com.wdiscute.starcatcher_delight.registry.SDItems;
44
import net.minecraft.core.HolderLookup;
55
import net.minecraft.data.PackOutput;
66
import net.minecraft.data.recipes.RecipeOutput;
@@ -12,8 +12,8 @@
1212

1313
import java.util.concurrent.CompletableFuture;
1414

15-
public class ModRecipeProvider extends RecipeProvider implements IConditionBuilder {
16-
public ModRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
15+
public class SDRecipeProvider extends RecipeProvider implements IConditionBuilder {
16+
public SDRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
1717
super(output, registries);
1818
}
1919

@@ -29,11 +29,13 @@ public ModRecipeProvider(PackOutput output, CompletableFuture<HolderLookup.Provi
2929
@Override
3030
protected void buildRecipes(RecipeOutput output) {
3131
cookMeals(output);
32+
cuttingFishies(output);
33+
cuttingMisc(output);
3234
}
3335

3436
private static void cookMeals(RecipeOutput output) {
3537

36-
CookingPotRecipeBuilder.cookingPotRecipe(ModItems.CACTIFISH_STEW.get(), 1, NORMAL_COOKING, MEDIUM_EXP)
38+
CookingPotRecipeBuilder.cookingPotRecipe(SDItems.CACTIFISH_STEW.get(), 1, NORMAL_COOKING, MEDIUM_EXP)
3739
.addIngredient(com.wdiscute.starcatcher.ModItems.CACTIFISH)
3840
.addIngredient(CommonTags.CROPS_TOMATO)
3941
.addIngredient(CommonTags.CROPS_CABBAGE)
@@ -42,4 +44,14 @@ private static void cookMeals(RecipeOutput output) {
4244
.setRecipeBookTab(CookingPotRecipeBookTab.MEALS)
4345
.build(output);
4446
}
47+
48+
private static void cuttingFishies(RecipeOutput output) {
49+
50+
}
51+
52+
private static void cuttingMisc(RecipeOutput output) {
53+
// CuttingBoardRecipeBuilder.cuttingRecipe(Ingredient.of(ModItems.SOME_ITEM.get()),
54+
// Ingredient.of(CommonTags.TOOLS_KNIFE), ModItems.SOME_ITEMS_FROM_SOME_ITEM.get(), 67)
55+
// .build(output);
56+
}
4557
}

‎src/main/java/com/wdiscute/starcatcher_delight/items/CactiFishStewItem.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.wdiscute.starcatcher_delight.items;
22

3-
import com.wdiscute.starcatcher_delight.registry.ModFoods;
3+
import com.wdiscute.starcatcher_delight.registry.SDFoods;
44
import net.minecraft.world.entity.LivingEntity;
55
import net.minecraft.world.item.Item;
66
import net.minecraft.world.item.ItemStack;
@@ -10,7 +10,7 @@
1010
public class CactiFishStewItem extends Item {
1111

1212
public CactiFishStewItem(Properties properties) {
13-
super(properties.food(ModFoods.CACTIFISH_STEW));
13+
super(properties.food(SDFoods.CACTIFISH_STEW));
1414
}
1515

1616
@Override

src/main/java/com/wdiscute/starcatcher_delight/registry/ModCreativeTab.java renamed to src/main/java/com/wdiscute/starcatcher_delight/registry/SDCreativeTab.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010

1111
import java.util.function.Supplier;
1212

13-
public class ModCreativeTab {
13+
public class SDCreativeTab {
1414
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TAB =
1515
DeferredRegister.create(Registries.CREATIVE_MODE_TAB, StarcatcherDelight.MOD_ID);
1616

1717
public static final Supplier<CreativeModeTab> STARCATCHER_DELIGHT_TAB = CREATIVE_MODE_TAB.register("starcatcher_delight_tab",
1818
() -> CreativeModeTab.builder()
19-
.icon(() -> new ItemStack(ModItems.CACTIFISH_STEW.get()))
19+
.icon(() -> new ItemStack(SDItems.CACTIFISH_STEW.get()))
2020
.title(Component.translatable("itemGroup.starcatcher_delight_tab"))
2121
.displayItems((parameters, output) -> {
22-
output.accept(ModItems.CACTIFISH_STEW);
22+
output.accept(SDItems.CACTIFISH_STEW);
2323

2424

2525

src/main/java/com/wdiscute/starcatcher_delight/registry/ModFoods.java renamed to src/main/java/com/wdiscute/starcatcher_delight/registry/SDFoods.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import net.minecraft.world.food.FoodProperties;
44

5-
public class ModFoods {
5+
public class SDFoods {
66

77
public static final FoodProperties CACTIFISH_STEW = new FoodProperties.Builder()
88
.nutrition(6)

src/main/java/com/wdiscute/starcatcher_delight/registry/ModItems.java renamed to src/main/java/com/wdiscute/starcatcher_delight/registry/SDItems.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.neoforged.neoforge.registries.DeferredItem;
88
import net.neoforged.neoforge.registries.DeferredRegister;
99

10-
public class ModItems {
10+
public class SDItems {
1111
public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(StarcatcherDelight.MOD_ID);
1212

1313

0 commit comments

Comments
 (0)