Skip to content

Commit 2e2409d

Browse files
tier940tier940
committed
Fix Implosion logic
1 parent d36a3db commit 2e2409d

File tree

6 files changed

+109
-82
lines changed

6 files changed

+109
-82
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 2.5.6
2+
- Fix Implosion logic
3+
4+
* * *
5+
16
# 2.5.5
27
- Fix FluixBlock OreDictionary
38

‎dependencies.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ dependencies {
5454
transitive = false
5555
} // Version 1.1.3
5656
implementation rfg.deobf("curse.maven:ae2-extended-life-570458:6302098") // AE2UEL 0.56.7
57-
implementation rfg.deobf("curse.maven:nae2-884359:5380800") // NAE2: 1.6.4
58-
implementation rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5751930") // AE2FC: 2.6.6-r
5957

60-
compileOnly "curse.maven:forgelin-continuous-456403:7182824" // Forgelin-Continuous 2.2.21.0
58+
compileOnly "curse.maven:nae2-884359:5380800" // NAE2: 1.6.4
59+
compileOnly "curse.maven:ae2-fluid-crafting-rework-623955:5751930" // AE2FC: 2.6.6-r
60+
compileOnly "curse.maven:forgelin-continuous-456403:7182824" // Forgelin-Continuous 2.2.21.0
6161
compileOnly "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.700" // CrT 4.1.20.700
6262
compileOnly "curse.maven:ctm-267602:2915363" // CTM 1.0.2.31
6363
runtimeOnly "com.cleanroommc:modularui:2.4.3" // MUI 2.4.3

