Merge pull request #305 from GTModpackTeam/tier-cfg

tier940 · web-flow · commit d034079e1064 · 2025-01-02T23:48:28.000+09:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -106,7 +106,7 @@ jobs:
             draconic-evolution(recommended)
             draconicadditions(recommended)
             project-red-illumination(recommended)
-            avaritia-1-1x-kedition(recommended)
+            avaritia-1-1x-unofficial(recommended)
             thaumcraft(recommended)
             forestry(recommended)
             gendustry(recommended)
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -59,7 +59,6 @@ dependencies {
     }
 
     // Debug GTWoodProcessing
-    compileOnly rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776") // GTWoodProcessing 1.2.2
     if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) {
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776")
     }
@@ -70,7 +69,7 @@ dependencies {
         runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5731331")
     }
 
-    // Debug AE Additions
+    // Debug ExtraCells2 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
     }
@@ -154,7 +153,7 @@ dependencies {
 
     // Debug Avaritia
     if (project.debug_all.toBoolean() || project.debug_avaritia.toBoolean()) {
-        runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-kedition-913129:4777278") // Avaritia 1.1x Kedition 1.3
+        runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6029951") // Avaritia 1.1x UEL
     }
 
     // Debug Chisel
diff --git a/src/main/java/gtexpert/GTExpertMod.java b/src/main/java/gtexpert/GTExpertMod.java
@@ -25,6 +25,7 @@
 import gtexpert.api.GTEValues;
 import gtexpert.api.util.GTELog;
 import gtexpert.api.util.Mods;
+import gtexpert.common.GTEConfigHolder;
 import gtexpert.common.items.behaviors.GTECoverBehaviors;
 import gtexpert.modules.GTEModuleManager;
 import gtexpert.modules.GTEModules;
@@ -131,7 +132,14 @@ public void registerItems(RegistryEvent.Register<Item> event) {
     @SubscribeEvent
     public static void registerCovers(GregTechAPI.RegisterEvent<CoverDefinition> event) {
         GTELog.logger.info("Registering Covers...");
-        GTECoverBehaviors.init();
+
+        String componentsName = GTEConfigHolder.gteFlag.componentsName;
+        if (componentsName.equals("ulv") || componentsName.equals("primitive")) {
+            GTECoverBehaviors.init();
+        } else {
+            GTELog.logger.error("Invalid componentsName setting: {}",
+                    componentsName, new Throwable());
+        }
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
diff --git a/src/main/java/gtexpert/common/GTEConfigHolder.java b/src/main/java/gtexpert/common/GTEConfigHolder.java
@@ -28,9 +28,10 @@ public static class ModpackFlag {
         public boolean featureFlag = false;
 
         @Config.Comment({ "Item name to be CEu standard instead of Primitive",
-                "Options: true (ULV), false (Primitive)",
-                "Default: false" })
-        public boolean componentsName = false;
+                "If you want to use Filostorm's ULV Covers, set it to none.",
+                "Options: ulv, primitive, none",
+                "Default: primitive" })
+        public String componentsName = "primitive";
 
         @Config.Comment({
                 "Recipe Type. Options: none (no generated recipes), easy (2x2 crafting), normal (3x3 crafting).",
@@ -53,6 +54,14 @@ public static class ModpackFlag {
                 "Nether Star Dust, Skeleton Skull, Wither Skeleton Skull, Zombie Head, Creeper Head, Enderman Head",
                 "Default: false" })
         public boolean peacefulFlag = false;
+
+        @Config.Comment({ "Add to a creative machine recipe.",
+                "When enabled, Recipes will be added to the following machines: ",
+                "1. GTCEu: Data Hatch, Energy Unit, Quantum Tank, Quantum Chest",
+                "2. AE2UEL: Energy Cell",
+                "3. EIO: Capacitor Bank",
+                "Default: true" })
+        public boolean addCreativeRecipe = true;
     }
 
     public static class GregtechOverride {
diff --git a/src/main/java/gtexpert/common/items/GTEMetaItem1.java b/src/main/java/gtexpert/common/items/GTEMetaItem1.java
@@ -11,6 +11,7 @@
 import gregtech.api.unification.stack.MaterialStack;
 import gregtech.common.items.behaviors.TooltipBehavior;
 
+import gtexpert.api.util.GTELog;
 import gtexpert.common.GTEConfigHolder;
 import gtexpert.integration.ae.AEConfigHolder;
 
@@ -31,32 +32,37 @@ public void registerSubItems() {
         // Free range: ID 3-10
 
         // Primitive parts: ID 11-20
-        String componentsName = GTEConfigHolder.gteFlag.componentsName ? "ulv" : "primitive";
-        GTE_ELECTRIC_MOTOR = addItem(11, "electric.motor." + componentsName);
-        GTE_ELECTRIC_PUMP = addItem(12, "electric.pump." + componentsName)
-                .addComponents(new TooltipBehavior(lines -> {
-                    lines.add(I18n.format("metaitem.electric.pump.tooltip"));
-                    lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
-                }));
-        GTE_CONVEYOR_MODULE = addItem(13, "conveyor.module." + componentsName)
-                .addComponents(new TooltipBehavior(lines -> {
-                    lines.add(I18n.format("metaitem.conveyor.module.tooltip"));
-                    lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
-                }));
-        GTE_ELECTRIC_PISTON = addItem(14, "electric.piston." + componentsName);
-        GTE_ROBOT_ARM = addItem(15, "robot.arm." + componentsName)
-                .addComponents(new TooltipBehavior(lines -> {
-                    lines.add(I18n.format("metaitem.robot.arm.tooltip"));
-                    lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
-                }));
-        GTE_FLUID_REGULATOR = addItem(16, "fluid.regulator." + componentsName)
-                .addComponents(new TooltipBehavior(lines -> {
-                    lines.add(I18n.format("metaitem.fluid.regulator.tooltip"));
-                    lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
-                }));
-        GTE_FIELD_GENERATOR = addItem(17, "field.generator." + componentsName);
-        GTE_EMITTER = addItem(18, "emitter." + componentsName);
-        GTE_SENSOR = addItem(19, "sensor." + componentsName);
+        String componentsName = GTEConfigHolder.gteFlag.componentsName;
+        if (componentsName.equals("ulv") || componentsName.equals("primitive")) {
+            GTE_ELECTRIC_MOTOR = addItem(11, "electric.motor." + componentsName);
+            GTE_ELECTRIC_PUMP = addItem(12, "electric.pump." + componentsName)
+                    .addComponents(new TooltipBehavior(lines -> {
+                        lines.add(I18n.format("metaitem.electric.pump.tooltip"));
+                        lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
+                    }));
+            GTE_CONVEYOR_MODULE = addItem(13, "conveyor.module." + componentsName)
+                    .addComponents(new TooltipBehavior(lines -> {
+                        lines.add(I18n.format("metaitem.conveyor.module.tooltip"));
+                        lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
+                    }));
+            GTE_ELECTRIC_PISTON = addItem(14, "electric.piston." + componentsName);
+            GTE_ROBOT_ARM = addItem(15, "robot.arm." + componentsName)
+                    .addComponents(new TooltipBehavior(lines -> {
+                        lines.add(I18n.format("metaitem.robot.arm.tooltip"));
+                        lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
+                    }));
+            GTE_FLUID_REGULATOR = addItem(16, "fluid.regulator." + componentsName)
+                    .addComponents(new TooltipBehavior(lines -> {
+                        lines.add(I18n.format("metaitem.fluid.regulator.tooltip"));
+                        lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
+                    }));
+            GTE_FIELD_GENERATOR = addItem(17, "field.generator." + componentsName);
+            GTE_EMITTER = addItem(18, "emitter." + componentsName);
+            GTE_SENSOR = addItem(19, "sensor." + componentsName);
+        } else {
+            GTELog.logger.error("Invalid componentsName setting: {}",
+                    componentsName, new Throwable());
+        }
 
         // Shapes: ID 101-110
         if (AEConfigHolder.moveSteelShape) {
diff --git a/src/main/java/gtexpert/common/items/behaviors/GTECoverBehaviors.java b/src/main/java/gtexpert/common/items/behaviors/GTECoverBehaviors.java
@@ -15,7 +15,7 @@
 public class GTECoverBehaviors {
 
     public static void init() {
-        String componentsName = GTEConfigHolder.gteFlag.componentsName ? "ulv" : "primitive";
+        String componentsName = GTEConfigHolder.gteFlag.componentsName;
         registerBehavior(gteId("conveyor." + componentsName), GTEMetaItems.GTE_CONVEYOR_MODULE,
                 (def, tile, side) -> new CoverConveyor(def, tile, side, GTValues.ULV, 2));
         registerBehavior(gteId("pump." + componentsName), GTEMetaItems.GTE_ELECTRIC_PUMP,
diff --git a/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java b/src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java
@@ -52,7 +52,7 @@ public static void init() {
         }
 
         // Multi Machine
-        //
+        // Free: 12000~12001
         LARGE_CRACKER = registerMetaTileEntity(12002,
                 new MetaTileEntityLargeCrackingUnit(gteId("large_cracking_unit")));
         VOIDOREMINER = registerMetaTileEntity(12003,
diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEBlocksRecipe.java b/src/main/java/gtexpert/integration/ae/recipes/AEBlocksRecipe.java
@@ -21,6 +21,7 @@
 import gtexpert.api.GTEValues;
 import gtexpert.api.unification.material.GTEMaterials;
 import gtexpert.api.util.Mods;
+import gtexpert.common.GTEConfigHolder;
 import gtexpert.integration.ae.AEConfigHolder;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -29,19 +30,21 @@ public class AEBlocksRecipe {
 
     public static void init() {
         // Creative Energy Cell
-        RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
-                .input(MetaItems.ENERGY_CLUSTER, 4)
-                .inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 8))
-                .input(MetaTileEntities.HULL[UV])
-                .input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
-                .inputs(Mods.AppliedEnergistics2.getItem("dense_energy_cell", 8))
-                .input(MetaItems.COVER_SOLAR_PANEL_UV, 1)
-                .fluidInputs(GTEMaterials.Fluix.getFluid(18432))
-                .fluidInputs(Materials.SolderingAlloy.getFluid(18432))
-                .fluidInputs(Materials.Neutronium.getFluid(9216))
-                .outputs(Mods.AppliedEnergistics2.getItem("creative_energy_cell"))
-                .duration(1200).EUt(VA[UV])
-                .buildAndRegister();
+        if (GTEConfigHolder.gteFlag.addCreativeRecipe) {
+            RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
+                    .input(MetaItems.ENERGY_CLUSTER, 4)
+                    .inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 8))
+                    .input(MetaTileEntities.HULL[UV])
+                    .input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
+                    .inputs(Mods.AppliedEnergistics2.getItem("dense_energy_cell", 8))
+                    .input(MetaItems.COVER_SOLAR_PANEL_UV, 1)
+                    .fluidInputs(GTEMaterials.Fluix.getFluid(18432))
+                    .fluidInputs(Materials.SolderingAlloy.getFluid(18432))
+                    .fluidInputs(Materials.Neutronium.getFluid(9216))
+                    .outputs(Mods.AppliedEnergistics2.getItem("creative_energy_cell"))
+                    .duration(1200).EUt(VA[UV])
+                    .buildAndRegister();
+        }
 
         // ME Interface
         ModHandler.removeRecipeByName(
diff --git a/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java b/src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java
@@ -27,24 +27,26 @@ public class AEItemsRecipe {
 
     public static void init() {
         // GTE ME Storage Fake Component
-        AssemblyLineRecipeBuilder builderGTECore = RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
-                .input(screw, Materials.Neutronium, 8)
-                .input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
-                .fluidInputs(Materials.SolderingAlloy.getFluid(18432))
-                .fluidInputs(Materials.Neutronium.getFluid(9216))
-                .output(GTEMetaItems.GTE_ME_FAKE_COMPONENT, 1)
-                .duration(1200).EUt(VA[UV]);
-        if (AEConfigHolder.enableAE2UELExtended) {
-            builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 65));
-            builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 70));
-        } else if (Mods.AEAdditions.isModLoaded()) {
-            builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 3));
-            builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 6));
-        } else {
-            builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 38));
-            builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 57));
+        if (GTEConfigHolder.gteFlag.addCreativeRecipe) {
+            AssemblyLineRecipeBuilder builderGTECore = RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
+                    .input(screw, Materials.Neutronium, 8)
+                    .input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
+                    .fluidInputs(Materials.SolderingAlloy.getFluid(18432))
+                    .fluidInputs(Materials.Neutronium.getFluid(9216))
+                    .output(GTEMetaItems.GTE_ME_FAKE_COMPONENT, 1)
+                    .duration(1200).EUt(VA[UV]);
+            if (AEConfigHolder.enableAE2UELExtended) {
+                builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 65));
+                builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 70));
+            } else if (Mods.AEAdditions.isModLoaded()) {
+                builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 3));
+                builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 6));
+            } else {
+                builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 38));
+                builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 57));
+            }
+            builderGTECore.buildAndRegister();
         }
