Skip to content

Commit 76be968

Browse files
tier940tier940
committed
cfgで変更可能な項目の追加
1 parent b870848 commit 76be968

File tree

11 files changed

+321
-284
lines changed

11 files changed

+321
-284
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
draconic-evolution(recommended)
107107
draconicadditions(recommended)
108108
project-red-illumination(recommended)
109-
avaritia-1-1x-kedition(recommended)
109+
avaritia-1-1x-unofficial(recommended)
110110
thaumcraft(recommended)
111111
forestry(recommended)
112112
gendustry(recommended)

‎dependencies.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ dependencies {
5959
}
6060

6161
// Debug GTWoodProcessing
62-
compileOnly rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776") // GTWoodProcessing 1.2.2
6362
if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) {
6463
runtimeOnlyNonPublishable rfg.deobf("curse.maven:gtwoodprocessing-1093753:5731776")
6564
}
@@ -70,7 +69,7 @@ dependencies {
7069
runtimeOnlyNonPublishable rfg.deobf("curse.maven:implosionnobomb-1094386:5731331")
7170
}
7271

73-
// Debug AE Additions
72+
// Debug ExtraCells2 Additions
7473
if (project.debug_all.toBoolean() || project.debug_aea.toBoolean()) {
7574
runtimeOnlyNonPublishable rfg.deobf("curse.maven:ae-additions-extra-cells-2-fork-493962:3814371") // AEAdditions 1.3.8
7675
}
@@ -154,7 +153,7 @@ dependencies {
154153

155154
// Debug Avaritia
156155
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
158157
}
159158

160159
// Debug Chisel

‎src/main/java/gtexpert/GTExpertMod.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.function.Function;
44

5+
import gtexpert.common.GTEConfigHolder;
6+
57
import net.minecraft.block.Block;
68
import net.minecraft.item.Item;
79
import net.minecraft.item.ItemBlock;
@@ -131,7 +133,15 @@ public void registerItems(RegistryEvent.Register<Item> event) {
131133
@SubscribeEvent
132134
public static void registerCovers(GregTechAPI.RegisterEvent<CoverDefinition> event) {
133135
GTELog.logger.info("Registering Covers...");
134-
GTECoverBehaviors.init();
136+
137+
String componentsName = GTEConfigHolder.gteFlag.componentsName;
138+
if (componentsName.equals("ulv") || componentsName.equals("primitive")) {
139+
GTECoverBehaviors.init();
140+
}
141+
else {
142+
GTELog.logger.error("Invalid componentsName setting: {}",
143+
componentsName, new Throwable());
144+
}
135145
}
136146

137147
@SubscribeEvent(priority = EventPriority.HIGHEST)

‎src/main/java/gtexpert/common/GTEConfigHolder.java‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@ public static class ModpackFlag {
2828
public boolean featureFlag = false;
2929

3030
@Config.Comment({ "Item name to be CEu standard instead of Primitive",
31-
"Options: true (ULV), false (Primitive)",
32-
"Default: false" })
33-
public boolean componentsName = false;
31+
"If you want to use Filostorm's ULV Covers, set it to none.",
32+
"Options: ulv, primitive, none",
33+
"Default: primitive" })
34+
public String componentsName = "primitive";
3435

3536
@Config.Comment({
3637
"Recipe Type. Options: none (no generated recipes), easy (2x2 crafting), normal (3x3 crafting).",
@@ -53,6 +54,14 @@ public static class ModpackFlag {
5354
"Nether Star Dust, Skeleton Skull, Wither Skeleton Skull, Zombie Head, Creeper Head, Enderman Head",
5455
"Default: false" })
5556
public boolean peacefulFlag = false;
57+
58+
@Config.Comment({ "Add to a creative machine recipe.",
59+
"When enabled, Recipes will be added to the following machines: ",
60+
"1. GTCEu: Data Hatch, Energy Unit, Quantum Tank, Quantum Chest",
61+
"2. AE2UEL: Energy Cell",
62+
"3. EIO: Capacitor Bank",
63+
"Default: true" })
64+
public boolean addCreativeRecipe = true;
5665
}
5766

