Skip to content

Commit dfa4e57

Browse files
The-Code-MonkeyThe-Code-Monkey
committed
feat: all plant fiber recipes added for
1 parent 6cfe090 commit dfa4e57

8 files changed

Lines changed: 166 additions & 40 deletions

File tree

‎src/client/java/com/tcm/MineTale/block/workbenches/screen/ArmorersWorkbenchScreen.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.tcm.MineTale.block.workbenches.menu.AbstractWorkbenchContainerMenu;
1010
import com.tcm.MineTale.block.workbenches.menu.ArmorersWorkbenchMenu;
1111
import com.tcm.MineTale.mixin.client.ClientRecipeBookAccessor;
12-
import com.tcm.MineTale.mixin.client.RecipeBookComponentAccessor;
1312
import com.tcm.MineTale.network.CraftRequestPayload;
1413
import com.tcm.MineTale.recipe.MineTaleRecipeBookComponent;
1514
import com.tcm.MineTale.registry.ModBlocks;
@@ -23,7 +22,6 @@
2322
import net.minecraft.client.gui.navigation.ScreenPosition;
2423
import net.minecraft.client.gui.screens.inventory.AbstractRecipeBookScreen;
2524
import net.minecraft.client.gui.screens.recipebook.RecipeBookComponent;
26-
import net.minecraft.client.gui.screens.recipebook.RecipeCollection;
2725
import net.minecraft.client.renderer.RenderPipelines;
2826
import net.minecraft.core.Holder;
2927
import net.minecraft.resources.Identifier;

‎src/client/java/com/tcm/MineTale/datagen/ModRecipeProvider.java‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44

55
import com.tcm.MineTale.MineTale;
66
import com.tcm.MineTale.datagen.builders.WorkbenchRecipeBuilder;
7+
import com.tcm.MineTale.datagen.recipes.AlchemistRecipes;
78
import com.tcm.MineTale.datagen.recipes.ArmorRecipes;
9+
import com.tcm.MineTale.datagen.recipes.BlacksmithRecipes;
810
import com.tcm.MineTale.datagen.recipes.BuilderRecipes;
911
import com.tcm.MineTale.datagen.recipes.FarmerRecipes;
12+
import com.tcm.MineTale.datagen.recipes.ForgeRecipes;
1013
import com.tcm.MineTale.datagen.recipes.FurnitureRecipes;
14+
import com.tcm.MineTale.datagen.recipes.GeneralRecipes;
1115
import com.tcm.MineTale.datagen.recipes.WorkbenchRecipes;
1216
import com.tcm.MineTale.registry.ModRecipeDisplay;
1317
import com.tcm.MineTale.registry.ModRecipes;
@@ -92,20 +96,24 @@ public void buildRecipes() {
9296
.bookCategory(ModRecipeDisplay.FURNACE_T1_SEARCH)
9397
.save(exporter, "furnace_t1_copper_ingot");
9498

95-
// Workbench Recipes
96-
WorkbenchRecipes.buildRecipes(this, exporter, registryLookup);
97-
99+
// Alchemist Recipes
100+
AlchemistRecipes.buildRecipes(this, exporter, registryLookup);
98101
// Armor Recipes
99102
ArmorRecipes.buildRecipes(this, exporter, registryLookup);
100-
101-
// Furniture Recipes
102-
FurnitureRecipes.buildRecipes(this, exporter, registryLookup);
103-
103+
// Blacksmith Recipes
104+
BlacksmithRecipes.buildRecipes(this, exporter, registryLookup);
104105
// Builder Recipes
105106
BuilderRecipes.buildRecipes(this, exporter, registryLookup);
106-
107107
// Farmer Recipes
108108
FarmerRecipes.buildRecipes(this, exporter, registryLookup);
109+
// Forge Recipes
110+
ForgeRecipes.buildRecipes(this, exporter, registryLookup);
111+
// Furniture Recipes
112+
FurnitureRecipes.buildRecipes(this, exporter, registryLookup);
113+
// General Recipes
114+
GeneralRecipes.buildRecipes(this, exporter, registryLookup);
115+
// Workbench Recipes
116+
WorkbenchRecipes.buildRecipes(this, exporter, registryLookup);
109117
}
110118
};
111119
}

