Skip to content

Commit 9821326

Browse files
Phoenixvine32908Phoenixvine32908
committed
Lang stuff and more spotless.
1 parent d5619bb commit 9821326

6 files changed

Lines changed: 26 additions & 14 deletions

File tree

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"block.gtmutils.ev_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛƎϛ§",
33
"block.gtmutils.ev_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝɯǝɹʇxƎϛ§",
4-
"block.gtmutils.expanded_me_pattern_buffer": ")sʇoןS ᄅㄥ( ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ",
4+
"block.gtmutils.expanded_me_pattern_buffer": "ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ",
55
"block.gtmutils.expanded_me_pattern_buffer_proxy": "ʎxoɹԀ ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ",
66
"block.gtmutils.hv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛH9§",
77
"block.gtmutils.hv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ɥbıH9§",
@@ -16,6 +16,9 @@
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§",
1818
"block.gtmutils.opv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ pǝɹǝʍodɹǝʌOן§6§",
19+
"block.gtmutils.pattern_buffer.desc.0": "˙sʞɔoןqıʇןnW ɥɔǝ⟘bǝɹ⅁ ɹoɟɟ§ ǝbɐɹoʇs uɹǝʇʇɐd ᄅƎⱯ9§ ʇɔǝɹıp pǝpuɐdxǝ sʍoןןⱯɟ§",
20+
"block.gtmutils.pattern_buffer.desc.2": "¡ɹǝɥʇǝboʇ sǝuıɥɔɐɯ ʞuıן oʇɟ§ ʞɔıʇsɐʇɐpq§ ɐ ɥʇıʍɟ§ sǝıxoɹԀ ɹǝɟɟnᗺ uɹǝʇʇɐԀ pǝpuɐdxƎ9§ ʞuıꞀɟ§",
21+
"block.gtmutils.pattern_buffer_proxy.desc.0": "˙ɟ§ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ9§ ɹɐןnbuıs ɐ oʇ sǝuıɥɔɐɯ ʎuɐɯ buıʞuıן sʍoןןⱯɟ§",
1922
"block.gtmutils.pterb_machine": "ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM",
2023
"block.gtmutils.sterile_cleaning_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW buıuɐǝןƆ ǝןıɹǝʇS",
2124
"block.gtmutils.uev_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛƎ∩ɐ§",
@@ -32,7 +35,6 @@
3235
"block.gtmutils.uxv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝɯǝɹʇxƎ ɐɹʇן∩ǝ§",
3336
"block.gtmutils.zpm_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§WԀZɔ§",
3437
"block.gtmutils.zpm_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ WԀZɔ§",
35-
"config.gtmutils.option.aeMachinesEnabled": "pǝןqɐuƎsǝuıɥɔɐWǝɐ",
3638
"config.gtmutils.option.autoChargersEnabled": "pǝןqɐuƎsɹǝbɹɐɥƆoʇnɐ",
3739
"config.gtmutils.option.coinsEnabled": "pǝןqɐuƎsuıoɔ",
3840
"config.gtmutils.option.converters64aEnabled": "pǝןqɐuƎɐㄣ9sɹǝʇɹǝʌuoɔ",
@@ -42,6 +44,7 @@
4244
"config.gtmutils.option.customLuVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛnꞀɯoʇsnɔ",
4345
"config.gtmutils.option.customMVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛWɯoʇsnɔ",
4446
"config.gtmutils.option.customZPMToolsEnabled": "pǝןqɐuƎsןoo⟘WԀZɯoʇsnɔ",
47+
"config.gtmutils.option.expandedBuffersEnabled": "pǝןqɐuƎsɹǝɟɟnᗺpǝpuɐdxǝ",
4548
"config.gtmutils.option.features": "sǝɹnʇɐǝɟ",
4649
"config.gtmutils.option.omnibreakerEnabled": "pǝןqɐuƎɹǝʞɐǝɹqıuɯo",
4750
"config.gtmutils.option.omnibreakerEnergyCapacity": "ʎʇıɔɐdɐƆʎbɹǝuƎɹǝʞɐǝɹqıuɯo",

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"block.gtmutils.ev_64a_energy_converter": "§5EV§r 64§eA§r Energy Converter",
33
"block.gtmutils.ev_auto_charger_4x": "§5Extreme Voltage§r 4x Auto Turbo Charger",
4-
"block.gtmutils.expanded_me_pattern_buffer": "Expanded ME Pattern Buffer (72 Slots)",
4+
"block.gtmutils.expanded_me_pattern_buffer": "Expanded ME Pattern Buffer",
55
"block.gtmutils.expanded_me_pattern_buffer_proxy": "Expanded ME Pattern Buffer Proxy",
66
"block.gtmutils.hv_64a_energy_converter": "§6HV§r 64§eA§r Energy Converter",
77
"block.gtmutils.hv_auto_charger_4x": "§6High Voltage§r 4x Auto Turbo Charger",
@@ -16,6 +16,9 @@
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",
1818
"block.gtmutils.opv_auto_charger_4x": "§9§lOverpowered Voltage§r 4x Auto Turbo Charger",
19+
"block.gtmutils.pattern_buffer.desc.0": "§fAllows expanded direct §6AE2 pattern storage §ffor GregTech Multiblocks.",
20+
"block.gtmutils.pattern_buffer.desc.2": "§fLink §6Expanded Pattern Buffer Proxies §fwith a §bdatastick §fto link machines together!",
21+
"block.gtmutils.pattern_buffer_proxy.desc.0": "§fAllows linking many machines to a singular §6Expanded ME Pattern Buffer§f.",
1922
"block.gtmutils.pterb_machine": "Wireless Active Transformer",
2023
"block.gtmutils.sterile_cleaning_maintenance_hatch": "Sterile Cleaning Maintenance Hatch",
2124
"block.gtmutils.uev_64a_energy_converter": "§aUEV§r 64§eA§r Energy Converter",
@@ -32,7 +35,6 @@
3235
"block.gtmutils.uxv_auto_charger_4x": "§eUltra Extreme Voltage§r 4x Auto Turbo Charger",
3336
"block.gtmutils.zpm_64a_energy_converter": "§cZPM§r 64§eA§r Energy Converter",
3437
"block.gtmutils.zpm_auto_charger_4x": "§cZPM Voltage§r 4x Auto Turbo Charger",
35-
"config.gtmutils.option.aeMachinesEnabled": "aeMachinesEnabled",
3638
"config.gtmutils.option.autoChargersEnabled": "autoChargersEnabled",
3739
"config.gtmutils.option.coinsEnabled": "coinsEnabled",
3840
"config.gtmutils.option.converters64aEnabled": "converters64aEnabled",
@@ -42,6 +44,7 @@
4244
"config.gtmutils.option.customLuVToolsEnabled": "customLuVToolsEnabled",
4345
"config.gtmutils.option.customMVToolsEnabled": "customMVToolsEnabled",
4446
"config.gtmutils.option.customZPMToolsEnabled": "customZPMToolsEnabled",
47+
"config.gtmutils.option.expandedBuffersEnabled": "expandedBuffersEnabled",
4548
"config.gtmutils.option.features": "features",
4649
"config.gtmutils.option.omnibreakerEnabled": "omnibreakerEnabled",
4750
"config.gtmutils.option.omnibreakerEnergyCapacity": "omnibreakerEnergyCapacity",

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public class UtilAEMachines {
2727
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS, PartAbility.EXPORT_FLUIDS,
2828
PartAbility.EXPORT_ITEMS)
2929
.colorOverlayTieredHullModel(GTCEu.id("block/overlay/appeng/me_buffer_hatch"))
30-
.langValue("Expanded ME Pattern Buffer (72 Slots)")
30+
.langValue("Expanded ME Pattern Buffer")
3131
.tooltips(
32-
Component.translatable("block.gtceu.pattern_buffer.desc.0"),
33-
Component.literal("§6Expanded to 72 Slots"),
34-
Component.translatable("block.gtceu.pattern_buffer.desc.2"),
32+
Component.translatable("block.gtmutils.pattern_buffer.desc.0"),
33+
Component.translatable("block.gtceu.pattern_buffer.desc.1"),
34+
Component.translatable("block.gtmutils.pattern_buffer.desc.2"),
3535
Component.translatable("gtceu.part_sharing.enabled"))
3636
.register();
3737

