Skip to content

Commit 7e512a3

Browse files
Attack8Attack8
committed
Move curios tag and upgrade aquatic tree fertilizer recipes to datagen
1 parent eadb360 commit 7e512a3

File tree

10 files changed

+126
-59
lines changed

10 files changed

+126
-59
lines changed

‎build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,8 @@ dependencies {
213213
// runtimeOnly fg.deobf("curse.maven:citadel-331936:3783096")
214214
// runtimeOnly fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465")
215215
// runtimeOnly fg.deobf("curse.maven:exnihilosequentia-400012:4083676")
216+
runtimeOnly fg.deobf("curse.maven:upgrade-aquatic-326895:4365140")
217+
runtimeOnly fg.deobf("curse.maven:blueprint-382216:3991478")
216218

217219
// https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
218220
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings

‎src/generated/resources/.cache/cache

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2587,6 +2587,7 @@ b13ffffe311c3e16c3577aeeca881a04aeed7ee6 data/create/advancements/recipes/create
25872587
453c39a149831f27b4c0069fae40cb1a8c87ed5e data/create/advancements/recipes/create.base/crafting/schematics/schematic_and_quill.json
25882588
d5efcd206b74c5165cbd4c2f5bb7bf3cf3eeae34 data/create/advancements/recipes/create.base/crafting/schematics/schematic_table.json
25892589
cd1f66066664ed58995f8a7988fb1aa22605650b data/create/advancements/recipes/create.base/crafting/schematics/schematicannon.json
2590+
a9219ad9757bd2212f1317e15faffbc5aba32f76 data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json
25902591
5f9967425d1b92a4e773deee93f6a5d6c971298d data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json
25912592
16e52ba04279bcf803c5f6be46550ba5d81be1a3 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_ore.json
25922593
88a8661167993de0f2897c95e398b6f77429d724 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_raw_ore.json
@@ -4166,6 +4167,7 @@ fe1d69b1e33d5748eb3c0ea732b8d67e2d612203 data/create/recipes/crafting/materials/
41664167
5c47ac2e2b596439a684126fef7265f13de2379b data/create/recipes/crafting/schematics/schematic_and_quill.json
41674168
9fb943be76c51a24aa9d8a09de5b7bd17b44ab08 data/create/recipes/crafting/schematics/schematic_table.json
41684169
c4a88166bb906a88b986c37a002057a86d2ece00 data/create/recipes/crafting/schematics/schematicannon.json
4170+
030d2ebb2c779e41ae0d046cfd82e82f4468510b data/create/recipes/crafting/tree_fertilizer.json
41694171
f679837ce5851f683daee24ee00dd4c764b617c8 data/create/recipes/crimsite_from_stone_types_crimsite_stonecutting.json
41704172
c60542c99008f7abecdd03c47137b51e20a4747b data/create/recipes/crimsite_pillar_from_stone_types_crimsite_stonecutting.json
41714173
4629d9a1a8a98a6b5b8b82c4507ca9e321c3a210 data/create/recipes/crimson_window.json
@@ -5757,11 +5759,13 @@ ba2e448d208997c8327df19fac39748184d49465 data/create/tags/items/stone_types/ochr
57575759
634faefc734062b869002bd38aa4e5a2b06d8b9a data/create/tags/items/stone_types/veridium.json
57585760
d063e12c9ef75f39518c6d129ea35d833464d547 data/create/tags/items/toolboxes.json
57595761
ad8fa04f7bbbafd70d0ce158af78a35e899301e2 data/create/tags/items/tracks.json
5762+
2da3040e8affabe01b6e1ae730bc005b52fcd130 data/create/tags/items/upgrade_aquatic/coral.json
57605763
2f4044c2989b9a8aa394c88617d67a6a310e6b1b data/create/tags/items/upright_on_belt.json
57615764
50936b211d94167a35ec78c89954082a336b6269 data/create/tags/items/valve_handles.json
57625765
f8d83f446d0a2071dca4481251339c4249b2fd3f data/create/tags/items/vanilla_stripped_logs.json
57635766
f3e20d8b3ca5652d3975da680740cc36326fdfc9 data/create/tags/items/vanilla_stripped_wood.json
57645767
747204dc59a2198feb2bb579d586ea3975b6e0d1 data/create/tags/recipe_serializer/automation_ignore.json
5768+
e3b1332cad7924a7a54ea74171bff2e006c7ff00 data/curios/tags/items/head.json
57655769
16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/blocks/glass/colorless.json
57665770
81d3eb40b048160fcc2d6bb7ff12b49276297efd data/forge/tags/blocks/glass_panes.json
57675771
6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/blocks/ores.json

‎src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"rewards": {
4+
"recipes": [
5+
"create:crafting///tree_fertilizer"
6+
]
7+
},
8+
"criteria": {
9+
"has_item": {
10+
"trigger": "minecraft:inventory_changed",
11+
"conditions": {
12+
"items": [
13+
{
14+
"items": [
15+
"minecraft:bone_meal"
16+
]
17+
}
18+
]
19+
}
20+
},
21+
"has_the_recipe": {
22+
"trigger": "minecraft:recipe_unlocked",
23+
"conditions": {
24+
"recipe": "create:crafting///tree_fertilizer"
25+
}
26+
}
27+
},
28+
"requirements": [
29+
[
30+
"has_item",
31+
"has_the_recipe"
32+
]
33+
]
34+
}