‎src/client/java/com/tcm/MineTale/datagen/recipes/AlchemistRecipes.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.tcm.MineTale.datagen.recipes;
2+
3+
import net.minecraft.core.HolderLookup;
4+
import net.minecraft.data.recipes.RecipeOutput;
5+
import net.minecraft.data.recipes.RecipeProvider;
6+
7+
public class AlchemistRecipes {
8+
public static void buildRecipes(RecipeProvider provider, RecipeOutput exporter, HolderLookup.Provider lookup) {
9+
// new WorkbenchRecipeBuilder(ModRecipes.ALCHEMIST_TYPE, ModRecipes.ALCHEMIST_SERIALIZER)
10+
// .input(ModItems.EMPTY_POTION_BOTTLE)
11+
// .input(ModItems.PLANT_FIBER, 5)
12+
// .input(ModItems.ESSENCE_OF_LIFE, 2)
13+
// .input(ModItems.VENOM_SACK, 1)
14+
// .output(ModItems.ANTIDOTE)
15+
// .time(1)
16+
// .unlockedBy("has_alchemist_workbench", provider.has(ModBlocks.ALCHEMIST_WORKBENCH_BLOCK.asItem()))
17+
// .bookCategory(ModRecipeDisplay.ALCHEMIST_SEARCH)
18+
// .save(exporter, "ANTIDOTE");
19+
20+
// new WorkbenchRecipeBuilder(ModRecipes.ALCHEMIST_TYPE, ModRecipes.ALCHEMIST_SERIALIZER)
21+
// .input(ModItems.WILD_BERRY, 6)
22+
// .input(ModItems.BOOM_POWDER, 2)
23+
// .input(ModItems.PLANT_FIBER, 4)
24+
// .output(ModItems.POPBERRY_BOMB, 2)
25+
// .time(0.5)
26+
// .unlockedBy("has_alchemist_workbench", provider.has(ModBlocks.ALCHEMIST_WORKBENCH_BLOCK.asItem()))
27+
// .bookCategory(ModRecipeDisplay.ALCHEMIST_SEARCH)
28+
// .save(exporter, "POPBERRY_BOMB");
29+
}
30+
}

