Skip to content

Commit fa00d18

Browse files
committed
Fix conflict ImplosionRecipe
1 parent fa8daf5 commit fa00d18

3 files changed

Lines changed: 15 additions & 57 deletions

File tree

src/main/java/com/github/gtexpert/core/integration/deda/recipes/DraconicMaterialsRecipe.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.brandon3055.draconicevolution.DEFeatures;
1010

1111
import gregtech.api.metatileentity.multiblock.CleanroomType;
12+
import gregtech.api.recipes.GTRecipeHandler;
1213
import gregtech.api.recipes.ModHandler;
1314
import gregtech.api.recipes.RecipeBuilder;
1415
import gregtech.api.recipes.RecipeMaps;
@@ -45,6 +46,8 @@ public static void init() {
4546
}
4647
builderDD.buildAndRegister();
4748

49+
GTRecipeHandler.removeRecipesByInputs(RecipeMaps.MACERATOR_RECIPES,
50+
new ItemStack(Blocks.DRAGON_EGG));
4851
RecipeMaps.MACERATOR_RECIPES.recipeBuilder()
4952
.input(Blocks.DRAGON_EGG)
5053
.output(dust, GTEMaterials.Dragon, 8)
@@ -60,6 +63,8 @@ public static void init() {
6063
.output(dust, GTEMaterials.Chaos, 2)
6164
.duration(1200).EUt(VA[GTEValues.dedaVoltageTier + 1])
6265
.buildAndRegister();
66+
GTRecipeHandler.removeRecipesByInputs(RecipeMaps.MACERATOR_RECIPES,
67+
new ItemStack(DEFeatures.chaosShard, 1, 1));
6368
RecipeMaps.MACERATOR_RECIPES.recipeBuilder()
6469
.inputs(new ItemStack(DEFeatures.chaosShard, 1, 1))
6570
.output(dust, GTEMaterials.Chaos, 1)

src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/main/java/com/github/gtexpert/core/loaders/recipe/handlers/GTEImplosionRecipeHandler.java

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import gregtech.common.blocks.MetaBlocks;
1515
import gregtech.common.items.MetaItems;
1616

17-
import com.github.gtexpert.core.api.util.Mods;
18-
1917
public class GTEImplosionRecipeHandler {
2018

2119
private static final Consumer<ImplosionRecipeBuilder>[] EXPLOSIVES = new Consumer[] {
@@ -26,34 +24,24 @@ public class GTEImplosionRecipeHandler {
2624
};
2725

2826
public static void add(Material inputMaterial, Material outputMaterial) {
29-
register(
30-
builder -> builder.input(dust, inputMaterial, 4).output(gem, outputMaterial, 3),
31-
() -> GTEImplosionNoBombRecipeHandler.add(inputMaterial, outputMaterial));
27+
register(builder -> builder.input(dust, inputMaterial, 4).output(gem, outputMaterial, 3));
3228
}
3329

3430
public static void add(Material inputMaterial, ItemStack outputStack) {
35-
register(
36-
builder -> builder.input(dust, inputMaterial, 4).outputs(GTUtility.copy(3, outputStack)),
37-
() -> GTEImplosionNoBombRecipeHandler.add(inputMaterial, outputStack));
31+
register(builder -> builder.input(dust, inputMaterial, 4).outputs(GTUtility.copy(3, outputStack)));
3832
}
3933

4034
public static void add(String inputOreDict, ItemStack outputStack) {
41-
register(
42-
builder -> builder.input(inputOreDict, 4).outputs(GTUtility.copy(3, outputStack)),
43-
() -> GTEImplosionNoBombRecipeHandler.add(inputOreDict, outputStack));
35+
register(builder -> builder.input(inputOreDict, 4).outputs(GTUtility.copy(3, outputStack)));
4436
}
4537

46-
private static void register(Consumer<ImplosionRecipeBuilder> recipeConfig, Runnable noBombHandler) {
47-
if (Mods.ImplosionNoBomb.isModLoaded()) {
48-
noBombHandler.run();
49-
} else {
50-
for (Consumer<ImplosionRecipeBuilder> explosive : EXPLOSIVES) {
51-
ImplosionRecipeBuilder builder = RecipeMaps.IMPLOSION_RECIPES.recipeBuilder();
52-
recipeConfig.accept(builder);
53-
builder.chancedOutput(dust, Materials.DarkAsh, 2500, 0);
54-
explosive.accept(builder);
55-
builder.buildAndRegister();
56-
}
38+
private static void register(Consumer<ImplosionRecipeBuilder> recipeConfig) {
39+
for (Consumer<ImplosionRecipeBuilder> explosive : EXPLOSIVES) {
40+
ImplosionRecipeBuilder builder = RecipeMaps.IMPLOSION_RECIPES.recipeBuilder();
41+
recipeConfig.accept(builder);
42+
builder.chancedOutput(dust, Materials.DarkAsh, 2500, 0);
43+
explosive.accept(builder);
44+
builder.buildAndRegister();
5745
}
5846
}
5947
}

0 commit comments

Comments
 (0)