mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 20:45:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move curios tag and upgrade aquatic tree fertilizer recipes to datagen

Browse Source
This commit is contained in:
attackeight 2024-06-01 07:54:57 -04:00
parent eadb3608d8
commit 7e512a37c7
10 changed files with 126 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -213,6 +213,8 @@ dependencies {
// runtimeOnly fg.deobf("curse.maven:citadel-331936:3783096")
// runtimeOnly fg.deobf("curse.maven:ice-and-fire-dragons-264231:4614465")
// runtimeOnly fg.deobf("curse.maven:exnihilosequentia-400012:4083676")
runtimeOnly fg.deobf("curse.maven:upgrade-aquatic-326895:4365140")
runtimeOnly fg.deobf("curse.maven:blueprint-382216:3991478")
// https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings

4
src/generated/resources/.cache/cache
View File

@ -2587,6 +2587,7 @@ b13ffffe311c3e16c3577aeeca881a04aeed7ee6 data/create/advancements/recipes/create
453c39a149831f27b4c0069fae40cb1a8c87ed5e data/create/advancements/recipes/create.base/crafting/schematics/schematic_and_quill.json
d5efcd206b74c5165cbd4c2f5bb7bf3cf3eeae34 data/create/advancements/recipes/create.base/crafting/schematics/schematic_table.json
cd1f66066664ed58995f8a7988fb1aa22605650b data/create/advancements/recipes/create.base/crafting/schematics/schematicannon.json
a9219ad9757bd2212f1317e15faffbc5aba32f76 data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json
5f9967425d1b92a4e773deee93f6a5d6c971298d data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_crushed.json
16e52ba04279bcf803c5f6be46550ba5d81be1a3 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_ore.json
88a8661167993de0f2897c95e398b6f77429d724 data/create/advancements/recipes/create.base/smelting/zinc_ingot_from_raw_ore.json
@ -4166,6 +4167,7 @@ fe1d69b1e33d5748eb3c0ea732b8d67e2d612203 data/create/recipes/crafting/materials/
5c47ac2e2b596439a684126fef7265f13de2379b data/create/recipes/crafting/schematics/schematic_and_quill.json
9fb943be76c51a24aa9d8a09de5b7bd17b44ab08 data/create/recipes/crafting/schematics/schematic_table.json
c4a88166bb906a88b986c37a002057a86d2ece00 data/create/recipes/crafting/schematics/schematicannon.json
030d2ebb2c779e41ae0d046cfd82e82f4468510b data/create/recipes/crafting/tree_fertilizer.json
f679837ce5851f683daee24ee00dd4c764b617c8 data/create/recipes/crimsite_from_stone_types_crimsite_stonecutting.json
c60542c99008f7abecdd03c47137b51e20a4747b data/create/recipes/crimsite_pillar_from_stone_types_crimsite_stonecutting.json
4629d9a1a8a98a6b5b8b82c4507ca9e321c3a210 data/create/recipes/crimson_window.json
@ -5757,11 +5759,13 @@ ba2e448d208997c8327df19fac39748184d49465 data/create/tags/items/stone_types/ochr
634faefc734062b869002bd38aa4e5a2b06d8b9a data/create/tags/items/stone_types/veridium.json
d063e12c9ef75f39518c6d129ea35d833464d547 data/create/tags/items/toolboxes.json
ad8fa04f7bbbafd70d0ce158af78a35e899301e2 data/create/tags/items/tracks.json
2da3040e8affabe01b6e1ae730bc005b52fcd130 data/create/tags/items/upgrade_aquatic/coral.json
2f4044c2989b9a8aa394c88617d67a6a310e6b1b data/create/tags/items/upright_on_belt.json
50936b211d94167a35ec78c89954082a336b6269 data/create/tags/items/valve_handles.json
f8d83f446d0a2071dca4481251339c4249b2fd3f data/create/tags/items/vanilla_stripped_logs.json
f3e20d8b3ca5652d3975da680740cc36326fdfc9 data/create/tags/items/vanilla_stripped_wood.json
747204dc59a2198feb2bb579d586ea3975b6e0d1 data/create/tags/recipe_serializer/automation_ignore.json
e3b1332cad7924a7a54ea74171bff2e006c7ff00 data/curios/tags/items/head.json
16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/blocks/glass/colorless.json
81d3eb40b048160fcc2d6bb7ff12b49276297efd data/forge/tags/blocks/glass_panes.json
6eec92869baa44d3ac53aec6a7a92c15147b59f0 data/forge/tags/blocks/ores.json

34
src/generated/resources/data/create/advancements/recipes/create.base/crafting/tree_fertilizer.json Normal file
View File

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:crafting///tree_fertilizer"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"minecraft:bone_meal"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:crafting///tree_fertilizer"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

21
src/generated/resources/data/create/recipes/crafting/tree_fertilizer.json Normal file
View File

@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "minecraft:small_flowers"
},
{
"tag": "minecraft:small_flowers"
},
{
"tag": "create:upgrade_aquatic/coral"
},
{
"item": "minecraft:bone_meal"
}
],
"result": {
"item": "create:tree_fertilizer",
"count": 2
}
}

45
src/generated/resources/data/create/tags/items/upgrade_aquatic/coral.json Normal file
View File

