Merge pull request #297 from GTModpackTeam/fix-296

tier940 · web-flow · commit c9d94bade2bf · 2024-09-16T21:07:14.000+09:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -91,6 +91,7 @@ jobs:
             mixin-booter(required)
             gregtech-ce-unofficial(required)
             gregicality-multiblocks(required)
+            implosionnobomb(recommended)
             ae2-extended-life(recommended)
             ae-additions-extra-cells-2-fork(recommended)
             nae2(recommended)
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# v2.3.1
+- Hotfix a mistake when splitting into INBs [#296](https://github.com/GTModpackTeam/GTExpert-Core/pull/296)
+
+* * *
+
 # v2.3.0
 - Separate Electric Implosion Compressor changes to [ImplosionNoBomb](https://www.curseforge.com/minecraft/mc-mods/implosionnobomb)
     - Thanks to @MrKono for his support!!
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -58,6 +58,12 @@ dependencies {
         devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5411078")) // AE2UEL 0.56.6
     }
 
+    // Debug ImplosionNoBomb
+    compileOnly rfg.deobf("curse.maven:implosionnobomb-1094386:5680426") // ImplosionNoBomb 1.0.0
+    if (project.debug_all.toBoolean() || project.debug_inb.toBoolean()) {
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5680426")
+    }
+
     // Debug AE Additions
     if (project.debug_all.toBoolean() || project.debug_aea.toBoolean()) {
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:ae-additions-extra-cells-2-fork-493962:3814371") // AEAdditions 1.3.8
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ modGroup = gtexpert
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 2.3.0-beta
+modVersion = 2.3.0-beta
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = true
@@ -27,6 +27,7 @@ useAE2uelExtended = false
 
 # Debug mod compatibility
 debug_all = false
+debug_inb = false
 debug_aea = false
 debug_nae2 = false
 debug_extracpus = false
diff --git a/src/main/java/gtexpert/GTExpertMod.java b/src/main/java/gtexpert/GTExpertMod.java
@@ -35,7 +35,8 @@
      version = Tags.VERSION,
      updateJSON = "https://forge.curseupdate.com/851103/gtexpert",
      dependencies = GTInternalTags.DEP_VERSION_STRING + "required-after:" + Mods.Names.MIXINBOOTER + ";" +
-             "required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" +
+             "required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" + "after:" + Mods.Names.IMPLOSION_NO_BOMB +
+             ";" +
              "after:" + Mods.Names.GREGTECH_FOOD_OPTION + ";" + "after:" + Mods.Names.APPLIED_ENERGISTICS2 + ";" +
              "after:" + Mods.Names.AE_ADDITIONS + ";" + "after:" + Mods.Names.AE2_FLUID_CRAFTING + ";" +
              "after:" + Mods.Names.NEEVES_AE2 + ";" + "after:" + Mods.Names.EXTRA_CPUS + ";" +
diff --git a/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java b/src/main/java/gtexpert/api/recipes/GTERecipeMaps.java
@@ -1,16 +1,11 @@
 package gtexpert.api.recipes;
 
-import static gregtech.api.GTValues.*;
-import static gregtech.api.unification.ore.OrePrefix.dust;
-
 import net.minecraft.init.SoundEvents;
 
 import gregtech.api.gui.GuiTextures;
 import gregtech.api.gui.widgets.ProgressWidget;
 import gregtech.api.recipes.RecipeMap;
-import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.recipes.builders.SimpleRecipeBuilder;
-import gregtech.api.unification.material.Materials;
 import gregtech.core.sound.GTSoundEvents;
 
 import gtexpert.api.gui.GTEGuiTextures;
@@ -52,20 +47,6 @@ public class GTERecipeMaps {
                     .setProgressBar(GuiTextures.PROGRESS_BAR_GAS_COLLECTOR, ProgressWidget.MoveType.HORIZONTAL)
                     .setSound(GTSoundEvents.COOLING);
 
-    @ZenProperty
-    public static final RecipeMap<SimpleRecipeBuilder> ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES = new RecipeMap<>(
-            "electric_implosion_compressor", 6, 2, 0, 0,
-            new SimpleRecipeBuilder().duration(1).EUt(VA[UV]).chancedOutput(dust, Materials.DarkAsh, 2500, 0), false)
-                    .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2)
-                    .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2)
-                    .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2)
-                    .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2)
-                    .setSlotOverlay(false, false, false, GuiTextures.IMPLOSION_OVERLAY_2)
-                    .setSlotOverlay(false, false, true, GuiTextures.IMPLOSION_OVERLAY_2)
-                    .setSlotOverlay(true, false, true, GuiTextures.DUST_OVERLAY)
-                    .setSound(SoundEvents.ENTITY_GENERIC_EXPLODE)
-                    .setSmallRecipeMap(RecipeMaps.IMPLOSION_RECIPES);
-
     @ZenProperty
     public static final RecipeMap<SimpleRecipeBuilder> STEAM_MIXER_RECIPES = new RecipeMap<>(
             "steam_mixer", 6, 2, 0, 0, new SimpleRecipeBuilder(), false)