5867
public static class GregtechOverride {

‎src/main/java/gtexpert/common/items/GTEMetaItem1.java‎

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

33
import static gtexpert.common.items.GTEMetaItems.*;
44

5+
import gtexpert.api.util.GTELog;
6+
57
import net.minecraft.client.resources.I18n;
68

79
import gregtech.api.GTValues;
@@ -31,32 +33,38 @@ public void registerSubItems() {
3133
// Free range: ID 3-10
3234

3335
// Primitive parts: ID 11-20
34-
String componentsName = GTEConfigHolder.gteFlag.componentsName ? "ulv" : "primitive";
35-
GTE_ELECTRIC_MOTOR = addItem(11, "electric.motor." + componentsName);
36-
GTE_ELECTRIC_PUMP = addItem(12, "electric.pump." + componentsName)
37-
.addComponents(new TooltipBehavior(lines -> {
38-
lines.add(I18n.format("metaitem.electric.pump.tooltip"));
39-
lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
40-
}));
41-
GTE_CONVEYOR_MODULE = addItem(13, "conveyor.module." + componentsName)
42-
.addComponents(new TooltipBehavior(lines -> {
43-
lines.add(I18n.format("metaitem.conveyor.module.tooltip"));
44-
lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
45-
}));
46-
GTE_ELECTRIC_PISTON = addItem(14, "electric.piston." + componentsName);
47-
GTE_ROBOT_ARM = addItem(15, "robot.arm." + componentsName)
48-
.addComponents(new TooltipBehavior(lines -> {
49-
lines.add(I18n.format("metaitem.robot.arm.tooltip"));
50-
lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
51-
}));
52-
GTE_FLUID_REGULATOR = addItem(16, "fluid.regulator." + componentsName)
53-
.addComponents(new TooltipBehavior(lines -> {
54-
lines.add(I18n.format("metaitem.fluid.regulator.tooltip"));
55-
lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
56-
}));
57-
GTE_FIELD_GENERATOR = addItem(17, "field.generator." + componentsName);
58-
GTE_EMITTER = addItem(18, "emitter." + componentsName);
59-
GTE_SENSOR = addItem(19, "sensor." + componentsName);
36+
String componentsName = GTEConfigHolder.gteFlag.componentsName;
37+
if (componentsName.equals("ulv") || componentsName.equals("primitive")) {
38+
GTE_ELECTRIC_MOTOR = addItem(11, "electric.motor." + componentsName);
39+
GTE_ELECTRIC_PUMP = addItem(12, "electric.pump." + componentsName)
40+
.addComponents(new TooltipBehavior(lines -> {
41+
lines.add(I18n.format("metaitem.electric.pump.tooltip"));
42+
lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
43+
}));
44+
GTE_CONVEYOR_MODULE = addItem(13, "conveyor.module." + componentsName)
45+
.addComponents(new TooltipBehavior(lines -> {
46+
lines.add(I18n.format("metaitem.conveyor.module.tooltip"));
47+
lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
48+
}));
49+
GTE_ELECTRIC_PISTON = addItem(14, "electric.piston." + componentsName);
50+
GTE_ROBOT_ARM = addItem(15, "robot.arm." + componentsName)
51+
.addComponents(new TooltipBehavior(lines -> {
52+
lines.add(I18n.format("metaitem.robot.arm.tooltip"));
53+
lines.add(I18n.format("gregtech.universal.tooltip.item_transfer_rate", 2));
54+
}));
55+
GTE_FLUID_REGULATOR = addItem(16, "fluid.regulator." + componentsName)
56+
.addComponents(new TooltipBehavior(lines -> {
57+
lines.add(I18n.format("metaitem.fluid.regulator.tooltip"));
58+
lines.add(I18n.format("gregtech.universal.tooltip.fluid_transfer_rate", (1280 / 4) / 20));
59+
}));
60+
GTE_FIELD_GENERATOR = addItem(17, "field.generator." + componentsName);
61+
GTE_EMITTER = addItem(18, "emitter." + componentsName);
62+
GTE_SENSOR = addItem(19, "sensor." + componentsName);
63+
}
64+
else {
65+
GTELog.logger.error("Invalid componentsName setting: {}",
66+
componentsName, new Throwable());
67+
}
6068

6169
// Shapes: ID 101-110
6270
if (AEConfigHolder.moveSteelShape) {

‎src/main/java/gtexpert/common/items/behaviors/GTECoverBehaviors.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
public class GTECoverBehaviors {
1616

1717
public static void init() {
18-
String componentsName = GTEConfigHolder.gteFlag.componentsName ? "ulv" : "primitive";
18+
String componentsName = GTEConfigHolder.gteFlag.componentsName;
1919
registerBehavior(gteId("conveyor." + componentsName), GTEMetaItems.GTE_CONVEYOR_MODULE,
2020
(def, tile, side) -> new CoverConveyor(def, tile, side, GTValues.ULV, 2));
2121
registerBehavior(gteId("pump." + componentsName), GTEMetaItems.GTE_ELECTRIC_PUMP,

‎src/main/java/gtexpert/common/metatileentities/GTEMetaTileEntities.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static void init() {
5252
}
5353

5454
// Multi Machine
55-
//
55+
// Free: 12000~12001
5656
LARGE_CRACKER = registerMetaTileEntity(12002,
5757
new MetaTileEntityLargeCrackingUnit(gteId("large_cracking_unit")));
5858
VOIDOREMINER = registerMetaTileEntity(12003,

‎src/main/java/gtexpert/integration/ae/recipes/AEBlocksRecipe.java‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import gtexpert.api.GTEValues;
2222
import gtexpert.api.unification.material.GTEMaterials;
2323
import gtexpert.api.util.Mods;
24+
import gtexpert.common.GTEConfigHolder;
2425
import gtexpert.integration.ae.AEConfigHolder;
2526

2627
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
@@ -29,19 +30,21 @@ public class AEBlocksRecipe {
2930

3031
public static void init() {
3132
// Creative Energy Cell
32-
RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
33-
.input(MetaItems.ENERGY_CLUSTER, 4)
34-
.inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 8))
35-
.input(MetaTileEntities.HULL[UV])
36-
.input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
37-
.inputs(Mods.AppliedEnergistics2.getItem("dense_energy_cell", 8))
38-
.input(MetaItems.COVER_SOLAR_PANEL_UV, 1)
39-
.fluidInputs(GTEMaterials.Fluix.getFluid(18432))
40-
.fluidInputs(Materials.SolderingAlloy.getFluid(18432))
41-
.fluidInputs(Materials.Neutronium.getFluid(9216))
42-
.outputs(Mods.AppliedEnergistics2.getItem("creative_energy_cell"))
43-
.duration(1200).EUt(VA[UV])
44-
.buildAndRegister();
33+
if (GTEConfigHolder.gteFlag.addCreativeRecipe) {
34+
RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
35+
.input(MetaItems.ENERGY_CLUSTER, 4)
36+
.inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 8))
37+
.input(MetaTileEntities.HULL[UV])
38+
.input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
39+
.inputs(Mods.AppliedEnergistics2.getItem("dense_energy_cell", 8))
40+
.input(MetaItems.COVER_SOLAR_PANEL_UV, 1)
41+
.fluidInputs(GTEMaterials.Fluix.getFluid(18432))
42+
.fluidInputs(Materials.SolderingAlloy.getFluid(18432))
43+
.fluidInputs(Materials.Neutronium.getFluid(9216))
44+
.outputs(Mods.AppliedEnergistics2.getItem("creative_energy_cell"))
45+
.duration(1200).EUt(VA[UV])
46+
.buildAndRegister();
47+
}
4548

4649
// ME Interface
4750
ModHandler.removeRecipeByName(

‎src/main/java/gtexpert/integration/ae/recipes/AEItemsRecipe.java‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,26 @@ public class AEItemsRecipe {
2727

2828
public static void init() {
2929
// GTE ME Storage Fake Component
30-
AssemblyLineRecipeBuilder builderGTECore = RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
31-
.input(screw, Materials.Neutronium, 8)
32-
.input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
33-
.fluidInputs(Materials.SolderingAlloy.getFluid(18432))
34-
.fluidInputs(Materials.Neutronium.getFluid(9216))
35-
.output(GTEMetaItems.GTE_ME_FAKE_COMPONENT, 1)
36-
.duration(1200).EUt(VA[UV]);
37-
if (AEConfigHolder.enableAE2UELExtended) {
38-
builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 65));
39-
builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 70));
40-
} else if (Mods.AEAdditions.isModLoaded()) {
41-
builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 3));
42-
builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 6));
43-
} else {
44-
builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 38));
45-
builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 57));
30+
if (GTEConfigHolder.gteFlag.addCreativeRecipe) {
31+
AssemblyLineRecipeBuilder builderGTECore = RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
32+
.input(screw, Materials.Neutronium, 8)
33+
.input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
34+
.fluidInputs(Materials.SolderingAlloy.getFluid(18432))
35+
.fluidInputs(Materials.Neutronium.getFluid(9216))
36+
.output(GTEMetaItems.GTE_ME_FAKE_COMPONENT, 1)
37+
.duration(1200).EUt(VA[UV]);
38+
if (AEConfigHolder.enableAE2UELExtended) {
39+
builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 65));
40+
builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 70));
41+
} else if (Mods.AEAdditions.isModLoaded()) {
42+
builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 3));
43+
builderGTECore.inputs(Mods.AEAdditions.getItem("storage.component", 16, 6));
44+
} else {
45+
builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 38));
46+
builderGTECore.inputs(Mods.AppliedEnergistics2.getItem("material", 16, 57));
47+
}
48+
builderGTECore.buildAndRegister();
4649
}
47-
builderGTECore.buildAndRegister();
4850

