Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/main/java/alexiil/mods/load/LiteLoaderProgress.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

public class LiteLoaderProgress extends LoadingBar {

private static final int NUM_STATES = ModLoadingListener.State.values().length;
private static final int NUM_STATES = ModLoadingListener.State.VALUES.length;
private static final int LITE_LOADER_INIT_ORDINAL = ModLoadingListener.State.LITE_LOADER_INIT.ordinal();
private static final float LITE_LOADER_START_PERCENT = LITE_LOADER_INIT_ORDINAL / (float) NUM_STATES;

Expand Down
10 changes: 6 additions & 4 deletions src/main/java/alexiil/mods/load/ModLoadingListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ public enum State {
LOAD_COMPLETE("completed"),
FINAL_LOADING("reloading_resource_packs", true, false);

public static final State[] VALUES = values();

private String translatedName = null;
final String name;
/**
Expand Down Expand Up @@ -84,8 +86,8 @@ public ModStage getNext() {
if (ind == listeners.size() || s.isLoneState) {
ind = 0;
int ord = s.ordinal() + 1;
if (ord == State.values().length) return null;
s = State.values()[ord];
if (ord == State.VALUES.length) return null;
s = State.VALUES[ord];
if (s.shouldSkip) return new ModStage(s, ind).getNext();
}
return new ModStage(s, ind);
Expand All @@ -100,15 +102,15 @@ public String getDisplayText() {
}

public float getProgress() {
float values = 100 / (float) (State.values().length - 1);
float values = 100 / (float) (State.VALUES.length - 1);
float part = state.ordinal() * values;
float size = listeners.size();
float percent = values * index / size;
return part + percent;
}

public float getPercent() {
float values = 100 / (float) (State.values().length - 1);
float values = 100 / (float) (State.VALUES.length - 1);
float size = listeners.size();
return values * index / size;
}
Expand Down