‎src/main/java/com/github/gtexpert/core/api/unification/material/ingredients/AEFirstDegreeMaterials.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
import gregtech.api.fluids.FluidBuilder;
1111
import gregtech.api.unification.material.Material;
12-
import gregtech.api.unification.material.Materials;
1312
import gregtech.api.unification.material.info.MaterialIconSet;
1413
import gregtech.api.unification.material.properties.BlastProperty.GasTier;
1514
import gregtech.api.unification.ore.OrePrefix;
@@ -23,7 +22,7 @@ public class AEFirstDegreeMaterials {
2322
*/
2423
public static void init() {
2524
// Certus Quartz
26-
OrePrefix.block.modifyMaterialAmount(Materials.CertusQuartz, 4);
25+
OrePrefix.block.modifyMaterialAmount(CertusQuartz, 4);
2726

2827
// Charged Certus Quartz
2928
ChargedCertusQuartz = new Material.Builder(24151, gteId("charged_certus_quartz"))

‎src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEMaterialsRecipe.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,8 @@ public static void init() {
300300
.chancedOutput(Mods.AppliedEnergistics2.getItem("material", 1, 7), 7000, 1000)
301301
.duration(1200).EUt(24)
302302
.buildAndRegister();
303-
GTEImplosionRecipeHandler.add(GTEMaterials.Fluix, Mods.AppliedEnergistics2.getItem("material", 3, 7));
303+
GTEImplosionRecipeHandler.add(GTEMaterials.Fluix,
304+
Mods.AppliedEnergistics2.getItem("material", 3, 7));
304305

305306
// Block
306307
RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder()

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

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.github.gtexpert.core.loaders.recipe.handlers;
22

3-
import static gregtech.api.unification.ore.OrePrefix.block;
3+
import static gregtech.api.unification.ore.OrePrefix.*;
4+
5+
import gregtech.api.unification.material.Materials;
46

57
import net.minecraft.item.ItemStack;
68

@@ -12,23 +14,26 @@
1214
public class GTEImplosionNoBombRecipeHandler {
1315

1416
public static void add(Material inputMaterial, Material outputMaterial) {
15-
INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
16-
.input(block, inputMaterial, 4)
17-
.output(block, outputMaterial, 3)
17+
INBRecipeMaps.FAKE_IMPLOSION_RECIPES.recipeBuilder()
18+
.input(dust, inputMaterial, 4)
19+
.output(gem, outputMaterial, 3)
20+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
1821
.buildAndRegister();
1922
}
2023

2124
public static void add(Material inputMaterial, ItemStack outputStack) {
22-
INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
23-
.input(block, inputMaterial, 4)
25+
INBRecipeMaps.FAKE_IMPLOSION_RECIPES.recipeBuilder()
26+
.input(dust, inputMaterial, 4)
2427
.outputs(GTUtility.copy(3, outputStack))
28+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
2529
.buildAndRegister();
2630
}
2731

2832
public static void add(String inputOreDict, ItemStack outputStack) {
29-
INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
33+
INBRecipeMaps.FAKE_IMPLOSION_RECIPES.recipeBuilder()
3034
.input(inputOreDict, 4)
3135
.outputs(GTUtility.copy(3, outputStack))
36+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
3237
.buildAndRegister();
3338
}
3439
}

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

Lines changed: 86 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import static gregtech.api.unification.ore.OrePrefix.*;
44

5+
import gregtech.api.unification.material.Materials;
6+
57
import net.minecraft.item.ItemStack;
68

79
import gregtech.api.recipes.RecipeMaps;
@@ -15,80 +17,95 @@
1517
public class GTEImplosionRecipeHandler {
1618

1719
public static void add(Material inputMaterial, Material outputMaterial) {
18-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
19-
.input(dust, inputMaterial, 4)
20-
.output(gem, outputMaterial, 3)
21-
.explosivesType(new ItemStack(MetaBlocks.POWDERBARREL, 8))
22-
.buildAndRegister();
23-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
24-
.input(dust, inputMaterial, 4)
25-
.output(gem, outputMaterial, 3)
26-
.explosivesAmount(4)
27-
.buildAndRegister();
28-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
29-
.input(dust, inputMaterial, 4)
30-
.output(gem, outputMaterial, 3)
31-
.explosivesType(MetaItems.DYNAMITE.getStackForm(2))
32-
.buildAndRegister();
33-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
34-
.input(dust, inputMaterial, 4)
35-
.output(gem, outputMaterial, 3)
36-
.explosivesType(new ItemStack(MetaBlocks.ITNT))
37-
.buildAndRegister();
38-
39-
if (!Mods.ImplosionNoBomb.isModLoaded()) return;
40-
GTEImplosionNoBombRecipeHandler.add(inputMaterial, outputMaterial);
20+
if (Mods.ImplosionNoBomb.isModLoaded()) {
21+
GTEImplosionNoBombRecipeHandler.add(inputMaterial, outputMaterial);
22+
} else {
23+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
24+
.input(dust, inputMaterial, 4)
25+
.output(gem, outputMaterial, 3)
26+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
27+
.explosivesType(new ItemStack(MetaBlocks.POWDERBARREL, 8))
28+
.buildAndRegister();
29+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
30+
.input(dust, inputMaterial, 4)
31+
.output(gem, outputMaterial, 3)
32+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
33+
.explosivesAmount(4)
34+
.buildAndRegister();
35+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
36+
.input(dust, inputMaterial, 4)
37+
.output(gem, outputMaterial, 3)
38+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
39+
.explosivesType(MetaItems.DYNAMITE.getStackForm(2))
40+
.buildAndRegister();
41+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
42+
.input(dust, inputMaterial, 4)
43+
.output(gem, outputMaterial, 3)
44+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
45+
.explosivesType(new ItemStack(MetaBlocks.ITNT))
46+
.buildAndRegister();
47+
}
4148
}
4249

4350
public static void add(Material inputMaterial, ItemStack outputStack) {
44-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
45-
.input(dust, inputMaterial, 4)
46-
.outputs(GTUtility.copy(3, outputStack))
47-
.explosivesType(new ItemStack(MetaBlocks.POWDERBARREL, 8))
48-
.buildAndRegister();
49-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
50-
.input(dust, inputMaterial, 4)
51-
.outputs(GTUtility.copy(3, outputStack))
52-
.explosivesAmount(4)
53-
.buildAndRegister();
54-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
55-
.input(dust, inputMaterial, 4)
56-
.outputs(outputStack)
57-
.explosivesType(MetaItems.DYNAMITE.getStackForm(2))
58-
.buildAndRegister();
59-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
60-
.input(dust, inputMaterial, 4)
61-
.outputs(GTUtility.copy(3, outputStack))
62-
.explosivesType(new ItemStack(MetaBlocks.ITNT))
63-
.buildAndRegister();
64-
65-
if (!Mods.ImplosionNoBomb.isModLoaded()) return;
66-
GTEImplosionNoBombRecipeHandler.add(inputMaterial, outputStack);
51+
if (Mods.ImplosionNoBomb.isModLoaded()) {
52+
GTEImplosionNoBombRecipeHandler.add(inputMaterial, outputStack);
53+
} else {
54+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
55+
.input(dust, inputMaterial, 4)
56+
.outputs(GTUtility.copy(3, outputStack))
57+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
58+
.explosivesType(new ItemStack(MetaBlocks.POWDERBARREL, 8))
59+
.buildAndRegister();
60+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
61+
.input(dust, inputMaterial, 4)
62+
.outputs(GTUtility.copy(3, outputStack))
63+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
64+
.explosivesAmount(4)
65+
.buildAndRegister();
66+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
67+
.input(dust, inputMaterial, 4)
68+
.outputs(GTUtility.copy(3, outputStack))
69+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
70+
.explosivesType(MetaItems.DYNAMITE.getStackForm(2))
71+
.buildAndRegister();
72+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
73+
.input(dust, inputMaterial, 4)
74+
.outputs(GTUtility.copy(3, outputStack))
75+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
76+
.explosivesType(new ItemStack(MetaBlocks.ITNT))
77+
.buildAndRegister();
78+
}
6779
}
6880

6981
public static void add(String inputOreDict, ItemStack outputStack) {
70-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
71-
.input(inputOreDict, 4)
72-
.outputs(GTUtility.copy(3, outputStack))
73-
.explosivesType(new ItemStack(MetaBlocks.POWDERBARREL, 8))
74-
.buildAndRegister();
75-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
76-
.input(inputOreDict, 4)
77-
.outputs(GTUtility.copy(3, outputStack))
78-
.explosivesAmount(4)
79-
.buildAndRegister();
80-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
81-
.input(inputOreDict, 4)
82-
.outputs(GTUtility.copy(3, outputStack))
83-
.explosivesType(MetaItems.DYNAMITE.getStackForm(2))
84-
.buildAndRegister();
85-
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
86-
.input(inputOreDict, 4)
87-
.outputs(GTUtility.copy(3, outputStack))
88-
.explosivesType(new ItemStack(MetaBlocks.ITNT))
89-
.buildAndRegister();
90-
91-
if (!Mods.ImplosionNoBomb.isModLoaded()) return;
92-
GTEImplosionNoBombRecipeHandler.add(inputOreDict, outputStack);
82+
if (Mods.ImplosionNoBomb.isModLoaded()) {
83+
GTEImplosionNoBombRecipeHandler.add(inputOreDict, outputStack);
84+
} else {
85+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
86+
.input(inputOreDict, 4)
87+
.outputs(GTUtility.copy(3, outputStack))
88+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
89+
.explosivesType(new ItemStack(MetaBlocks.POWDERBARREL, 8))
90+
.buildAndRegister();
91+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
92+
.input(inputOreDict, 4)
93+
.outputs(GTUtility.copy(3, outputStack))
94+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
95+
.explosivesAmount(4)
96+
.buildAndRegister();
97+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
98+
.input(inputOreDict, 4)
99+
.outputs(GTUtility.copy(3, outputStack))
100+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
101+
.explosivesType(MetaItems.DYNAMITE.getStackForm(2))
102+
.buildAndRegister();
103+
RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
104+
.input(inputOreDict, 4)
105+
.outputs(GTUtility.copy(3, outputStack))
106+
.chancedOutput(dust, Materials.DarkAsh, 2500, 0)
107+
.explosivesType(new ItemStack(MetaBlocks.ITNT))
108+
.buildAndRegister();
109+
}
93110
}
94111
}

0 commit comments

Comments
 (0)