Skip to content

Commit 5d8ba9b

Browse files
authored
Fix recipe conflict with GTFO (#8)
1 parent 4b11b7e commit 5d8ba9b

6 files changed

Lines changed: 90 additions & 0 deletions

File tree

dependencies.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,9 @@ dependencies {
8383
if (project.debug_all.toBoolean() || project.debug_gcym.toBoolean()) {
8484
runtimeOnlyNonPublishable rfg.deobf("curse.maven:gregicality-multiblocks-564858:5619513")
8585
}
86+
87+
// debug GTFO
88+
if (project.debug_all.toBoolean() || project.debug_gtfo.toBoolean()) {
89+
runtimeOnlyNonPublishable rfg.deobf("curse.maven:gregtech-food-option-477021:5487400") // GTFO 1.11.2.1
90+
}
8691
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ debug_forestry = false
2727
debug_gendustry = false
2828
debug_binnies = false
2929
debug_gcym = false
30+
debug_gtfo = false
3031

3132
# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
3233
# restart Minecraft in development. Choose this dependent on your mod:
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.github.gtexpert.gtbm.integration.gtfo;
2+
3+
import net.minecraftforge.common.config.Config;
4+
5+
import com.github.gtexpert.gtbm.api.ModValues;
6+
import com.github.gtexpert.gtbm.module.Modules;
7+
8+
@Config.LangKey(ModValues.MODID + ".config.integration.gtfo")
9+
@Config(modid = ModValues.MODID,
10+
name = ModValues.MODID + "/integration/" + Modules.MODULE_GTFO,
11+
category = "GTFO")
12+
public class GTFOConfigHolder {}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.github.gtexpert.gtbm.integration.gtfo;
2+
3+
import net.minecraft.item.crafting.IRecipe;
4+
import net.minecraftforge.event.RegistryEvent;
5+
6+
import com.github.gtexpert.gtbm.api.ModValues;
7+
import com.github.gtexpert.gtbm.api.modules.TModule;
8+
import com.github.gtexpert.gtbm.api.util.Mods;
9+
import com.github.gtexpert.gtbm.integration.GTBMIntegrationSubmodule;
10+
import com.github.gtexpert.gtbm.integration.gtfo.recipes.GTFOOverrideRecipe;
11+
import com.github.gtexpert.gtbm.module.Modules;
12+
13+
@TModule(
14+
moduleID = Modules.MODULE_GTFO,
15+
containerID = ModValues.MODID,
16+
modDependencies = Mods.Names.GREGTECH_FOOD_OPTION,
17+
name = "GTBeesMatrix Gregtech Food Option Integration",
18+
description = "Gregtech Food Option Integration Module")
19+
public class GTFOModule extends GTBMIntegrationSubmodule {
20+
21+
@Override
22+
public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
23+
GTFOOverrideRecipe.init();
24+
}
25+
}
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
package com.github.gtexpert.gtbm.integration.gtfo.recipes;
2+
3+
import net.minecraft.init.Items;
4+
import net.minecraft.item.ItemStack;
5+
6+
import gregtech.api.recipes.GTRecipeHandler;
7+
import gregtech.api.recipes.RecipeMaps;
8+
9+
import com.github.gtexpert.gtbm.api.util.Mods;
10+
11+
import forestry.core.fluids.Fluids;
12+
13+
public class GTFOOverrideRecipe {
14+
15+
public static void init() {
16+
GTRecipeHandler.removeRecipesByInputs(RecipeMaps.EXTRACTOR_RECIPES, new ItemStack(Items.APPLE));
17+
GTRecipeHandler.removeRecipesByInputs(RecipeMaps.EXTRACTOR_RECIPES, new ItemStack(Items.CARROT));
18+
19+
// Forestry Recipe
20+
RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder()
21+
.input(Items.APPLE)
22+
.circuitMeta(1)
23+
.chancedOutput(Mods.Forestry.getItem("mulch"), 2000, 0)
24+
.fluidOutputs(Fluids.JUICE.getFluid(200))
25+
.EUt(7).duration(32).buildAndRegister();
26+
27+
RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder()
28+
.input(Items.CARROT)
29+
.circuitMeta(1)
30+
.chancedOutput(Mods.Forestry.getItem("mulch"), 2000, 0)
31+
.fluidOutputs(Fluids.JUICE.getFluid(200))
32+
.EUt(7).duration(32).buildAndRegister();
33+
34+
// GTFO Recipe
35+
RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder().EUt(1920).duration(200)
36+
.input(Items.CARROT)
37+
.circuitMeta(2)
38+
.outputs(Mods.GregTechFoodOption.getItem("gtfo_meta_item", 1, 52))
39+
.buildAndRegister();
40+
RecipeMaps.EXTRACTOR_RECIPES.recipeBuilder().EUt(1920).duration(200)
41+
.input(Items.APPLE)
42+
.circuitMeta(2)
43+
.outputs(Mods.GregTechFoodOption.getItem("gtfo_meta_item", 1, 53))
44+
.buildAndRegister();
45+
}
46+
}

src/main/java/com/github/gtexpert/gtbm/module/Modules.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public class Modules implements IModuleContainer {
2121
public static final String MODULE_EXTREES = "extratrees_integration";
2222
public static final String MODULE_GENETICS = "genetics_integration";
2323
public static final String MODULE_TC = "tc_integration";
24+
public static final String MODULE_GTFO = "gtfo_integration";
2425

2526
@Override
2627
public String getID() {

0 commit comments

Comments
 (0)