-        builderGTECore.buildAndRegister();
 
         // 1k Storage Cell
         ModHandler.removeRecipeByName(
diff --git a/src/main/java/gtexpert/integration/eio/recipes/EIOBlocksRecipe.java b/src/main/java/gtexpert/integration/eio/recipes/EIOBlocksRecipe.java
@@ -22,6 +22,7 @@
 import gtexpert.api.unification.material.GTEMaterials;
 import gtexpert.api.util.GTEUtility;
 import gtexpert.api.util.Mods;
+import gtexpert.common.GTEConfigHolder;
 import gtexpert.integration.eio.EnderIOConfigHolder;
 import gtexpert.integration.eio.metatileentities.EIOMetaTileEntities;
 
@@ -34,23 +35,25 @@ public class EIOBlocksRecipe {
 
     public static void init() {
         // Creative Capacitor Bank
-        RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
-                .input(MetaItems.ENERGY_CLUSTER, 4)
-                .inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 8))
-                .input(MetaTileEntities.HULL[UV])
-                .input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
-                .inputs(new ItemStack(PowerToolObject.block_cap_bank.getBlockNN(), 8, 3))
-                .input(MetaItems.COVER_SOLAR_PANEL_UV, 1)
-                .fluidInputs(GTEMaterials.VibrantAlloy.getFluid(18432))
-                .fluidInputs(Materials.SolderingAlloy.getFluid(18432))
-                .fluidInputs(Materials.Neutronium.getFluid(9216))
-                .outputs(new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()))
-                .duration(1200).EUt(VA[UV])
-                .buildAndRegister();
+        if (GTEConfigHolder.gteFlag.addCreativeRecipe) {
+            RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
+                    .input(MetaItems.ENERGY_CLUSTER, 4)
+                    .inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 8))
+                    .input(MetaTileEntities.HULL[UV])
+                    .input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
+                    .inputs(new ItemStack(PowerToolObject.block_cap_bank.getBlockNN(), 8, 3))
+                    .input(MetaItems.COVER_SOLAR_PANEL_UV, 1)
+                    .fluidInputs(GTEMaterials.VibrantAlloy.getFluid(18432))
+                    .fluidInputs(Materials.SolderingAlloy.getFluid(18432))
+                    .fluidInputs(Materials.Neutronium.getFluid(9216))
+                    .outputs(new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()))
+                    .duration(1200).EUt(VA[UV])
+                    .buildAndRegister();
 
