Skip to content

Commit ce5af71

Browse files
committed
Fix terminal problems (as much as possible) and remove warning about building PTERB with terminal
1 parent e920407 commit ce5af71

5 files changed

Lines changed: 4 additions & 6 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"tooltip.omnibreaker.charge_status": "∩Ǝ %s / ∩Ǝ %s :ʎbɹǝuƎ",
3939
"tooltip.omnibreaker.modern_vajra": "ɐɹظɐΛ uɹǝpoW Ɐ",
4040
"tooltip.omnibreaker.right_click_function": "¡ʞɔıןɔ-ʇɥbıɹ ɥʇıʍ sʞɔoןq ןɐnpıʌıpuı ʞɐǝɹᗺ",
41-
"tooltip.pterb_machine.dont_use_terminal": "ʎ⅁⅁∩ᗺ ʎᴚƎΛ 'ꞀⱯNIWᴚƎ⟘ ƎH⟘ H⟘IM ᗡꞀI∩ᗺ ⟘ON Oᗡ",
4241
"tooltip.pterb_machine.frequencies": "˙ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ǝןbuıs ɐ ǝʞıן ʇɔɐ ʎɔuǝnbǝɹɟ ǝɯɐs ǝɥʇ ɥʇıʍ sᗺᴚƎ⟘Ԁ ןןⱯ",
4342
"tooltip.pterb_machine.input_coolant_before_use": "¡uo ʇı buıuɹnʇ ǝɹoɟǝq ʇuɐןooɔ ʇnduı sʎɐʍןⱯ",
4443
"tooltip.pterb_machine.purpose": ")ᗺᴚƎ⟘Ԁ( ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
"tooltip.omnibreaker.charge_status": "Energy: %s EU / %s EU",
3939
"tooltip.omnibreaker.modern_vajra": "A Modern Vajra",
4040
"tooltip.omnibreaker.right_click_function": "Break individual blocks with right-click!",
41-
"tooltip.pterb_machine.dont_use_terminal": "DO NOT BUILD WITH THE TERMINAL, VERY BUGGY",
4241
"tooltip.pterb_machine.frequencies": "All PTERBs with the same frequency act like a single Active Transformer.",
4342
"tooltip.pterb_machine.input_coolant_before_use": "Always input coolant before turning it on!",
4443
"tooltip.pterb_machine.purpose": "Wireless Active Transformer (PTERB)",

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,7 @@ public static MachineDefinition[] registerTieredMachines(String name,
129129
.tooltips(Component.translatable("tooltip.pterb_machine.purpose"),
130130
Component.translatable("gtceu.machine.active_transformer.tooltip.1"),
131131
Component.translatable("tooltip.pterb_machine.frequencies")
132-
.withStyle(ChatFormatting.GRAY),
133-
Component.translatable("tooltip.pterb_machine.dont_use_terminal")
134-
.withStyle(ChatFormatting.RED))
132+
.withStyle(ChatFormatting.GRAY))
135133
.conditionalTooltip(
136134
Component
137135
.translatable("tooltip.pterb_machine.uses_coolant",

src/main/java/net/neganote/gtutilities/common/machine/multiblock/PTERBMachine.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
2323
import com.gregtechceu.gtceu.api.misc.EnergyContainerList;
2424
import com.gregtechceu.gtceu.api.pattern.TraceabilityPredicate;
25+
import com.gregtechceu.gtceu.api.pattern.error.PatternError;
2526
import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient;
2627
import com.gregtechceu.gtceu.common.data.GTItems;
2728
import com.gregtechceu.gtceu.config.ConfigHolder;
@@ -253,6 +254,8 @@ public void onStructureFormed() {
253254
// Invalidate the structure if there is not at least one output or one input
254255
if (localPowerInput.isEmpty() && localPowerOutput.isEmpty()) {
255256
this.onStructureInvalid();
257+
getMultiblockState().setError(new PatternError());
258+
return;
256259
}
257260

258261
this.localPowerInput = localPowerInput;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public static void init(RegistrateLangProvider provider) {
2121

2222
provider.add("tooltip.pterb_machine.uses_coolant", "Drains %s to function!");
2323
provider.add("tooltip.pterb_machine.input_coolant_before_use", "Always input coolant before turning it on!");
24-
provider.add("tooltip.pterb_machine.dont_use_terminal", "DO NOT BUILD WITH THE TERMINAL, VERY BUGGY");
2524

2625
provider.add("gtmutils.machine.64a_energy_converter.tooltip_tool_usage",
2726
"Starts as §fEU Converter§7, use Soft Mallet to change");

0 commit comments

Comments
 (0)