Skip to content
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

add cycle idle status for waterline units #3422

Merged
merged 3 commits into from
Oct 27, 2024
Merged

add cycle idle status for waterline units #3422

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
dc68b65
add a cycle idle status
VinDevGH Oct 26, 2024
971b6b8
Merge remote-tracking branch 'refs/remotes/upstream/master' into wate…
VinDevGH Oct 26, 2024
3c54085
adjust comment and text color
VinDevGH Oct 26, 2024
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
6 changes: 6 additions & 0 deletions src/main/java/gregtech/api/recipe/check/CheckRecipeResultRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,12 @@ public static boolean isRegistered(String id) {

public static final CheckRecipeResult NO_SEE_SKY = SimpleCheckRecipeResult.ofFailure("no_see_sky");

/**
* Machine is waiting for the main controller to start the cycle.
*/
@Nonnull
public static final CheckRecipeResult CYCLE_IDLE = SimpleCheckRecipeResult.ofSuccess("cycle_idle");

/**
* Cannot process recipe because the machine cannot handle required EUt.
*/
Expand Down
1 change: 1 addition & 0 deletions ...ava/gregtech/common/tileentities/machines/multi/purification/MTEPurificationUnitBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,7 @@ public void endCycle() {
}

// Reset recipe values for next iteration
checkRecipeResult = CheckRecipeResultRegistry.CYCLE_IDLE;
this.mMaxProgresstime = 0;
this.mProgresstime = 0;
this.lEUt = 0;
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/gregtech/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ GT5U.gui.text.crash=§4Machine turned off due to crash. Refer to the log for mor
GT5U.gui.text.no_fuel=§7No valid fuel found
GT5U.gui.text.no_turbine=§7No valid turbine found
GT5U.gui.text.no_lubricant=§7No lubricant found
GT5U.gui.text.cycle_idle=§6Waiting for cycle to start
GT5U.gui.text.fuel_quality_too_high=§7Fuel quality too high to run without boost
GT5U.gui.text.no_data_sticks=§7No Data Sticks found
GT5U.gui.text.bio_upgrade_missing=§7Recipe needs Bio Upgrade to start
Expand Down
Loading