diff --git a/src/main/java/gtexpert/api/util/Mods.java b/src/main/java/gtexpert/api/util/Mods.java
@@ -77,6 +77,7 @@ public enum Mods {
     GregTechExpertCore(GTEValues.MODID),
     GroovyScript(Names.GROOVY_SCRIPT),
     HWYLA(Names.HWYLA),
+    ImplosionNoBomb(Names.IMPLOSION_NO_BOMB),
     InventoryTweaks(Names.INVENTORY_TWEAKS),
     JourneyMap(Names.JOURNEY_MAP),
     JustEnoughItems(Names.JUST_ENOUGH_ITEMS),
@@ -171,6 +172,7 @@ public static class Names {
         public static final String GREGTECH_FOOD_OPTION = "gregtechfoodoption";
         public static final String GROOVY_SCRIPT = "groovyscript";
         public static final String HWYLA = "hwyla";
+        public static final String IMPLOSION_NO_BOMB = "inb";
         public static final String INVENTORY_TWEAKS = "inventorytweaks";
         public static final String JOURNEY_MAP = "journeymap";
         public static final String JUST_ENOUGH_ITEMS = "jei";
diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java b/src/main/java/gtexpert/integration/ae/recipes/AEMaterialsRecipe.java
@@ -3,7 +3,6 @@
 import static gregtech.api.GTValues.*;
 import static gregtech.api.unification.ore.OrePrefix.*;
 import static gtexpert.integration.deda.recipes.DraconicMaterialsRecipe.ABFDurationMultiplier;
-import static gtexpert.loaders.recipe.handlers.GTEMaterialRecipeHandler.addImplosionRecipes;
 
 import gregtech.api.recipes.ModHandler;
 import gregtech.api.recipes.RecipeMaps;
@@ -23,6 +22,7 @@
 import gtexpert.api.GTEValues;
 import gtexpert.api.unification.material.GTEMaterials;
 import gtexpert.api.util.Mods;
+import gtexpert.loaders.recipe.handlers.GTEImplosionRecipeHandler;
 
 public class AEMaterialsRecipe {
 
@@ -245,7 +245,8 @@ public static void init() {
                 .chancedOutput(Mods.AppliedEnergistics2.getItem("material", 1, 1), 7000, 1000)
                 .duration(1200).EUt(24)
                 .buildAndRegister();
-        addImplosionRecipes(GTEMaterials.ChargedCertusQuartz, Mods.AppliedEnergistics2.getItem("material", 3, 1));
+        GTEImplosionRecipeHandler.add(GTEMaterials.ChargedCertusQuartz,
+                Mods.AppliedEnergistics2.getItem("material", 3, 1));
 
         // Lens
         RecipeMaps.LATHE_RECIPES.recipeBuilder()
@@ -295,7 +296,7 @@ public static void init() {
                 .chancedOutput(Mods.AppliedEnergistics2.getItem("material", 1, 7), 7000, 1000)
                 .duration(1200).EUt(24)
                 .buildAndRegister();
-        addImplosionRecipes(GTEMaterials.Fluix, Mods.AppliedEnergistics2.getItem("material", 3, 7));
+        GTEImplosionRecipeHandler.add(GTEMaterials.Fluix, Mods.AppliedEnergistics2.getItem("material", 3, 7));
 
         // Block
         RecipeMaps.COMPRESSOR_RECIPES.recipeBuilder()
diff --git a/src/main/java/gtexpert/integration/deda/DEDAModule.java b/src/main/java/gtexpert/integration/deda/DEDAModule.java
@@ -51,5 +51,8 @@ public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
         // Draconic upgrade recipes
         DraconicTierupRecipe.init();
         DraconicUpgradeRecipe.init();
+
+        if (!Mods.ImplosionNoBomb.isModLoaded()) return;
+        DraconicImplosionMaterialsRecipe.init();
     }
 }
diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java b/src/main/java/gtexpert/integration/deda/recipes/DraconicImplosionMaterialsRecipe.java
@@ -0,0 +1,19 @@
+package gtexpert.integration.deda.recipes;
+
+import static gregtech.api.unification.ore.OrePrefix.block;
+
+import com.brandon3055.draconicevolution.DEFeatures;
+import com.github.gtexpert.inb.api.recipes.INBRecipeMaps;
+
+import gtexpert.api.unification.material.GTEMaterials;
+
+public class DraconicImplosionMaterialsRecipe {
+
+    public static void init() {
+        INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
+                .input(DEFeatures.dragonHeart, 1)
+                .input(block, GTEMaterials.Draconium, 4)
+                .output(block, GTEMaterials.AwakenedDraconium, 3)
+                .buildAndRegister();
+    }
+}
diff --git a/src/main/java/gtexpert/integration/deda/recipes/DraconicMaterialsRecipe.java b/src/main/java/gtexpert/integration/deda/recipes/DraconicMaterialsRecipe.java
@@ -41,7 +41,6 @@
 import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey;
 
 import gtexpert.api.GTEValues;
-import gtexpert.api.recipes.GTERecipeMaps;
 import gtexpert.api.unification.material.GTEMaterials;
 import gtexpert.api.util.Mods;
 
@@ -151,11 +150,6 @@ public static void init() {
                 .output(block, GTEMaterials.AwakenedDraconium, 3)
                 .explosivesType(new ItemStack(MetaBlocks.ITNT))
                 .buildAndRegister();
-        GTERecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
-                .input(DEFeatures.dragonHeart, 1)
-                .input(block, GTEMaterials.Draconium, 4)
-                .output(block, GTEMaterials.AwakenedDraconium, 3)
-                .buildAndRegister();
 
         // Extended recipes
         List<Material> materials = new ArrayList<>(GregTechAPI.materialManager.getRegisteredMaterials());
diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOMaterialsRecipe.java b/src/main/java/gtexpert/integration/eio/recipes/EIOMaterialsRecipe.java
@@ -2,7 +2,6 @@
 
 import static gregtech.api.GTValues.VA;
 import static gregtech.api.unification.ore.OrePrefix.*;
-import static gtexpert.loaders.recipe.handlers.GTEMaterialRecipeHandler.addImplosionRecipes;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -17,6 +16,7 @@
 
 import gtexpert.api.GTEValues;
 import gtexpert.api.unification.material.GTEMaterials;
+import gtexpert.loaders.recipe.handlers.GTEImplosionRecipeHandler;
 
 import crazypants.enderio.base.init.ModObject;
 
@@ -191,7 +191,7 @@ public static void init() {
                 .chancedOutput(new ItemStack(ModObject.itemMaterial.getItemNN(), 1, 14), 7000, 1000)
                 .duration(1200).EUt(24)
                 .buildAndRegister();
-        addImplosionRecipes("itemPulsatingPowder", new ItemStack(ModObject.itemMaterial.getItemNN(), 3, 14));
+        GTEImplosionRecipeHandler.add("itemPulsatingPowder", new ItemStack(ModObject.itemMaterial.getItemNN(), 3, 14));
 
         // Vibrant Crystal
         RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
@@ -206,7 +206,7 @@ public static void init() {
                 .chancedOutput(new ItemStack(ModObject.itemMaterial.getItemNN(), 1, 15), 7000, 1000)
                 .duration(1200).EUt(24)
                 .buildAndRegister();
-        addImplosionRecipes("itemVibrantPowder", new ItemStack(ModObject.itemMaterial.getItemNN(), 3, 15));
+        GTEImplosionRecipeHandler.add("itemVibrantPowder", new ItemStack(ModObject.itemMaterial.getItemNN(), 3, 15));
 
         // Ender Crystal
         RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
@@ -221,7 +221,8 @@ public static void init() {
                 .chancedOutput(new ItemStack(ModObject.itemMaterial.getItemNN(), 1, 16), 7000, 1000)
                 .duration(1200).EUt(24)
                 .buildAndRegister();
-        addImplosionRecipes("itemEnderCrystalPowder", new ItemStack(ModObject.itemMaterial.getItemNN(), 3, 16));
+        GTEImplosionRecipeHandler.add("itemEnderCrystalPowder",
+                new ItemStack(ModObject.itemMaterial.getItemNN(), 3, 16));
 
         // Weather Crystal
         ModHandler.addShapedRecipe(true, "weather_crystal",
@@ -244,7 +245,7 @@ public static void init() {
                 .chancedOutput(new ItemStack(ModObject.itemMaterial.getItemNN(), 1, 19), 7000, 1000)
                 .duration(1200).EUt(24)
                 .buildAndRegister();
-        addImplosionRecipes("itemPrecientPowder", new ItemStack(ModObject.itemMaterial.getItemNN(), 3, 19));
+        GTEImplosionRecipeHandler.add("itemPrecientPowder", new ItemStack(ModObject.itemMaterial.getItemNN(), 3, 19));
     }
 
     public static void remove() {
diff --git a/src/main/java/gtexpert/loaders/recipe/CEUOverrideRecipe.java b/src/main/java/gtexpert/loaders/recipe/CEUOverrideRecipe.java
@@ -38,7 +38,6 @@
 import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys;
 import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey;
 
-import gtexpert.api.recipes.GTERecipeMaps;
 import gtexpert.common.items.GTEMetaItems;
 
 public class CEUOverrideRecipe {
@@ -55,9 +54,6 @@ private static void materials() {
         List<Material> materials = new ArrayList<>(GregTechAPI.materialManager.getRegisteredMaterials());
         materials.forEach(CEUOverrideRecipe::vacuumFreezerExtended);
 
-        // Electric Implosion Compressor
-        materials.forEach(CEUOverrideRecipe::electricImplosionRecipe);
-
         // Remove Gem (temp fix)
         materials.forEach(CEUOverrideRecipe::removeGem);
 
@@ -480,22 +476,6 @@ private static void vacuumFreezerExtended(@NotNull Material material) {
         }
     }
 
-    /**
-     * Electric Implosion Compressor recipes without explosives
-     *
-     * @param material The material to add recipes for
-     */
-    private static void electricImplosionRecipe(@NotNull Material material) {
-        if (!material.hasProperty(PropertyKey.GEM)) return;
-        if (material == Materials.Lapotron) return;
-        if (!material.hasFlag(EXPLOSIVE) && !material.hasFlag(FLAMMABLE)) {
-            GTERecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
-                    .input(dust, material, 4)
-                    .output(gem, material, 3)
-                    .buildAndRegister();
-        }
-    }
-
     /**
      * Remove gem recipes
      *
diff --git a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java b/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionNoBombRecipeHandler.java
@@ -0,0 +1,34 @@
+package gtexpert.loaders.recipe.handlers;
+
+import static gregtech.api.unification.ore.OrePrefix.block;
+
+import net.minecraft.item.ItemStack;
+
+import com.github.gtexpert.inb.api.recipes.INBRecipeMaps;
+
+import gregtech.api.unification.material.Material;
+import gregtech.api.util.GTUtility;
+
+public class GTEImplosionNoBombRecipeHandler {
+
+    public static void add(Material inputMaterial, Material outputMaterial) {
+        INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
+                .input(block, inputMaterial, 4)
+                .output(block, outputMaterial, 3)
+                .buildAndRegister();
+    }
+
+    public static void add(Material inputMaterial, ItemStack outputStack) {
+        INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
+                .input(block, inputMaterial, 4)
+                .outputs(GTUtility.copy(3, outputStack))
+                .buildAndRegister();
+    }
+
+    public static void add(String inputOreDict, ItemStack outputStack) {
+        INBRecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
+                .input(inputOreDict, 4)
+                .outputs(GTUtility.copy(3, outputStack))
+                .buildAndRegister();
+    }
+}
diff --git a/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionRecipeHandler.java b/src/main/java/gtexpert/loaders/recipe/handlers/GTEImplosionRecipeHandler.java
@@ -10,12 +10,11 @@
 import gregtech.common.blocks.MetaBlocks;
 import gregtech.common.items.MetaItems;
 
-import gtexpert.api.recipes.GTERecipeMaps;
+import gtexpert.api.util.Mods;
 
-public class GTEMaterialRecipeHandler {
-    // TODO: リファクタリング
+public class GTEImplosionRecipeHandler {
 
-    public static void addImplosionRecipes(Material inputMaterial, Material outputMaterial) {
+    public static void add(Material inputMaterial, Material outputMaterial) {
         RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
                 .input(dust, inputMaterial, 4)
                 .output(gem, outputMaterial, 3)
@@ -36,13 +35,12 @@ public static void addImplosionRecipes(Material inputMaterial, Material outputMa
                 .output(gem, outputMaterial, 3)
                 .explosivesType(new ItemStack(MetaBlocks.ITNT))
                 .buildAndRegister();
-        GTERecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
-                .input(dust, inputMaterial, 4)
-                .output(gem, outputMaterial, 3)
-                .buildAndRegister();
+
+        if (!Mods.ImplosionNoBomb.isModLoaded()) return;
+        GTEImplosionNoBombRecipeHandler.add(inputMaterial, outputMaterial);
     }
 
-    public static void addImplosionRecipes(Material inputMaterial, ItemStack outputStack) {
+    public static void add(Material inputMaterial, ItemStack outputStack) {
         RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
                 .input(dust, inputMaterial, 4)
                 .outputs(GTUtility.copy(3, outputStack))
@@ -63,13 +61,12 @@ public static void addImplosionRecipes(Material inputMaterial, ItemStack outputS
                 .outputs(GTUtility.copy(3, outputStack))
                 .explosivesType(new ItemStack(MetaBlocks.ITNT))
                 .buildAndRegister();
-        GTERecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
-                .input(dust, inputMaterial, 4)
-                .outputs(GTUtility.copy(3, outputStack))
-                .buildAndRegister();
+
+        if (!Mods.ImplosionNoBomb.isModLoaded()) return;
+        GTEImplosionNoBombRecipeHandler.add(inputMaterial, outputStack);
     }
 
-    public static void addImplosionRecipes(String inputOreDict, ItemStack outputStack) {
+    public static void add(String inputOreDict, ItemStack outputStack) {
         RecipeMaps.IMPLOSION_RECIPES.recipeBuilder()
                 .input(inputOreDict, 4)
                 .outputs(GTUtility.copy(3, outputStack))
@@ -90,9 +87,8 @@ public static void addImplosionRecipes(String inputOreDict, ItemStack outputStac
                 .outputs(GTUtility.copy(3, outputStack))
                 .explosivesType(new ItemStack(MetaBlocks.ITNT))
                 .buildAndRegister();
-        GTERecipeMaps.ELECTRIC_IMPLOSION_COMPRESSOR_RECIPES.recipeBuilder()
-                .input(inputOreDict, 4)
-                .outputs(GTUtility.copy(3, outputStack))
-                .buildAndRegister();
+
+        if (!Mods.ImplosionNoBomb.isModLoaded()) return;
+        GTEImplosionNoBombRecipeHandler.add(inputOreDict, outputStack);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,8 @@ public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {`
`51`	`51`	`// Draconic upgrade recipes`
`52`	`52`	`DraconicTierupRecipe.init();`
`53`	`53`	`DraconicUpgradeRecipe.init();`
	`54`	`+`
	`55`	`+ if (!Mods.ImplosionNoBomb.isModLoaded()) return;`
	`56`	`+ DraconicImplosionMaterialsRecipe.init();`
`54`	`57`	`}`
`55`	`58`	`}`