Skip to content

Commit 7e72e6b

Browse files
committed
conditional recipes
1 parent c1673c9 commit 7e72e6b

File tree

14 files changed

+1394
-262
lines changed

14 files changed

+1394
-262
lines changed

dependencies.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@ dependencies {
7171
modCompileOnly(forge.cc.tweaked.core.api)
7272
modCompileOnly(forge.cc.tweaked.forge.api)
7373

74+
// Compat mods
75+
modCompileOnly(forge.alexscaves)
76+
modCompileOnly(forge.biomesoplenty)
77+
modCompileOnly(forge.biomeswevegone)
78+
modCompileOnly(forge.letsdobloomingnature)
79+
modCompileOnly(forge.undergarden)
80+
7481
// Standard runtime mods //
7582
modLocalRuntime(forge.jade)
7683
modLocalRuntime(forge.ae2)

gradle/forge.versions.toml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ jade = "11.6.3"
3131
embeddium = "0.3.31+mc1.20.1"
3232
oculus = "1.20.1-1.8.0"
3333
modernfix = "DdUByV9S" # 5.24.1+mc1.20.1
34+
alexscaves = "2.0.2"
35+
biomesoplenty = "19.0.0.96"
36+
biomeswevegone = "1.7.3-Forge"
37+
letsdobloomingnature = "1.0.12"
38+
undergarden = "0.8.14"
3439

3540
## cursemaven ##
3641
worldStripper = "4578579"
@@ -92,6 +97,13 @@ oculus = { module = "maven.modrinth:oculus", version.ref = "oculus"
9297
modernfix = { module = "maven.modrinth:modernfix", version.ref = "modernfix" }
9398

9499

100+
alexscaves = { module = "maven.modrinth:alexs-caves", version.ref = "alexscaves" }
101+
biomesoplenty = { module = "maven.modrinth:biomes-o-plenty", version.ref = "biomesoplenty" }
102+
biomeswevegone = { module = "maven.modrinth:oh-the-biomes-weve-gone", version.ref = "biomeswevegone" }
103+
letsdobloomingnature= { module = "maven.modrinth:lets-do-bloomingnature", version.ref = "letsdobloomingnature" }
104+
undergarden = { module = "maven.modrinth:the-undergarden", version.ref = "undergarden" }
105+
106+
95107
cc-tweaked-core-api = { module = "cc.tweaked:cc-tweaked-1.20.1-core-api", version.ref = "ccTweaked" }
96108
cc-tweaked-forge-api = { module = "cc.tweaked:cc-tweaked-1.20.1-forge-api", version.ref = "ccTweaked" }
97109
cc-tweaked-forge-impl = { module = "cc.tweaked:cc-tweaked-1.20.1-forge", version.ref = "ccTweaked" }

src/generated/resources/assets/gtceu/lang/en_ud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,13 +1731,16 @@
17311731
"command.gtceu.share_prospection_data.notification": "¡noʎ ɥʇıʍ ɐʇɐp buıʇɔǝdsoɹd buıɹɐɥs sı %s",
17321732
"config.gtceu.option.addLoot": "ʇooꞀppɐ",
17331733
"config.gtceu.option.ae2": "ᄅǝɐ",
1734+
"config.gtceu.option.alexsCavesRecipes": "sǝdıɔǝᴚsǝʌɐƆsxǝןɐ",
17341735
"config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "ǝpıSʇndʇnOɯoɹℲspınןℲʇnduIsɯnɹᗡʍoןןɐ",
17351736
"config.gtceu.option.animationTime": "ǝɯı⟘uoıʇɐɯıuɐ",
17361737
"config.gtceu.option.arcRecyclingYield": "pןǝıʎbuıןɔʎɔǝᴚɔɹɐ",
17371738
"config.gtceu.option.armorHud": "pnHɹoɯɹɐ",
17381739
"config.gtceu.option.batchDuration": "uoıʇɐɹnᗡɥɔʇɐq",
17391740
"config.gtceu.option.bedrockOreDistance": "ǝɔuɐʇsıᗡǝɹOʞɔoɹpǝq",
17401741
"config.gtceu.option.bedrockOreDropTagPrefix": "xıɟǝɹԀbɐ⟘doɹᗡǝɹOʞɔoɹpǝq",
1742+
"config.gtceu.option.biomesOPlentyRecipes": "sǝdıɔǝᴚʎʇuǝןԀOsǝɯoıq",
1743+
"config.gtceu.option.biomesWeveGoneRecipes": "sǝdıɔǝᴚǝuo⅁ǝʌǝMsǝɯoıq",
17411744
"config.gtceu.option.borderColor": "ɹoןoƆɹǝpɹoq",
17421745
"config.gtceu.option.bronzeBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺǝzuoɹq",
17431746
"config.gtceu.option.bronzeBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺǝzuoɹq",
@@ -1749,6 +1752,7 @@
17491752
"config.gtceu.option.coloredWireOutline": "ǝuıןʇnOǝɹıMpǝɹoןoɔ",
17501753
"config.gtceu.option.compat": "ʇɐdɯoɔ",
17511754
"config.gtceu.option.createCompat": "ʇɐdɯoƆǝʇɐǝɹɔ",
1755+
"config.gtceu.option.createRecipes": "sǝdıɔǝᴚǝʇɐǝɹɔ",
17521756
"config.gtceu.option.debug": "bnqǝp",
17531757
"config.gtceu.option.debugWorldgen": "uǝbpןɹoMbnqǝp",
17541758
"config.gtceu.option.defaultPaintingColor": "ɹoןoƆbuıʇuıɐԀʇןnɐɟǝp",
@@ -1888,6 +1892,7 @@
18881892
"config.gtceu.option.treeFellingDelay": "ʎɐןǝᗡbuıןןǝℲǝǝɹʇ",
18891893
"config.gtceu.option.tungstensteelBoilerHeatSpeed": "pǝǝdSʇɐǝHɹǝןıoᗺןǝǝʇsuǝʇsbunʇ",
18901894
"config.gtceu.option.tungstensteelBoilerMaxTemperature": "ǝɹnʇɐɹǝdɯǝ⟘xɐWɹǝןıoᗺןǝǝʇsuǝʇsbunʇ",
1895+
"config.gtceu.option.undergardenRecipes": "sǝdıɔǝᴚuǝpɹɐbɹǝpun",
18911896
"config.gtceu.option.universalHazards": "spɹɐzɐHןɐsɹǝʌıun",
18921897
"config.gtceu.option.updateIntervals": "sןɐʌɹǝʇuIǝʇɐpdn",
18931898
"config.gtceu.option.useVBO": "OᗺΛǝsn",

src/generated/resources/assets/gtceu/lang/en_us.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1731,13 +1731,16 @@
17311731
"command.gtceu.share_prospection_data.notification": "%s is sharing prospecting data with you!",
17321732
"config.gtceu.option.addLoot": "addLoot",
17331733
"config.gtceu.option.ae2": "ae2",
1734+
"config.gtceu.option.alexsCavesRecipes": "alexsCavesRecipes",
17341735
"config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "allowDrumsInputFluidsFromOutputSide",
17351736
"config.gtceu.option.animationTime": "animationTime",
17361737
"config.gtceu.option.arcRecyclingYield": "arcRecyclingYield",
17371738
"config.gtceu.option.armorHud": "armorHud",
17381739
"config.gtceu.option.batchDuration": "batchDuration",
17391740
"config.gtceu.option.bedrockOreDistance": "bedrockOreDistance",
17401741
"config.gtceu.option.bedrockOreDropTagPrefix": "bedrockOreDropTagPrefix",
1742+
"config.gtceu.option.biomesOPlentyRecipes": "biomesOPlentyRecipes",
1743+
"config.gtceu.option.biomesWeveGoneRecipes": "biomesWeveGoneRecipes",
17411744
"config.gtceu.option.borderColor": "borderColor",
17421745
"config.gtceu.option.bronzeBoilerHeatSpeed": "bronzeBoilerHeatSpeed",
17431746
"config.gtceu.option.bronzeBoilerMaxTemperature": "bronzeBoilerMaxTemperature",
@@ -1749,6 +1752,7 @@
17491752
"config.gtceu.option.coloredWireOutline": "coloredWireOutline",
17501753
"config.gtceu.option.compat": "compat",
17511754
"config.gtceu.option.createCompat": "createCompat",
1755+
"config.gtceu.option.createRecipes": "createRecipes",
17521756
"config.gtceu.option.debug": "debug",
17531757
"config.gtceu.option.debugWorldgen": "debugWorldgen",
17541758
"config.gtceu.option.defaultPaintingColor": "defaultPaintingColor",
@@ -1888,6 +1892,7 @@
18881892
"config.gtceu.option.treeFellingDelay": "treeFellingDelay",
18891893
"config.gtceu.option.tungstensteelBoilerHeatSpeed": "tungstensteelBoilerHeatSpeed",
18901894
"config.gtceu.option.tungstensteelBoilerMaxTemperature": "tungstensteelBoilerMaxTemperature",
1895+
"config.gtceu.option.undergardenRecipes": "undergardenRecipes",
18911896
"config.gtceu.option.universalHazards": "universalHazards",
18921897
"config.gtceu.option.updateIntervals": "updateIntervals",
18931898
"config.gtceu.option.useVBO": "useVBO",

src/main/java/com/gregtechceu/gtceu/api/GTValues.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,12 @@ public static int[] tiersBetween(int minInclusive, int maxInclusive) {
141141
MODID_FTB_QUEST = "ftbquests",
142142
MODID_CCTWEAKED = "computercraft",
143143
MODID_ENDERIO = "enderio",
144-
MODID_ENSORCELLATION = "ensorcellation";
144+
MODID_ENSORCELLATION = "ensorcellation",
145+
MODID_ALEXSCAVES = "alexscaves",
146+
MODID_BOP = "biomesoplenty",
147+
MODID_BWG = "biomeswevegone",
148+
MODID_LETS_DO_BLOOMINGNATURE = "bloomingnature",
149+
MODID_UNDERGARDEN = "undergarden";
145150

146151
/**
147152
* Spray painting compat modids

src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,10 @@ public static class CompatibilityConfigs {
170170
@Configurable.Comment("Config options regarding GTCEu compatibility with minimap mods")
171171
public MinimapCompatConfig minimap = new MinimapCompatConfig();
172172

173+
@Configurable
174+
@Configurable.Comment("Config options regarding GTEU compatibility with other mods by changing their recipes")
175+
public RecipeCompatConfig recipes = new RecipeCompatConfig();
176+
173177
@Configurable
174178
@Configurable.Comment({ "Whether to hide facades of all blocks in JEI and creative search menu.",
175179
"Default: true" })
@@ -352,6 +356,31 @@ public int getBorderColor(int materialColor) {
352356
}
353357
}
354358
}
359+
360+
public static class RecipeCompatConfig {
361+
362+
// Will only be loaded if each mod is detected, so all default to true
363+
364+
@Configurable
365+
@Configurable.Comment({ "Include Alex's Caves in recipe changes" })
366+
public boolean alexsCavesRecipes = true;
367+
368+
@Configurable
369+
@Configurable.Comment({ "Include Biomes O' Plenty in recipe changes" })
370+
public boolean biomesOPlentyRecipes = true;
371+
372+
@Configurable
373+
@Configurable.Comment({ "Include Oh The Biomes We've Gone in recipe changes" })
374+
public boolean biomesWeveGoneRecipes = true;
375+
376+
@Configurable
377+
@Configurable.Comment({ "Include Create in recipe changes" })
378+
public boolean createRecipes = true;
379+
380+
@Configurable
381+
@Configurable.Comment({ "Include The Undergarden in recipe changes" })
382+
public boolean undergardenRecipes = true;
383+
}
355384
}
356385

357386
public static class WorldGenConfigs {

src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeAddition.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.gregtechceu.gtceu.data.recipe.configurable;
22

3+
import com.gregtechceu.gtceu.GTCEu;
34
import com.gregtechceu.gtceu.api.GTValues;
45
import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper;
56
import com.gregtechceu.gtceu.api.data.chemical.material.Material;
@@ -11,6 +12,8 @@
1112
import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines;
1213
import com.gregtechceu.gtceu.config.ConfigHolder;
1314
import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper;
15+
import com.gregtechceu.gtceu.data.recipe.misc.compat.CreateRecipes;
16+
import com.gregtechceu.gtceu.data.recipe.misc.compat.UndergardenRecipes;
1417

1518
import net.minecraft.core.registries.BuiltInRegistries;
1619
import net.minecraft.data.recipes.FinishedRecipe;
@@ -552,6 +555,14 @@ private static void hardRedstoneRecipes(Consumer<FinishedRecipe> provider) {
552555
.outputItems(new ItemStack(Items.TARGET))
553556
.duration(200).EUt(120).save(provider);
554557

558+
if (GTCEu.isModLoaded(GTValues.MODID_CREATE) && ConfigHolder.INSTANCE.compat.recipes.createRecipes) {
559+
CreateRecipes.hardRedstoneRecipes(provider);
560+
}
561+
if (GTCEu.isModLoaded(GTValues.MODID_UNDERGARDEN) &&
562+
ConfigHolder.INSTANCE.compat.recipes.undergardenRecipes) {
563+
UndergardenRecipes.hardRedstoneRecipes(provider);
564+
}
565+
555566
} else {
556567
VanillaRecipeHelper.addShapedRecipe(provider, "piston_bronze", new ItemStack(Blocks.PISTON, 1), "WWW",
557568
"CBC", "CRC",

src/main/java/com/gregtechceu/gtceu/data/recipe/configurable/RecipeRemoval.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.gregtechceu.gtceu.data.recipe.configurable;
22

3+
import com.gregtechceu.gtceu.GTCEu;
4+
import com.gregtechceu.gtceu.api.GTValues;
35
import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterial;
46
import com.gregtechceu.gtceu.api.data.chemical.material.MarkerMaterials;
57
import com.gregtechceu.gtceu.config.ConfigHolder;
@@ -164,6 +166,16 @@ private static void hardRedstoneRecipes(Consumer<ResourceLocation> registry) {
164166
registry.accept(new ResourceLocation("minecraft:stone_button"));
165167
registry.accept(new ResourceLocation("minecraft:polished_blackstone_button"));
166168
registry.accept(new ResourceLocation("minecraft:calibrated_sculk_sensor"));
169+
if (GTCEu.isModLoaded(GTValues.MODID_CREATE) && ConfigHolder.INSTANCE.compat.recipes.createRecipes) {
170+
registry.accept(new ResourceLocation("create:crafting/logistics/pulse_repeater"));
171+
registry.accept(new ResourceLocation("create:crafting/logistics/pulse_extender"));
172+
registry.accept(new ResourceLocation("create:crafting/logistics/pulse_timer"));
173+
registry.accept(new ResourceLocation("create:crafting/logistics/powered_latch"));
174+
registry.accept(new ResourceLocation("create:crafting/logistics/powered_toggle_latch"));
175+
}
176+
if (GTCEu.isModLoaded(GTValues.MODID_UNDERGARDEN) && ConfigHolder.INSTANCE.compat.recipes.undergardenRecipes) {
177+
registry.accept(new ResourceLocation("undergarden:sticky_piston_from_goo_ball"));
178+
}
167179
}
168180

169181
private static void hardToolArmorRecipes(Consumer<ResourceLocation> registry) {

0 commit comments

Comments
 (0)