Skip to content

Distribute display voltage logic to machine implementations #4459

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TarLaboratories merged 3 commits into from
Jan 14, 2026
Merged

Distribute display voltage logic to machine implementations #4459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e10e333
Distribute display voltage logic to machine implementations
toapuro Jan 11, 2026
233b144
Merge branch '1.20.1' of https://github.com/GregTechCEu/GregTech-Mode…
toapuro Jan 14, 2026
5a36853
spotless
toapuro Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/api/machine/SimpleGeneratorMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,11 @@ public void afterWorking() {
spreadEnvironmentalHazard();
}

@Override
public long getDisplayRecipeVoltage() {
return GTValues.V[this.tier];
}

//////////////////////////////////////
// *********** GUI ***********//
//////////////////////////////////////
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,15 @@ public void onMachineRemoved() {
}
}

/// //////////////////////////////////
// ****** RECIPE LOGIC *******//
/// //////////////////////////////////

@Override
public long getDisplayRecipeVoltage() {
return GTValues.V[this.tier];
}

//////////////////////////////////////
// *********** GUI ***********//
//////////////////////////////////////
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/api/machine/feature/IRecipeLogicMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.gregtechceu.gtceu.api.recipe.GTRecipeType;
import com.gregtechceu.gtceu.api.recipe.RecipeHelper;
import com.gregtechceu.gtceu.config.ConfigHolder;
import com.gregtechceu.gtceu.integration.jade.provider.RecipeLogicProvider;

import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down Expand Up @@ -126,6 +127,14 @@ default boolean shouldWorkingPlaySound() {
(!(self() instanceof IMufflableMachine mufflableMachine) || !mufflableMachine.isMuffled());
}

/**
* Display recipe voltage used by {@link RecipeLogicProvider}
*/

default long getDisplayRecipeVoltage() {
return -1;
}

//////////////////////////////////////
// ******* IWorkable ********//
//////////////////////////////////////
Expand Down
6 changes: 6 additions & 0 deletions .../java/com/gregtechceu/gtceu/api/machine/multiblock/WorkableElectricMultiblockMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@ public long getMaxVoltage() {
}
}

@Override
public long getDisplayRecipeVoltage() {
return Math.max(this.getEnergyContainer().getHighestInputVoltage(),
this.getEnergyContainer().getOutputVoltage());
}

/**
* Is this multiblock a generator?
* Used for max voltage calculations.
Expand Down
17 changes: 3 additions & 14 deletions src/main/java/com/gregtechceu/gtceu/integration/jade/provider/RecipeLogicProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
import com.gregtechceu.gtceu.api.GTValues;
import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity;
import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper;
import com.gregtechceu.gtceu.api.machine.SimpleGeneratorMachine;
import com.gregtechceu.gtceu.api.machine.SimpleTieredMachine;
import com.gregtechceu.gtceu.api.machine.multiblock.WorkableElectricMultiblockMachine;
import com.gregtechceu.gtceu.api.machine.steam.SimpleSteamMachine;
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
import com.gregtechceu.gtceu.api.recipe.RecipeHelper;
Expand Down Expand Up @@ -62,18 +59,10 @@ protected void write(CompoundTag data, RecipeLogic capability) {
}

public static long getVoltage(RecipeLogic capability) {
long voltage = -1;
if (capability.machine instanceof SimpleTieredMachine machine) {
voltage = GTValues.V[machine.getTier()];
} else if (capability.machine instanceof SimpleGeneratorMachine machine) {
voltage = GTValues.V[machine.getTier()];
} else if (capability.machine instanceof WorkableElectricMultiblockMachine machine) {
voltage = Math.max(machine.getEnergyContainer().getHighestInputVoltage(),
machine.getEnergyContainer().getOutputVoltage());
}
long voltage = capability.machine.getDisplayRecipeVoltage();

// default display as LV, this shouldn't happen because a machine is either electric or steam
if (voltage == -1) voltage = 32;
return voltage;
return voltage == -1 ? GTValues.V[GTValues.LV] : voltage;
}

@Override
Expand Down