mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-27 05:18:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6789 from Attack8/mc1.18/mmc-3

Browse source 
Add Environmental wood support
This commit is contained in:
simibubi 2024-08-07 18:04:42 +02:00 committed by GitHub
commit d80fc93b94
Failed to generate hash of commit
15 changed files with 268 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.gradle
View file

@ -208,8 +208,8 @@ dependencies {
// runtimeOnly fg.deobf("curse.maven:elementary-ores-332609:3956498")
// runtimeOnly fg.deobf("curse.maven:flib-661261:3956196")
// runtimeOnly fg.deobf("curse.maven:infernal-expansion-395078:3854062")
// runtimeOnly fg.deobf("vazkii.arl:AutoRegLib:1.4-35.69")
// runtimeOnly fg.deobf("vazkii.quark:Quark:r2.0-212.984")
// runtimeOnly fg.deobf("vazkii.autoreglib:AutoRegLib:1.7-53.111")
// runtimeOnly fg.deobf("vazkii.quark:Quark:3.2-358.2")
// runtimeOnly fg.deobf("curse.maven:mantle-74924:4509007")
// runtimeOnly fg.deobf("curse.maven:tinkers-construct-74072:4509008")
// runtimeOnly fg.deobf("maven.modrinth:rubidium:0.5.3")
@ -234,6 +234,8 @@ dependencies {
// 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")
// runtimeOnly fg.deobf("curse.maven:blueprint-382216:3991478")
// runtimeOnly fg.deobf("curse.maven:environmental-388992:4381294")
// https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings

12
src/generated/resources/.cache/cache
View file

@ -4853,6 +4853,18 @@ fa4c6d4a584130896959e541ad50d02543a47e7e data/create/recipes/cutting/compat/ecol
65e4fb8096eed59d331bb4bb4495e0baa1eeba29 data/create/recipes/cutting/compat/ecologics/walnut_wood.json
7b455e3dfe54c4d89801f3e59cf0379111c31bca data/create/recipes/cutting/compat/endergetic/poise_stem.json
406ff9fe1666975d89d235d79bac78cd4db8def6 data/create/recipes/cutting/compat/endergetic/stripped_poise_stem.json
53532c6f4b4533ec99fdcd35ab056c82f9c4acc1 data/create/recipes/cutting/compat/environmental/cherry_log.json
8eac95483b520f13e699d729439092330f79f0bf data/create/recipes/cutting/compat/environmental/cherry_wood.json
16bbe268be013e9b1e0dc6d0383f94f9b09f7043 data/create/recipes/cutting/compat/environmental/stripped_cherry_log.json
2cf4ff7a1a9d18e6cab237cf02f416675a412354 data/create/recipes/cutting/compat/environmental/stripped_cherry_wood.json
ff948404084865981c3bd05bf4da3e41c063ecce data/create/recipes/cutting/compat/environmental/stripped_willow_log.json
22d2f073cb2d15626869cb70fed7071a2e3b486f data/create/recipes/cutting/compat/environmental/stripped_willow_wood.json
9f07ef6871d5b590239242e93fee8170a490744e data/create/recipes/cutting/compat/environmental/stripped_wisteria_log.json
0654322d060ba6e70830bfe5d54b53646c472788 data/create/recipes/cutting/compat/environmental/stripped_wisteria_wood.json
302a1555951fa683faa4764ca5d40154fadac08c data/create/recipes/cutting/compat/environmental/willow_log.json
5abeca74f6919610d831b855a282f760995d3a6b data/create/recipes/cutting/compat/environmental/willow_wood.json
610835099803e0e6f88c2fa823e8c68e0b07032d data/create/recipes/cutting/compat/environmental/wisteria_log.json
e4745594ab5b9a14ee42bd829615883b5b0cef55 data/create/recipes/cutting/compat/environmental/wisteria_wood.json
9e3c05523b2bb4a4bb62638ce3957638f73c1ff6 data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood.json
91ad953c119a74f809359d39653fef231b712343 data/create/recipes/cutting/compat/forbidden_arcanus/cherrywood_log.json
64a2975a19d70ca4a6ce8cc69e6d23150354f7ca data/create/recipes/cutting/compat/forbidden_arcanus/mysterywood.json

20
src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_log.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:cherry_log"
}
],
"results": [
{
"item": "environmental:stripped_cherry_log"
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

20
src/generated/resources/data/create/recipes/cutting/compat/environmental/cherry_wood.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:cherry_wood"
}
],
"results": [
{
"item": "environmental:stripped_cherry_wood"
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

21
src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_log.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:stripped_cherry_log"
}
],
"results": [
{
"item": "environmental:cherry_planks",
"count": 6
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

21
src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_cherry_wood.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:stripped_cherry_wood"
}
],
"results": [
{
"item": "environmental:cherry_planks",
"count": 6
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

21
src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_log.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:stripped_willow_log"
}
],
"results": [
{
"item": "environmental:willow_planks",
"count": 6
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

21
src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_willow_wood.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:stripped_willow_wood"
}
],
"results": [
{
"item": "environmental:willow_planks",
"count": 6
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

21
src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_log.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:stripped_wisteria_log"
}
],
"results": [
{
"item": "environmental:wisteria_planks",
"count": 6
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

21
src/generated/resources/data/create/recipes/cutting/compat/environmental/stripped_wisteria_wood.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:stripped_wisteria_wood"
}
],
"results": [
{
"item": "environmental:wisteria_planks",
"count": 6
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

20
src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_log.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:willow_log"
}
],
"results": [
{
"item": "environmental:stripped_willow_log"
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

20
src/generated/resources/data/create/recipes/cutting/compat/environmental/willow_wood.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:willow_wood"
}
],
"results": [
{
"item": "environmental:stripped_willow_wood"
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

20
src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_log.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:wisteria_log"
}
],
"results": [
{
"item": "environmental:stripped_wisteria_log"
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

20
src/generated/resources/data/create/recipes/cutting/compat/environmental/wisteria_wood.json Normal file
View file

@ -0,0 +1,20 @@
{
"type": "create:cutting",
"ingredients": [
{
"item": "environmental:wisteria_wood"
}
],
"results": [
{
"item": "environmental:stripped_wisteria_wood"
}
],
"processingTime": 50,
"conditions": [
{
"modid": "environmental",
"type": "forge:mod_loaded"
}
]
}

7
src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java
View file

@ -9,6 +9,7 @@ import net.minecraft.world.level.block.Blocks;
import java.util.Objects;
@SuppressWarnings("unused")
public class CuttingRecipeGen extends ProcessingRecipeGen {
GeneratedRecipe
@ -151,7 +152,11 @@ public class CuttingRecipeGen extends ProcessingRecipeGen {
RU_12 = stripAndMakePlanks(Mods.RU, "ashen_log", "stripped_dead_log", null),
RU_13 = stripAndMakePlanks(Mods.RU, "ashen_wood", "stripped_dead_wood", null),
RU_14 = stripOnlyDiffModId(Mods.RU, "silver_birch_log", Mods.MC, "stripped_birch_log"),
RU_15 = stripOnlyDiffModId(Mods.RU, "silver_birch_wood", Mods.MC, "stripped_birch_wood")
RU_15 = stripOnlyDiffModId(Mods.RU, "silver_birch_wood", Mods.MC, "stripped_birch_wood"),
// Environmental
ENV = cuttingCompat(Mods.ENV, "willow", "cherry", "wisteria")
;
GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks) {