‎src/client/java/com/tcm/MineTale/datagen/recipes/BlacksmithRecipes.java‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
package com.tcm.MineTale.datagen.recipes;
2+
3+
import net.minecraft.core.HolderLookup;
4+
import net.minecraft.data.recipes.RecipeOutput;
5+
import net.minecraft.data.recipes.RecipeProvider;
6+
7+
public class BlacksmithRecipes {
8+
public static void buildRecipes(RecipeProvider provider, RecipeOutput exporter, HolderLookup.Provider lookup) {
9+
// new WorkbenchRecipeBuilder(ModRecipes.BLACKSMITH_TYPE, ModRecipes.BLACKSMITH_SERIALIZER)
10+
// .input(Items.COPPER_INGOT, 4)
11+
// .input(ItemTags.LOGS, lookup, 2)
12+
// .input(ModItems.PLANT_FIBER, 4)
13+
// .output(Items.COPPER_AXE)
14+
// .time(3)
15+
// .unlockedBy("has_blacksmith_workbench", provider.has(ModBlocks.BLACKSMITH_WORKBENCH_BLOCK.asItem()))
16+
// .bookCategory(ModRecipeDisplay.BLACKSMITH_SEARCH)
17+
// .save(exporter, "COPPER_AXE");
18+
19+
// new WorkbenchRecipeBuilder(ModRecipes.BLACKSMITH_TYPE, ModRecipes.BLACKSMITH_SERIALIZER)
20+
// .input(Items.COPPER_INGOT, 6)
21+
// .input(ItemTags.LOGS, lookup, 6)
22+
// .input(ModItems.PLANT_FIBER, 4)
23+
// .output(ModItems.COPPER_BATTLEAXE)
24+
// .time(3)
25+
// .unlockedBy("has_blacksmith_workbench", provider.has(ModBlocks.BLACKSMITH_WORKBENCH_BLOCK.asItem()))
26+
// .bookCategory(ModRecipeDisplay.BLACKSMITH_SEARCH)
27+
// .save(exporter, "COPPER_BATTLEAXE");
28+
29+
// new WorkbenchRecipeBuilder(ModRecipes.BLACKSMITH_TYPE, ModRecipes.BLACKSMITH_SERIALIZER)
30+
// .input(Items.COPPER_INGOT, 4)
31+
// .input(ItemTags.LOGS, lookup, 3)
32+
// .input(ModItems.PLANT_FIBER, 3)
33+
// .output(ModItems.COPPER_DAGGERS)
34+
// .time(3)
35+
// .unlockedBy("has_blacksmith_workbench", provider.has(ModBlocks.BLACKSMITH_WORKBENCH_BLOCK.asItem()))
36+
// .bookCategory(ModRecipeDisplay.BLACKSMITH_SEARCH)
37+
// .save(exporter, "COPPER_DAGGERS");
38+
39+
// new WorkbenchRecipeBuilder(ModRecipes.BLACKSMITH_TYPE, ModRecipes.BLACKSMITH_SERIALIZER)
40+
// .input(ItemTags.STONE_TOOL_MATERIALS, lookup, 6)
41+
// .input(ItemTags.LOGS, lookup, 2)
42+
// .input(ModItems.PLANT_FIBER, 4)
43+
// .output(ModItems.CRUDE_LONGSWORD)
44+
// .time(3)
45+
// .unlockedBy("has_blacksmith_workbench", provider.has(ModBlocks.BLACKSMITH_WORKBENCH_BLOCK.asItem()))
46+
// .bookCategory(ModRecipeDisplay.BLACKSMITH_SEARCH)
47+
// .save(exporter, "CRUDE_LONGSWORD");
48+
49+
// new WorkbenchRecipeBuilder(ModRecipes.BLACKSMITH_TYPE, ModRecipes.BLACKSMITH_SERIALIZER)
50+
// .input(Items.COPPER_INGOT, 6)
51+
// .input(ItemTags.LOGS, lookup, 2)
52+
// .input(ModItems.PLANT_FIBER, 4)
53+
// .output(ModItems.COPPER_LONGSWORD)
54+
// .time(3)
55+
// .unlockedBy("has_blacksmith_workbench", provider.has(ModBlocks.BLACKSMITH_WORKBENCH_BLOCK.asItem()))
56+
// .bookCategory(ModRecipeDisplay.BLACKSMITH_SEARCH)
57+
// .save(exporter, "COPPER_LONGSWORD");
58+
59+
// new WorkbenchRecipeBuilder(ModRecipes.BLACKSMITH_TYPE, ModRecipes.BLACKSMITH_SERIALIZER)
60+
// .input(Items.COPPER_INGOT, 6)
61+
// .input(ItemTags.LOGS, lookup, 10)
62+
// .input(ModItems.PLANT_FIBER, 2)
63+
// .output(ModItems.COPPER_MACE)
64+
// .time(3)
65+
// .unlockedBy("has_blacksmith_workbench", provider.has(ModBlocks.BLACKSMITH_WORKBENCH_BLOCK.asItem()))
66+
// .bookCategory(ModRecipeDisplay.BLACKSMITH_SEARCH)
67+
// .save(exporter, "COPPER_MACE");
68+
69+
// new WorkbenchRecipeBuilder(ModRecipes.BLACKSMITH_TYPE, ModRecipes.BLACKSMITH_SERIALIZER)
70+
// .input(Items.COPPER_INGOT, 4)
71+
// .input(ItemTags.LOGS, lookup, 4)
72+
// .input(ModItems.PLANT_FIBER, 6)
73+
// .output(ModItems.COPPER_SHORTBOW)
74+
// .time(3)
75+
// .unlockedBy("has_blacksmith_workbench", provider.has(ModBlocks.BLACKSMITH_WORKBENCH_BLOCK.asItem()))
76+
// .bookCategory(ModRecipeDisplay.BLACKSMITH_SEARCH)
77+
// .save(exporter, "COPPER_SHORTBOW");
78+
79+
// new WorkbenchRecipeBuilder(ModRecipes.BLACKSMITH_TYPE, ModRecipes.BLACKSMITH_SERIALIZER)
80+
// .input(Items.COPPER_INGOT, 4)
81+
// .input(ItemTags.LOGS, lookup, 4)
82+
// .input(ModItems.PLANT_FIBER, 3)
83+
// .output(ModItems.COPPER_SWORD)
84+
// .time(3)
85+
// .unlockedBy("has_blacksmith_workbench", provider.has(ModBlocks.BLACKSMITH_WORKBENCH_BLOCK.asItem()))
86+
// .bookCategory(ModRecipeDisplay.BLACKSMITH_SEARCH)
87+
// .save(exporter, "COPPER_SWORD");
88+
}
89+
}

