Skip to content

Commit 95b72ee

Browse files
committed
ensure datagen is always properly performed
1 parent 5ec082a commit 95b72ee

File tree

4 files changed

+9
-56
lines changed

4 files changed

+9
-56
lines changed

run/config/gtmutils.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/main/java/net/neganote/gtutilities/common/item/UtilItems.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.neganote.gtutilities.common.item;
22

3+
import com.gregtechceu.gtceu.GTCEu;
34
import com.gregtechceu.gtceu.api.item.IComponentItem;
45
import com.gregtechceu.gtceu.api.item.component.ElectricStats;
56
import com.gregtechceu.gtceu.api.item.component.IItemComponent;
@@ -38,7 +39,7 @@ public class UtilItems {
3839
public static ItemEntry<Item> SILVER_CREDIT = null;
3940

4041
static {
41-
if (UtilConfig.INSTANCE.features.omnibreakerEnabled) {
42+
if (UtilConfig.INSTANCE.features.omnibreakerEnabled || GTCEu.isDataGen()) {
4243
OMNIBREAKER = REGISTRATE
4344
.item("omnibreaker", (p) -> OmniBreakerItem.create(p, OMNIBREAKER_TIER))
4445
.lang("Omni-breaker")
@@ -65,7 +66,7 @@ public class UtilItems {
6566
.register();
6667
}
6768

68-
if (UtilConfig.INSTANCE.features.coinsEnabled) {
69+
if (UtilConfig.INSTANCE.features.coinsEnabled || GTCEu.isDataGen()) {
6970
ANCIENT_GOLD_COIN = registerBasicItem("ancient_gold_coin");
7071
CHOCOLATE_COIN = registerBasicItem("chocolate_coin");
7172
COPPER_CREDIT = registerBasicItem("copper_credit");

src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class UtilMachines {
4747
public static MachineDefinition STERILE_CLEANING_MAINTENANCE_HATCH = null;
4848

4949
static {
50-
if (UtilConfig.INSTANCE.features.sterileHatchEnabled) {
50+
if (UtilConfig.INSTANCE.features.sterileHatchEnabled || GTCEu.isDataGen()) {
5151
STERILE_CLEANING_MAINTENANCE_HATCH = REGISTRATE
5252
.machine("sterile_cleaning_maintenance_hatch",
5353
holder -> new CleaningMaintenanceHatchPartMachine(holder, CleanroomType.STERILE_CLEANROOM))
@@ -111,16 +111,16 @@ public static MachineDefinition[] registerTieredMachines(String name,
111111
public static MachineDefinition[] ENERGY_CONVERTER_64A = null;
112112

113113
static {
114-
if (UtilConfig.INSTANCE.features.converters64aEnabled &&
115-
ConfigHolder.INSTANCE.compat.energy.enableFEConverters) {
114+
if ((UtilConfig.INSTANCE.features.converters64aEnabled &&
115+
ConfigHolder.INSTANCE.compat.energy.enableFEConverters) || GTCEu.isDataGen()) {
116116
ENERGY_CONVERTER_64A = registerConverter(64);
117117
}
118118
}
119119

120120
public static MultiblockMachineDefinition PTERB_MACHINE = null;
121121

122122
static {
123-
if (UtilConfig.INSTANCE.features.pterbEnabled) {
123+
if (UtilConfig.INSTANCE.features.pterbEnabled || GTCEu.isDataGen()) {
124124
PTERB_MACHINE = REGISTRATE
125125
.multiblock("pterb_machine", PTERBMachine::new)
126126
.langValue("Wireless Active Transformer")

src/main/java/net/neganote/gtutilities/config/UtilConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.neganote.gtutilities.config;
22

3+
import com.gregtechceu.gtceu.GTCEu;
34
import com.gregtechceu.gtceu.api.GTValues;
45

56
import net.neganote.gtutilities.GregTechModernUtilities;
@@ -89,6 +90,6 @@ public static class FeatureConfigs {
8990

9091
public static boolean coolantEnabled() {
9192
return UtilConfig.INSTANCE.features.pterbCoolantBaseDrain != 0 ||
92-
UtilConfig.INSTANCE.features.pterbCoolantIOMultiplier != 0.0f;
93+
UtilConfig.INSTANCE.features.pterbCoolantIOMultiplier != 0.0f || GTCEu.isDataGen();
9394
}
9495
}

0 commit comments

Comments
 (0)