‎src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"ingredients": [
4+
{
5+
"tag": "minecraft:small_flowers"
6+
},
7+
{
8+
"tag": "minecraft:small_flowers"
9+
},
10+
{
11+
"tag": "create:upgrade_aquatic/coral"
12+
},
13+
{
14+
"item": "minecraft:bone_meal"
15+
}
16+
],
17+
"result": {
18+
"item": "create:tree_fertilizer",
19+
"count": 2
20+
}
21+
}

‎src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"replace": false,
3+
"values": [
4+
{
5+
"id": "upgrade_aquatic:acan_coral",
6+
"required": false
7+
},
8+
{
9+
"id": "upgrade_aquatic:finger_coral",
10+
"required": false
11+
},
12+
{
13+
"id": "upgrade_aquatic:star_coral",
14+
"required": false
15+
},
16+
{
17+
"id": "upgrade_aquatic:moss_coral",
18+
"required": false
19+
},
20+
{
21+
"id": "upgrade_aquatic:petal_coral",
22+
"required": false
23+
},
24+
{
25+
"id": "upgrade_aquatic:branch_coral",
26+
"required": false
27+
},
28+
{
29+
"id": "upgrade_aquatic:rock_coral",
30+
"required": false
31+
},
32+
{
33+
"id": "upgrade_aquatic:pillow_coral",
34+
"required": false
35+
},
36+
{
37+
"id": "upgrade_aquatic:chrome_coral",
38+
"required": false
39+
},
40+
{
41+
"id": "upgrade_aquatic:silk_coral",
42+
"required": false
43+
}
44+
]
45+
}

‎src/main/resources/data/curios/tags/items/head.json renamed to ‎src/generated/resources/data/curios/tags/items/head.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"values": [
44
"create:goggles"
55
]
6-
}
6+
}

‎src/main/java/com/simibubi/create/AllTags.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.simibubi.create;
22

3+
import static com.simibubi.create.AllTags.NameSpace.CURIOS;
34
import static com.simibubi.create.AllTags.NameSpace.FORGE;
45
import static com.simibubi.create.AllTags.NameSpace.GS;
56
import static com.simibubi.create.AllTags.NameSpace.MOD;
@@ -59,7 +60,8 @@ public enum NameSpace {
5960
FORGE("forge"),
6061
TIC("tconstruct"),
6162
QUARK("quark"),
62-
GS("galosphere")
63+
GS("galosphere"),
64+
CURIOS("curios")
6365

6466
;
6567

@@ -190,6 +192,9 @@ public enum AllItemTags {
190192
AMETHYST(MOD,"stone_types/galosphere/amethyst"),
191193
LUMIERE(MOD, "stone_types/galosphere/lumiere"),
192194

195+
UA_CORAL(MOD, "upgrade_aquatic/coral"),
196+
CURIOS_HEAD(CURIOS, "head")
197+
193198
;
194199

195200
public final TagKey<Item> tag;

‎src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,12 @@ public class StandardRecipeGen extends CreateRecipeProvider {
11741174
RAW_ZINC_ORE = create(AllItems.ZINC_INGOT::get).withSuffix("_from_raw_ore")
11751175
.viaCooking(AllItems.RAW_ZINC::get)
11761176
.rewardXP(.7f)
1177-
.inBlastFurnace()
1177+
.inBlastFurnace(),
1178+
1179+
UA_TREE_FERTILIZER = create(AllItems.TREE_FERTILIZER::get).returns(2)
1180+
.whenModLoaded(Mods.UA.getId()).unlockedBy(() -> Items.BONE_MEAL)
1181+
.viaShapeless(b -> b.requires(Ingredient.of(ItemTags.SMALL_FLOWERS), 2)
1182+
.requires(AllItemTags.UA_CORAL.tag).requires(Items.BONE_MEAL))
11781183

11791184
;
11801185

‎src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.simibubi.create.infrastructure.data;
22

3+
import com.simibubi.create.AllItems;
34
import com.simibubi.create.AllTags.AllBlockTags;
45
import com.simibubi.create.AllTags.AllEntityTags;
56
import com.simibubi.create.AllTags.AllFluidTags;
@@ -149,12 +150,18 @@ private static void genItemTags(RegistrateTagsProvider<Item> prov) {
149150

150151
genStrippedWoodItemTags(prov);
151152

153+
prov.tag(AllItemTags.CURIOS_HEAD.tag).add(AllItems.GOGGLES.get());
154+
152155
TagGen.addOptional(prov.tag(AllItemTags.ALLURITE.tag), Mods.GS, gsPalette("allurite"));
153156

154157
TagGen.addOptional(prov.tag(AllItemTags.LUMIERE.tag), Mods.GS, gsPalette("lumiere"));
155158

156159
TagGen.addOptional(prov.tag(AllItemTags.AMETHYST.tag), Mods.GS, gsPalette("amethyst"));
157160

161+
TagGen.addOptional(prov.tag(AllItemTags.UA_CORAL.tag), Mods.UA, List.of("acan_coral",
162+
"finger_coral", "star_coral", "moss_coral", "petal_coral", "branch_coral",
163+
"rock_coral", "pillow_coral", "chrome_coral", "silk_coral"));
164+
158165
// VALIDATE
159166

160167
for (AllItemTags tag : AllItemTags.values()) {

‎src/main/resources/data/create/recipes/compat/upgrade_aquatic/crafting/tree_fertilizer.json

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)