‎src/client/java/com/tcm/MineTale/datagen/recipes/FarmerRecipes.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
package com.tcm.MineTale.datagen.recipes;
22

3-
import com.tcm.MineTale.datagen.builders.WorkbenchRecipeBuilder;
4-
import com.tcm.MineTale.registry.ModBlocks;
5-
import com.tcm.MineTale.registry.ModItems;
6-
import com.tcm.MineTale.registry.ModRecipeDisplay;
7-
import com.tcm.MineTale.registry.ModRecipes;
8-
93
import net.minecraft.core.HolderLookup;
104
import net.minecraft.data.recipes.RecipeOutput;
115
import net.minecraft.data.recipes.RecipeProvider;
12-
import net.minecraft.tags.BlockTags;
13-
import net.minecraft.tags.ItemTags;
14-
import net.minecraft.world.item.Items;
15-
import net.minecraft.world.level.block.Blocks;
166

177
public class FarmerRecipes {
188
public static void buildRecipes(RecipeProvider provider, RecipeOutput exporter, HolderLookup.Provider lookup) {
9+
// TODO: ChickenCoop Not Implemented
10+
// new WorkbenchRecipeBuilder(ModRecipes.FARMERS_TYPE, ModRecipes.FARMERS_SERIALIZER)
11+
// .input(ItemTags.PLANKS, lookup, 20)
12+
// .input(ModItems.ESSENCE_OF_LIFE, 50)
13+
// .input(ModItems.PLANT_FIBER, 6)
14+
// .output(ModBlocks.CHICKEN_COOP.asItem())
15+
// .time(2)
16+
// .unlockedBy("has_workbench", provider.has(ModBlocks.FARMERS_WORKBENCH.asItem()))
17+
// .bookCategory(ModRecipeDisplay.FARMERS_SEARCH)
18+
// .save(exporter, "CHICKEN_COOP");
19+
1920
// TODO: LOTS Not Implemented
2021
// new WorkbenchRecipeBuilder(ModRecipes.FARMER_TYPE, ModRecipes.FARMER_SERIALIZER)
2122
// .input(ModItems.GREATER_ESSENCE_OF_LIFE, 100)

‎src/client/java/com/tcm/MineTale/datagen/recipes/ForgeRecipes.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.tcm.MineTale.datagen.recipes;
2+
3+
import net.minecraft.core.HolderLookup;
4+
import net.minecraft.data.recipes.RecipeOutput;
5+
import net.minecraft.data.recipes.RecipeProvider;
6+
7+
public class ForgeRecipes {
8+
public static void buildRecipes(RecipeProvider provider, RecipeOutput exporter, HolderLookup.Provider lookup) {
9+
// new WorkbenchRecipeBuilder(ModRecipes.FORGE_TYPE, ModRecipes.FORGE_SERIALIZER)
10+
// .input(Items.COPPER_INGOT, 4)
11+
// .input(ItemTags.LOGS, lookup, 6)
12+
// .input(ModItems.PLANT_FIBER, 2)
13+
// .output(Items.COPPER_CLUB)
14+
// .time(3)
15+
// .unlockedBy("has_forge_workbench", provider.has(ModBlocks.FORGE_WORKBENCH_BLOCK.asItem()))
16+
// .bookCategory(ModRecipeDisplay.FORGE_SEARCH)
17+
// .save(exporter, "COPPER_CLUB");
18+
}
19+
}

‎src/client/java/com/tcm/MineTale/datagen/recipes/FurnitureRecipes.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
package com.tcm.MineTale.datagen.recipes;
22

3-
import com.tcm.MineTale.datagen.builders.WorkbenchRecipeBuilder;
4-
import com.tcm.MineTale.registry.ModBlocks;
5-
import com.tcm.MineTale.registry.ModItems;
6-
import com.tcm.MineTale.registry.ModRecipeDisplay;
7-
import com.tcm.MineTale.registry.ModRecipes;
8-
93
import net.minecraft.core.HolderLookup;
104
import net.minecraft.data.recipes.RecipeOutput;
115
import net.minecraft.data.recipes.RecipeProvider;
12-
import net.minecraft.tags.ItemTags;
13-
import net.minecraft.world.item.Items;
146

157
public class FurnitureRecipes {
168
public static void buildRecipes(RecipeProvider provider, RecipeOutput exporter, HolderLookup.Provider lookup) {
@@ -61,7 +53,7 @@ public static void buildRecipes(RecipeProvider provider, RecipeOutput exporter,
6153
// .bookCategory(ModRecipeDisplay.FURNITURE_SEARCH)
6254
// .save(exporter, "OLD_SCROLL");
6355

64-
// TODO: ANCIENT_SCROLL & FURNITURE_WORKBENCH_BLOCK Not Implemented
56+
// TODO: ANCIENT_CANDLE & FURNITURE_WORKBENCH_BLOCK Not Implemented
6557
// new WorkbenchRecipeBuilder(ModRecipes.FURNITURE_TYPE, ModRecipes.FURNITURE_SERIALIZER)
6658
// .input(ModItems.PLANT_FIBER, 2)
6759
// .input(ModItems.TREE_SAP, 2)

‎src/client/java/com/tcm/MineTale/datagen/recipes/WorkbenchRecipes.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,6 @@ public static void buildRecipes(RecipeProvider provider, RecipeOutput exporter,
4242
// .bookCategory(ModRecipeDisplay.WORKBENCH_SEARCH)
4343
// .save(exporter, "workbench_farmers_workbench");
4444

45-
// TODO: ChickenCoop Not Implemented
46-
// new WorkbenchRecipeBuilder(ModRecipes.FARMERS_TYPE, ModRecipes.FARMERS_SERIALIZER)
47-
// .input(ItemTags.PLANKS, lookup, 20)
48-
// .input(ModItems.ESSENCE_OF_LIFE, 50)
49-
// .input(ModItems.PLANT_FIBER, 6)
50-
// .output(ModBlocks.CHICKEN_COOP.asItem())
51-
// .time(2)
52-
// .unlockedBy("has_workbench", provider.has(ModBlocks.FARMERS_WORKBENCH.asItem()))
53-
// .bookCategory(ModRecipeDisplay.FARMERS_SEARCH)
54-
// .save(exporter, "workbench_furnace_workbench_t1");
55-
5645
// TODO: Builder's Workbench Not Implemented
5746
// new WorkbenchRecipeBuilder(ModRecipes.WORKBENCH_TYPE, ModRecipes.WORKBENCH_SERIALIZER)
5847
// .input(ItemTags.LOGS, lookup, 6)

0 commit comments

Comments
 (0)