Skip to content

Commit fec410f

Browse files
Something happened with the datagen (aka skill issue on my end). Here's it back.
1 parent fcb5155 commit fec410f

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

src/generated/resources/assets/gtmutils/lang/en_ud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@
1515
"block.gtmutils.mv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛWq§",
1616
"block.gtmutils.mv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ɯnıpǝWq§",
1717
"block.gtmutils.opv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛdOן§6§",
18+
"block.gtmutils.opv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ pǝɹǝʍodɹǝʌOן§6§",
1819
"block.gtmutils.pterb_machine": "ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM",
1920
"block.gtmutils.sterile_cleaning_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW buıuɐǝןƆ ǝןıɹǝʇS",
2021
"block.gtmutils.uev_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛƎ∩ɐ§",
22+
"block.gtmutils.uev_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝʌıssǝɔxƎ ɐɹʇן∩ɐ§",
2123
"block.gtmutils.uhv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛH∩ㄣ§",
2224
"block.gtmutils.uhv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ɥbıH ɐɹʇן∩ㄣ§",
2325
"block.gtmutils.uiv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛI∩ᄅ§",
26+
"block.gtmutils.uiv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝsuǝɯɯI ɐɹʇן∩ᄅ§",
2427
"block.gtmutils.ulv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛꞀ∩8§",
28+
"block.gtmutils.ulv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ʍoꞀ ɐɹʇן∩8§",
2529
"block.gtmutils.uv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§Λ∩Ɛ§",
2630
"block.gtmutils.uv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝʇɐɯıʇן∩Ɛ§",
2731
"block.gtmutils.uxv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛX∩ǝ§",
32+
"block.gtmutils.uxv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝɯǝɹʇxƎ ɐɹʇן∩ǝ§",
2833
"block.gtmutils.zpm_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§WԀZɔ§",
2934
"block.gtmutils.zpm_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ WԀZɔ§",
3035
"config.gtmutils.option.aeMachinesEnabled": "pǝןqɐuƎsǝuıɥɔɐWǝɐ",