-        ModHandler.addShapelessNBTClearingRecipe("creative_capacitor_bank_nbt",
-                new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()),
-                new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()));
+            ModHandler.addShapelessNBTClearingRecipe("creative_capacitor_bank_nbt",
+                    new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()),
+                    new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()));
+        }
 
         // Vial Extractor
         MetaTileEntityLoader.registerMachineRecipe(true,
diff --git a/src/main/java/gtexpert/loaders/recipe/GTERecipe.java b/src/main/java/gtexpert/loaders/recipe/GTERecipe.java

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ dependencies {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`// Debug GTWoodProcessing`
`62`		`- compileOnly rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776") // GTWoodProcessing 1.2.2`
`63`	`62`	`if (project.debug_all.toBoolean() \|\| project.debug_gtwp.toBoolean()) {`
`64`	`63`	`runtimeOnlyNonPublishable rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776")`
`65`	`64`	`}`
`@@ -70,7 +69,7 @@ dependencies {`
`70`	`69`	`runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5731331")`
`71`	`70`	`}`
`72`	`71`
`73`		`- // Debug AE Additions`
	`72`	`+ // Debug ExtraCells2 Additions`
`74`	`73`	`if (project.debug_all.toBoolean() \|\| project.debug_aea.toBoolean()) {`
`75`	`74`	`runtimeOnlyNonPublishable rfg.deobf("curse.maven:ae-additions-extra-cells-2-fork-493962:3814371") // AEAdditions 1.3.8`
`76`	`75`	`}`
`@@ -154,7 +153,7 @@ dependencies {`
`154`	`153`
`155`	`154`	`// Debug Avaritia`
`156`	`155`	`if (project.debug_all.toBoolean() \|\| project.debug_avaritia.toBoolean()) {`
`157`		`- runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-kedition-913129:4777278") // Avaritia 1.1x Kedition 1.3`
	`156`	`+ runtimeOnlyNonPublishable rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6029951") // Avaritia 1.1x UEL`
`158`	`157`	`}`
`159`	`158`
`160`	`159`	`// Debug Chisel`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static void init() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`// Multi Machine`
`55`		`- //`
	`55`	`+ // Free: 12000~12001`
`56`	`56`	`LARGE_CRACKER = registerMetaTileEntity(12002,`
`57`	`57`	`new MetaTileEntityLargeCrackingUnit(gteId("large_cracking_unit")));`
`58`	`58`	`VOIDOREMINER = registerMetaTileEntity(12003,`