Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Mod Compat 6 #7320

Open
wants to merge 11 commits into
base: mc1.20.1/dev
Choose a base branch
from
Open

More Mod Compat 6 #7320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
446cebc
More Mod Compat 5
Attack8 Sep 3, 2024
df5b6b1
Replace arl with zeta
Attack8 Sep 3, 2024
b6274a3
Change to blamejared maven
Attack8 Sep 3, 2024
8db1c02
Fix Silent Gems compat
Attack8 Sep 6, 2024
c485cb7
Add deepslate ores too
Attack8 Sep 6, 2024
769e41d
Merge branch 'mc1.20.1/dev' into mc1.20.1/mmc-5
Attack8 Jan 13, 2025
5ee0eca
Merge branch 'refs/heads/mc1.20.1/dev' into mc1.20.1/mmc-5
Attack8 Jan 28, 2025
199e88c
More Mod Compat 6
Attack8 Jan 30, 2025
93a6432
Fix a couple flowers
Attack8 Jan 30, 2025
bcdce73
Post review changes
Attack8 Feb 13, 2025
5557aad
Revert Cutting Recipe Gen
Attack8 Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Revert Cutting Recipe Gen
  • Loading branch information
@Attack8
Attack8 committed Feb 13, 2025
commit 5557aadfe90f04e6d9996f31beb62d8fdaa0fb70
16 changes: 10 additions & 6 deletions src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,17 @@ public class CuttingRecipeGen extends ProcessingRecipeGen {

// Oh The Biomes You'll Go
BYG =
cuttingCompat(Mods.BWG, "aspen", "baobab", "blue_enchanted", "cika", "cypress", "ebony",
"fir", "green_enchanted", "holly", "jacaranda", "ironwood", "mahogany", "maple", "sakura", "white_mangrove",
cuttingCompat(Mods.BYG, "aspen", "baobab", "blue_enchanted", "cika", "cypress", "ebony", "ether",
"fir", "green_enchanted", "holly", "jacaranda", "lament", "mahogany", "maple", "nightshade",
"palm", "pine", "rainbow_eucalyptus", "redwood", "skyris", "willow", "witch_hazel", "zelkova"),
BYG_2 = stripAndMakePlanks(Mods.BWG, "florus_stem", "stripped_florus_stem", "florus_planks"),
BYG_3 = stripAndMakePlanks(Mods.BWG, "florus_wood", "stripped_florus_wood", "florus_planks"),
BYG_4 = stripAndMakePlanks(Mods.BWG, "palo_verde_log", "stripped_palo_verde_log", null),
BYG_5 = stripAndMakePlanks(Mods.BWG, "palo_verde_wood", "stripped_palo_verde_wood", null),
BYG_2 = stripAndMakePlanks(Mods.BYG, "bulbis_stem", "stripped_bulbis_stem", "bulbis_planks"),
BYG_3 = stripAndMakePlanks(Mods.BYG, "bulbis_wood", "stripped_bulbis_wood", "bulbis_planks"),
BYG_4 = stripAndMakePlanks(Mods.BYG, null, "imparius_stem", "imparius_planks"),
BYG_5 = stripAndMakePlanks(Mods.BYG, null, "imparius_hyphae", "imparius_planks"),
BYG_6 = stripAndMakePlanks(Mods.BYG, null, "fungal_imparius_stem", "imparius_planks"),
BYG_7 = stripAndMakePlanks(Mods.BYG, null, "fungal_imparius_hyphae", "imparius_planks"),
BYG_8 = stripAndMakePlanks(Mods.BYG, "palo_verde_log", "stripped_palo_verde_log", null),
BYG_9 = stripAndMakePlanks(Mods.BYG, "palo_verde_wood", "stripped_palo_verde_wood", null),

// Silent Gear
SG = cuttingCompat(Mods.SG, "netherwood"),
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/simibubi/create/foundation/data/recipe/Mods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public enum Mods {
HEX("hexcasting"),
ID("integrateddynamics", b -> b.strippedWoodIsSuffix()),
BWG("biomeswevegone"),
BYG("biomeswevegone"), // TODO: Remove when CuttingRecipeGen is updated
SG("silentgear"),
TIC("tconstruct"),
AP("architects_palette"),
Expand Down