Skip to content

Commit 554b22f

Browse files
committed
more PTERB fix attempts, warning not to use terminal
1 parent 1c16912 commit 554b22f

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
1111
mapping_version=2023.09.03-1.20.1
1212

1313
# Mod Properties
14-
mod_version=1.1.5
14+
mod_version=1.1.6-dev
1515
maven_group=net.neganote.gtmutils
1616
archives_base_name=gtmutils
1717
mod_id=gtmutils

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

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

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

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ public static MachineDefinition[] registerTieredMachines(String name,
128128
.tooltips(Component.translatable("tooltip.pterb_machine.purpose"),
129129
Component.translatable("gtceu.machine.active_transformer.tooltip.1"),
130130
Component.translatable("tooltip.pterb_machine.frequencies")
131-
.withStyle(ChatFormatting.GRAY))
131+
.withStyle(ChatFormatting.GRAY),
132+
Component.translatable("tooltip.pterb_machine.dont_use_terminal")
133+
.withStyle(ChatFormatting.RED))
132134
.conditionalTooltip(
133135
Component
134136
.translatable("tooltip.pterb_machine.uses_coolant",

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ public PTERBMachine(IMachineBlockEntity holder) {
9797
}
9898

9999
public void explode() {
100+
removeWirelessEnergy();
101+
100102
long inputVoltage = 0;
101103
long outputVoltage = 0;
102104

@@ -112,9 +114,7 @@ public void explode() {
112114

113115
long tier = Math.max(GTUtil.getFloorTierByVoltage(inputVoltage), GTUtil.getFloorTierByVoltage(outputVoltage));
114116

115-
removeWirelessEnergy();
116-
117-
doExplosion(6f + tier);
117+
doExplosion(15f + tier);
118118
}
119119

120120
public void convertEnergyTick() {
@@ -212,6 +212,10 @@ public boolean onWorking() {
212212
public void onStructureFormed() {
213213
super.onStructureFormed();
214214

215+
if (frequency == 0) {
216+
setWorkingEnabled(false);
217+
}
218+
215219
// capture all energy containers
216220
List<IMultiPart> localPowerInput = new ArrayList<>();
217221
List<IMultiPart> localPowerOutput = new ArrayList<>();
@@ -294,7 +298,7 @@ public void onStructureInvalid() {
294298
this.localPowerOutput = new ArrayList<>();
295299
this.localPowerInput = new ArrayList<>();
296300
this.coolantHatchPos = null;
297-
getRecipeLogic().setStatus(RecipeLogic.Status.SUSPEND);
301+
setWorkingEnabled(false);
298302
converterSubscription.unsubscribe();
299303
}
300304

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ 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");
2425

2526
provider.add("gtmutils.multiblock.pterb_machine.coolant_usage", "§cDrains %sL of %s per second");
2627
provider.add("gtmutils.pterb_machine.invalid_frequency", "PTERBs will not work on frequency 0!");

0 commit comments

Comments
 (0)