Skip to content

Commit 66e8621

Browse files
committed
Fix recipe datagen, to match new copper and netherite reqs
1 parent 5a3b3bb commit 66e8621

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/datagen/java/dev/compactmods/machines/datagen/RecipeGenerator.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
import net.minecraft.data.recipes.FinishedRecipe;
99
import net.minecraft.data.recipes.RecipeProvider;
1010
import net.minecraft.data.recipes.ShapedRecipeBuilder;
11-
import net.minecraft.tags.ItemTags;
1211
import net.minecraft.tags.TagKey;
1312
import net.minecraft.world.item.Item;
1413
import net.minecraft.world.item.Items;
1514
import net.minecraft.world.item.crafting.Ingredient;
1615
import net.minecraft.world.level.ItemLike;
16+
import net.minecraft.world.level.block.Block;
1717
import net.minecraftforge.common.Tags;
1818
import net.minecraftforge.common.crafting.ConditionalRecipe;
19+
import org.jetbrains.annotations.NotNull;
1920

2021
import java.util.Objects;
2122
import java.util.function.Consumer;
@@ -26,13 +27,13 @@ public RecipeGenerator(DataGenerator generatorIn) {
2627
}
2728

2829
@Override
29-
protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
30-
ShapedRecipeBuilder.shaped(Registration.ITEM_BREAKABLE_WALL.get(), 16)
31-
.pattern(" R ")
32-
.pattern(" I ")
33-
.define('R', Tags.Items.DUSTS_REDSTONE)
34-
.define('I', Tags.Items.STORAGE_BLOCKS_IRON)
35-
.unlockedBy("picked_up_iron", RecipeProvider.has(Tags.Items.STORAGE_BLOCKS_IRON))
30+
protected void buildCraftingRecipes(@NotNull Consumer<FinishedRecipe> consumer) {
31+
ShapedRecipeBuilder.shaped(Registration.ITEM_BREAKABLE_WALL.get(), 8)
32+
.pattern("DDD")
33+
.pattern("D D")
34+
.pattern("DDD")
35+
.define('D', Items.POLISHED_DEEPSLATE)
36+
.unlockedBy("picked_up_deepslate", RecipeProvider.has(Tags.Items.COBBLESTONE_DEEPSLATE))
3637
.save(consumer);
3738

3839
ShapedRecipeBuilder.shaped(Registration.PERSONAL_SHRINKING_DEVICE.get())
@@ -74,12 +75,12 @@ protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer) {
7475
}
7576

7677
private void addMachineRecipes(Consumer<FinishedRecipe> consumer) {
77-
registerMachineRecipe(consumer, Registration.MACHINE_BLOCK_ITEM_TINY.get(), ItemTags.PLANKS);
78+
registerMachineRecipe(consumer, Registration.MACHINE_BLOCK_ITEM_TINY.get(), Tags.Items.STORAGE_BLOCKS_COPPER);
7879
registerMachineRecipe(consumer, Registration.MACHINE_BLOCK_ITEM_SMALL.get(), Tags.Items.STORAGE_BLOCKS_IRON);
7980
registerMachineRecipe(consumer, Registration.MACHINE_BLOCK_ITEM_NORMAL.get(), Tags.Items.STORAGE_BLOCKS_GOLD);
8081
registerMachineRecipe(consumer, Registration.MACHINE_BLOCK_ITEM_GIANT.get(), Tags.Items.STORAGE_BLOCKS_DIAMOND);
8182
registerMachineRecipe(consumer, Registration.MACHINE_BLOCK_ITEM_LARGE.get(), Tags.Items.OBSIDIAN);
82-
registerMachineRecipe(consumer, Registration.MACHINE_BLOCK_ITEM_MAXIMUM.get(), Tags.Items.STORAGE_BLOCKS_EMERALD);
83+
registerMachineRecipe(consumer, Registration.MACHINE_BLOCK_ITEM_MAXIMUM.get(), Tags.Items.STORAGE_BLOCKS_NETHERITE);
8384
}
8485

8586
protected void registerMachineRecipe(Consumer<FinishedRecipe> consumer, ItemLike out, TagKey<Item> center) {
@@ -96,8 +97,7 @@ protected void registerMachineRecipe(Consumer<FinishedRecipe> consumer, ItemLike
9697
if (center != null)
9798
recipe.define('C', center);
9899

99-
recipe
100-
.unlockedBy("has_recipe", RecipeProvider.has(wall));
100+
recipe.unlockedBy("has_recipe", RecipeProvider.has(wall));
101101

102102
ConditionalRecipe.builder()
103103
.addCondition(new EnableVanillaRecipesConfigCondition())

0 commit comments

Comments
 (0)