src/generated/resources/assets/gtmutils/lang/en_us.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,21 @@
1515
"block.gtmutils.mv_64a_energy_converter": "§bMV§r 64§eA§r Energy Converter",
1616
"block.gtmutils.mv_auto_charger_4x": "§bMedium Voltage§r 4x Auto Turbo Charger",
1717
"block.gtmutils.opv_64a_energy_converter": "§9§lOpV§r 64§eA§r Energy Converter",
18+
"block.gtmutils.opv_auto_charger_4x": "§9§lOverpowered Voltage§r 4x Auto Turbo Charger",
1819
"block.gtmutils.pterb_machine": "Wireless Active Transformer",
1920
"block.gtmutils.sterile_cleaning_maintenance_hatch": "Sterile Cleaning Maintenance Hatch",
2021
"block.gtmutils.uev_64a_energy_converter": "§aUEV§r 64§eA§r Energy Converter",
22+
"block.gtmutils.uev_auto_charger_4x": "§aUltra Excessive Voltage§r 4x Auto Turbo Charger",
2123
"block.gtmutils.uhv_64a_energy_converter": "§4UHV§r 64§eA§r Energy Converter",
2224
"block.gtmutils.uhv_auto_charger_4x": "§4Ultra High Voltage§r 4x Auto Turbo Charger",
2325
"block.gtmutils.uiv_64a_energy_converter": "§2UIV§r 64§eA§r Energy Converter",
26+
"block.gtmutils.uiv_auto_charger_4x": "§2Ultra Immense Voltage§r 4x Auto Turbo Charger",
2427
"block.gtmutils.ulv_64a_energy_converter": "§8ULV§r 64§eA§r Energy Converter",
28+
"block.gtmutils.ulv_auto_charger_4x": "§8Ultra Low Voltage§r 4x Auto Turbo Charger",
2529
"block.gtmutils.uv_64a_energy_converter": "§3UV§r 64§eA§r Energy Converter",
2630
"block.gtmutils.uv_auto_charger_4x": "§3Ultimate Voltage§r 4x Auto Turbo Charger",
2731
"block.gtmutils.uxv_64a_energy_converter": "§eUXV§r 64§eA§r Energy Converter",
32+
"block.gtmutils.uxv_auto_charger_4x": "§eUltra Extreme Voltage§r 4x Auto Turbo Charger",
2833
"block.gtmutils.zpm_64a_energy_converter": "§cZPM§r 64§eA§r Energy Converter",
2934
"block.gtmutils.zpm_auto_charger_4x": "§cZPM Voltage§r 4x Auto Turbo Charger",
3035
"config.gtmutils.option.aeMachinesEnabled": "aeMachinesEnabled",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
public class UtilAEMachines {
1717

1818
static {
19-
if (UtilConfig.INSTANCE.features.aeMachinesEnabled) {
19+
if (UtilConfig.INSTANCE.features.aeMachinesEnabled || GTCEu.isDataGen()) {
2020
final MachineDefinition EXPANDED_ME_PATTERN_BUFFER = REGISTRATE
2121
.machine("expanded_me_pattern_buffer", ExpandedPatternBufferPartMachine::new)
2222
.tier(ZPM)

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

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

33
import com.gregtechceu.gtceu.GTCEu;
4+
import com.gregtechceu.gtceu.api.GTCEuAPI;
45
import com.gregtechceu.gtceu.api.GTValues;
56
import com.gregtechceu.gtceu.api.capability.compat.FeCompat;
67
import com.gregtechceu.gtceu.api.data.RotationState;
@@ -21,8 +22,8 @@
2122
import com.gregtechceu.gtceu.common.machine.electric.ConverterMachine;
2223
import com.gregtechceu.gtceu.common.machine.multiblock.part.CleaningMaintenanceHatchPartMachine;
2324
import com.gregtechceu.gtceu.config.ConfigHolder;
24-
2525
import com.gregtechceu.gtceu.utils.FormattingUtil;
26+
2627
import net.minecraft.ChatFormatting;
2728
import net.minecraft.network.chat.Component;
2829
import net.neganote.gtutilities.GregTechModernUtilities;
@@ -73,18 +74,17 @@ public class UtilMachines {
7374
}
7475
}
7576

76-
77-
public static MachineDefinition[] CHARGER_4 = null;
77+
public static MachineDefinition[] AUTO_CHARGER_4 = null;
7878

7979
static {
8080
if (UtilConfig.INSTANCE.features.autoChargersEnabled || GTCEu.isDataGen()) {
81-
CHARGER_4 = registerCharger(4);
81+
AUTO_CHARGER_4 = registerCharger(4);
8282
}
8383
}
8484

8585
public static MachineDefinition[] registerCharger(int itemSlotSize) {
8686
int maxTier;
87-
if (ConfigHolder.INSTANCE.machines.highTierContent) {
87+
if (GTCEuAPI.isHighTier()) {
8888
maxTier = OpV;
8989
} else {
9090
maxTier = UHV;
@@ -106,7 +106,7 @@ public static MachineDefinition[] registerCharger(int itemSlotSize) {
106106
Component.translatable("gtceu.universal.tooltip.amperage_in_till",
107107
itemSlotSize * ChargerMachine.AMPS_PER_ITEM))
108108
.register(),
109-
GTValues.tiersBetween(LV, maxTier));
109+
GTValues.tiersBetween(ULV, maxTier));
110110
}
111111

112112
// Copied from GTMachineUtils
@@ -158,7 +158,6 @@ public static MachineDefinition[] registerTieredMachines(String name,
158158
}
159159
}
160160

161-
162161
public static MultiblockMachineDefinition PTERB_MACHINE = null;
163162

164163
static {

0 commit comments

Comments
 (0)