Skip to content

Spotless apply for branch 2.9 for #275 #294

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
sysnote8main merged 1 commit into from
Sep 9, 2024
Merged

Spotless apply for branch 2.9 for #275 #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/main/java/gtexpert/integration/eio/metatileentities/EIOMetaTileEntities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import static gtexpert.api.util.GTEUtility.gteId;

import gregtech.api.metatileentity.SimpleMachineMetaTileEntity;

import gregtech.api.util.GTUtility;

import gtexpert.api.util.GTEUtility;
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/gtexpert/integration/eio/metatileentities/ElectricSpawnerLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import gregtech.api.capability.IEnergyContainer;
import gregtech.api.capability.impl.RecipeLogicEnergy;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.recipes.logic.OverclockingLogic;
import gregtech.api.util.GTTransferUtils;
import gregtech.api.util.GTUtility;

Expand Down Expand Up @@ -166,13 +165,15 @@ private boolean setupAndConsumeInputs(@NotNull ItemStack outputItem) {
return consumeEmptyVial();
}

public static int @NotNull [] standardOverclockingLogic(int recipeEUt, long maxVoltage, int recipeDuration, int numberOfOCs, double durationDivisor, double voltageMultiplier) {
public static int @NotNull [] standardOverclockingLogic(int recipeEUt, long maxVoltage, int recipeDuration,
int numberOfOCs, double durationDivisor,
double voltageMultiplier) {
double resultDuration = recipeDuration;

double resultVoltage;
for(resultVoltage = recipeEUt; numberOfOCs > 0 && resultDuration != 1.0; --numberOfOCs) {
for (resultVoltage = recipeEUt; numberOfOCs > 0 && resultDuration != 1.0; --numberOfOCs) {
double potentialVoltage = resultVoltage * voltageMultiplier;
if (potentialVoltage > (double)maxVoltage) {
if (potentialVoltage > (double) maxVoltage) {
break;
}

Expand All @@ -185,10 +186,11 @@ private boolean setupAndConsumeInputs(@NotNull ItemStack outputItem) {
resultVoltage = potentialVoltage;
}

return new int[]{(int)resultVoltage, (int)resultDuration};
return new int[] { (int) resultVoltage, (int) resultDuration };
}

private int processTime, processEut;

private boolean checkOverclock() {
// TODO: adjust energy consumption
int eut = 30;
Expand Down