4951
// 1k Storage Cell
5052
ModHandler.removeRecipeByName(

‎src/main/java/gtexpert/integration/eio/recipes/EIOBlocksRecipe.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import static gregtech.api.unification.ore.OrePrefix.*;
55
import static gregtech.loaders.recipe.CraftingComponent.*;
66

7+
import gtexpert.common.GTEConfigHolder;
8+
79
import net.minecraft.init.Blocks;
810
import net.minecraft.item.ItemStack;
911

@@ -34,23 +36,25 @@ public class EIOBlocksRecipe {
3436

3537
public static void init() {
3638
// Creative Capacitor Bank
37-
RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
38-
.input(MetaItems.ENERGY_CLUSTER, 4)
39-
.inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 8))
40-
.input(MetaTileEntities.HULL[UV])
41-
.input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
42-
.inputs(new ItemStack(PowerToolObject.block_cap_bank.getBlockNN(), 8, 3))
43-
.input(MetaItems.COVER_SOLAR_PANEL_UV, 1)
44-
.fluidInputs(GTEMaterials.VibrantAlloy.getFluid(18432))
45-
.fluidInputs(Materials.SolderingAlloy.getFluid(18432))
46-
.fluidInputs(Materials.Neutronium.getFluid(9216))
47-
.outputs(new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()))
48-
.duration(1200).EUt(VA[UV])
49-
.buildAndRegister();
39+
if (GTEConfigHolder.gteFlag.addCreativeRecipe) {
40+
RecipeMaps.ASSEMBLY_LINE_RECIPES.recipeBuilder()
41+
.input(MetaItems.ENERGY_CLUSTER, 4)
42+
.inputs(MetaBlocks.FUSION_CASING.getItemVariant(BlockFusionCasing.CasingType.FUSION_CASING_MK3, 8))
43+
.input(MetaTileEntities.HULL[UV])
44+
.input(MetaItems.CRYSTAL_MAINFRAME_UV, 4)
45+
.inputs(new ItemStack(PowerToolObject.block_cap_bank.getBlockNN(), 8, 3))
46+
.input(MetaItems.COVER_SOLAR_PANEL_UV, 1)
47+
.fluidInputs(GTEMaterials.VibrantAlloy.getFluid(18432))
48+
.fluidInputs(Materials.SolderingAlloy.getFluid(18432))
49+
.fluidInputs(Materials.Neutronium.getFluid(9216))
50+
.outputs(new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()))
51+
.duration(1200).EUt(VA[UV])
52+
.buildAndRegister();
5053

51-
ModHandler.addShapelessNBTClearingRecipe("creative_capacitor_bank_nbt",
52-
new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()),
53-
new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()));
54+
ModHandler.addShapelessNBTClearingRecipe("creative_capacitor_bank_nbt",
55+
new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()),
56+
new ItemStack(PowerToolObject.block_cap_bank.getBlockNN()));
57+
}
5458

5559
// Vial Extractor
5660
MetaTileEntityLoader.registerMachineRecipe(true,

0 commit comments

Comments
 (0)