From 55528ae56c8585570baaf022450b72ef038bbdc9 Mon Sep 17 00:00:00 2001 From: tier940 Date: Tue, 4 Feb 2025 12:52:32 +0900 Subject: [PATCH 1/2] Fix VCU --- .../gtexpert/core/common/GTEConfigHolder.java | 3 ++ .../loaders/recipe/CEUOverrideRecipe.java | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java index 7ee99cbf..87bdd514 100644 --- a/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java +++ b/src/main/java/com/github/gtexpert/core/common/GTEConfigHolder.java @@ -64,5 +64,8 @@ public static class GregtechOverride { @Config.Comment({ "Disable auto eat function of QuarkTech helmet", "Default: true" }) public boolean disableHelmetAutoEat = true; + + @Config.Comment({ "Change the recipe for GCYM's VoltageControlUnit", "Default: false" }) + public boolean fixVoltageControlUnit = false; } } diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java index c6f087f8..4de782e7 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java @@ -7,6 +7,11 @@ import java.util.ArrayList; import java.util.List; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.common.GTEConfigHolder; + +import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; @@ -49,6 +54,19 @@ public static void init() { tools(); } + public static final Material[] tierMaterials = new Material[] { + Materials.WroughtIron, + Materials.Steel, + Materials.Aluminium, + Materials.StainlessSteel, + Materials.Titanium, + Materials.TungstenSteel, + Materials.RhodiumPlatedPalladium, + Materials.NaquadahAlloy, + Materials.Darmstadtium, + Materials.Neutronium + }; + private static void materials() { // Vacuum Freezer List materials = new ArrayList<>(GregTechAPI.materialManager.getRegisteredMaterials()); @@ -344,6 +362,19 @@ private static void blocks() { 'W', new UnificationEntry(cableGtSingle, Materials.Europium), 'C', MetaItems.WETWARE_MAINFRAME_UHV, 'T', OreDictNames.chestWood); + + // GCYM: Voltage Control Unit + if (GTEConfigHolder.ceuOverride.fixVoltageControlUnit) { + int isHighTier = GregTechAPI.isHighTier() ? 14 : 9; + for (int i = 0; i <= isHighTier; i++) { + ModHandler.removeRecipeByOutput(GCYMMetaTileEntities.TIERED_HATCH[i].getStackForm()); + ModHandler.addShapedRecipe(true, "gregtech.machine.tiered_hatch." + VN[i], + GCYMMetaTileEntities.TIERED_HATCH[i].getStackForm(), + "PPP", "PCP", "PPP", + 'P', OreDictUnifier.get(plate, tierMaterials[i]), + 'C', GTEUtility.oreDictionaryCircuit(i)); + } + } } private static void tools() { From 1bb5ab71ceb315d59272dab5f72d4bd62307cc1c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 12:55:50 +0900 Subject: [PATCH 2/2] spotlessApply (#317) Co-authored-by: GitHub Actions <> --- .../gtexpert/core/loaders/recipe/CEUOverrideRecipe.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java index 4de782e7..edbc2678 100644 --- a/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java +++ b/src/main/java/com/github/gtexpert/core/loaders/recipe/CEUOverrideRecipe.java @@ -7,11 +7,6 @@ import java.util.ArrayList; import java.util.List; -import com.github.gtexpert.core.api.util.GTEUtility; -import com.github.gtexpert.core.common.GTEConfigHolder; - -import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities; - import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; @@ -42,7 +37,10 @@ import gregicality.multiblocks.api.fluids.GCYMFluidStorageKeys; import gregicality.multiblocks.api.unification.properties.GCYMPropertyKey; +import gregicality.multiblocks.common.metatileentities.GCYMMetaTileEntities; +import com.github.gtexpert.core.api.util.GTEUtility; +import com.github.gtexpert.core.common.GTEConfigHolder; import com.github.gtexpert.core.common.items.GTEMetaItems; public class CEUOverrideRecipe {