@ -0,0 +1,45 @@
{
"replace": false,
"values": [
{
"id": "upgrade_aquatic:acan_coral",
"required": false
},
{
"id": "upgrade_aquatic:finger_coral",
"required": false
},
{
"id": "upgrade_aquatic:star_coral",
"required": false
},
{
"id": "upgrade_aquatic:moss_coral",
"required": false
},
{
"id": "upgrade_aquatic:petal_coral",
"required": false
},
{
"id": "upgrade_aquatic:branch_coral",
"required": false
},
{
"id": "upgrade_aquatic:rock_coral",
"required": false
},
{
"id": "upgrade_aquatic:pillow_coral",
"required": false
},
{
"id": "upgrade_aquatic:chrome_coral",
"required": false
},
{
"id": "upgrade_aquatic:silk_coral",
"required": false
}
]
}

2
src/main/resources/data/curios/tags/items/head.json → src/generated/resources/data/curios/tags/items/head.json
View File

@ -3,4 +3,4 @@
"values": [
"create:goggles"
]
}
}

7
src/main/java/com/simibubi/create/AllTags.java
View File

@ -1,5 +1,6 @@
package com.simibubi.create;
import static com.simibubi.create.AllTags.NameSpace.CURIOS;
import static com.simibubi.create.AllTags.NameSpace.FORGE;
import static com.simibubi.create.AllTags.NameSpace.GS;
import static com.simibubi.create.AllTags.NameSpace.MOD;
@ -59,7 +60,8 @@ public class AllTags {
FORGE("forge"),
TIC("tconstruct"),
QUARK("quark"),
GS("galosphere")
GS("galosphere"),
CURIOS("curios")
;
@ -190,6 +192,9 @@ public class AllTags {
AMETHYST(MOD,"stone_types/galosphere/amethyst"),
LUMIERE(MOD, "stone_types/galosphere/lumiere"),
UA_CORAL(MOD, "upgrade_aquatic/coral"),
CURIOS_HEAD(CURIOS, "head")
;
public final TagKey<Item> tag;

7
src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
View File

@ -1174,7 +1174,12 @@ public class StandardRecipeGen extends CreateRecipeProvider {
RAW_ZINC_ORE = create(AllItems.ZINC_INGOT::get).withSuffix("_from_raw_ore")
.viaCooking(AllItems.RAW_ZINC::get)
.rewardXP(.7f)
.inBlastFurnace()
.inBlastFurnace(),
UA_TREE_FERTILIZER = create(AllItems.TREE_FERTILIZER::get).returns(2)
.whenModLoaded(Mods.UA.getId()).unlockedBy(() -> Items.BONE_MEAL)
.viaShapeless(b -> b.requires(Ingredient.of(ItemTags.SMALL_FLOWERS), 2)
.requires(AllItemTags.UA_CORAL.tag).requires(Items.BONE_MEAL))
;

7
src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java
View File

@ -1,5 +1,6 @@
package com.simibubi.create.infrastructure.data;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllTags.AllBlockTags;
import com.simibubi.create.AllTags.AllEntityTags;
import com.simibubi.create.AllTags.AllFluidTags;
@ -149,12 +150,18 @@ public class CreateRegistrateTags {
genStrippedWoodItemTags(prov);
prov.tag(AllItemTags.CURIOS_HEAD.tag).add(AllItems.GOGGLES.get());
TagGen.addOptional(prov.tag(AllItemTags.ALLURITE.tag), Mods.GS, gsPalette("allurite"));
TagGen.addOptional(prov.tag(AllItemTags.LUMIERE.tag), Mods.GS, gsPalette("lumiere"));
TagGen.addOptional(prov.tag(AllItemTags.AMETHYST.tag), Mods.GS, gsPalette("amethyst"));
TagGen.addOptional(prov.tag(AllItemTags.UA_CORAL.tag), Mods.UA, List.of("acan_coral",
"finger_coral", "star_coral", "moss_coral", "petal_coral", "branch_coral",
"rock_coral", "pillow_coral", "chrome_coral", "silk_coral"));
// VALIDATE
for (AllItemTags tag : AllItemTags.values()) {

56
src/main/resources/data/create/recipes/compat/upgrade_aquatic/crafting/tree_fertilizer.json
View File

@ -1,56 +0,0 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "upgrade_aquatic"
}
],
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"tag": "minecraft:small_flowers"
},
{
"tag": "minecraft:small_flowers"
},
[
{
"item": "upgrade_aquatic:acan_coral"
},
{
"item": "upgrade_aquatic:finger_coral"
},
{
"item": "upgrade_aquatic:star_coral"
},
{
"item": "upgrade_aquatic:moss_coral"
},
{
"item": "upgrade_aquatic:petal_coral"
},
{
"item": "upgrade_aquatic:branch_coral"
},
{
"item": "upgrade_aquatic:rock_coral"
},
{
"item": "upgrade_aquatic:pillow_coral"
},
{
"item": "upgrade_aquatic:chrome_coral"
},
{
"item": "upgrade_aquatic:silk_coral"
}
],
{
"item": "minecraft:bone_meal"
}
],
"result": {
"item": "create:tree_fertilizer",
"count": 2
}
}