@@ -44,8 +44,7 @@ public class UtilAEMachines {
4444
.colorOverlayTieredHullModel(GTCEu.id("block/overlay/appeng/me_buffer_hatch_proxy"))
4545
.langValue("Expanded ME Pattern Buffer Proxy")
4646
.tooltips(
47-
Component.translatable("block.gtceu.pattern_buffer_proxy.desc.0"),
48-
Component.literal("§6Compatible with 72 Slot Buffer"),
47+
Component.translatable("block.gtmutils.pattern_buffer_proxy.desc.0"),
4948
Component.translatable("block.gtceu.pattern_buffer_proxy.desc.2"),
5049
Component.translatable("gtceu.part_sharing.enabled"))
5150
.register();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public static class FeatureConfigs {
9494
@Configurable
9595
@Configurable.Comment({
9696
"Whether the Expanded Pattern Buffer and Expanded Pattern Buffer Proxy are enabled. If AE2 is not loaded, this config will not load the machines regardless. " })
97-
public boolean expandedBuffersEnabled = false;
97+
public boolean expandedBuffersEnabled = true;
9898
}
9999

100100
public static boolean coolantEnabled() {

‎src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ public static void init(RegistrateLangProvider provider) {
8383
"Usage:",
8484
" {watfrequency} -> Current frequency: (insert frequency here)");
8585

86+
provider.add("block.gtmutils.pattern_buffer.desc.0",
87+
"§fAllows expanded direct §6AE2 pattern storage §ffor GregTech Multiblocks.");
88+
provider.add("block.gtmutils.pattern_buffer.desc.2",
89+
"§fLink §6Expanded Pattern Buffer Proxies §fwith a §bdatastick §fto link machines together!");
90+
provider.add("block.gtmutils.pattern_buffer_proxy.desc.0",
91+
"§fAllows linking many machines to a singular §6Expanded ME Pattern Buffer§f.");
92+
8693
dfs(provider, new HashSet<>(), UtilConfig.CONFIG_HOLDER.getValueMap());
8794
}
8895

‎src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
7575
if (UtilConfig.INSTANCE.features.expandedBuffersEnabled && GTCEu.Mods.isAE2Loaded()) {
7676
ASSEMBLY_LINE_RECIPES.recipeBuilder("expanded_me_pattern_buffer")
7777
.inputItems(DUAL_IMPORT_HATCH[ZPM], 1)
78-
.inputItems(EMITTER_ZPM, 1)
78+
.inputItems(EMITTER_ZPM, 4)
7979
.inputItems(CustomTags.ZPM_CIRCUITS, 4)
8080
.inputItems(AEBlocks.PATTERN_PROVIDER.asItem(), 4)
8181
.inputItems(AEBlocks.INTERFACE.asItem(), 4)
@@ -91,7 +91,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
9191
.stationResearch(b -> b.researchStack(DUAL_IMPORT_HATCH[ZPM].asStack())
9292
.CWUt(16, 32000))
9393
.duration(4000).EUt(VA[ZPM]).save(provider);
94-
ASSEMBLY_LINE_RECIPES.recipeBuilder("me_pattern_buffer_proxy")
94+
ASSEMBLY_LINE_RECIPES.recipeBuilder("expanded_me_pattern_buffer_proxy")
9595
.inputItems(GTMachines.HULL[ZPM], 1)
9696
.inputItems(SENSOR_ZPM, 4)
9797
.inputItems(CustomTags.ZPM_CIRCUITS, 2)
@@ -104,7 +104,7 @@ public static void init(Consumer<FinishedRecipe> provider) {
104104
.inputFluids(SolderingAlloy, L * 8)
105105
.inputFluids(Lubricant, 2000)
106106
.outputItems(UtilAEMachines.EXPANDED_ME_PATTERN_BUFFER_PROXY)
107-
.stationResearch(b -> b.researchStack(GTAEMachines.ME_PATTERN_BUFFER.asStack())
107+
.stationResearch(b -> b.researchStack(GTAEMachines.ME_PATTERN_BUFFER_PROXY.asStack())
108108
.CWUt(32))
109109
.duration(600).EUt(VA[ZPM]).save(provider);
110110
}

0 commit comments

Comments
 (0)