Skip to content

Commit be80553

Browse files
get error type as string
1 parent a98c0b2 commit be80553

4 files changed

Lines changed: 26 additions & 6 deletions

File tree

src/main/java/gregtech/api/metatileentity/MetaTileEntity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import java.util.function.Consumer;
5959

6060
import static gregtech.api.util.InventoryUtils.simulateItemStackMerge;
61-
import static gregtech.api.Situations.*;
6261

6362
public abstract class MetaTileEntity implements ICoverable {
6463

src/main/java/gregtech/api/situation/Situation.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ public Situation(int id, String situationName, SituationTypes situationTypes) {
1818
registerSituation(id,situationName,this);
1919
}
2020

21+
public String getSituationErrorLevel(Situation situation) {
22+
return situation.situationTypes.toString();
23+
}
24+
2125
void registerSituation(int id, String situationName, Situation situation){
2226
SITUATION_REGISTRY.register(id, situationName, situation);
2327
}
Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
package gregtech.api.situation;
22

3-
public enum SituationTypes {
4-
WORKING,
5-
IDLE,
6-
ERROR,
7-
WARNING
3+
import net.minecraft.util.IStringSerializable;
4+
5+
public enum SituationTypes implements IStringSerializable {
6+
WORKING("gregtech.situation.level.warning"),
7+
IDLE("gregtech.situation.level.idle"),
8+
ERROR("gregtech.situation.level.error"),
9+
WARNING("gregtech.situation.level.warning");
10+
11+
public final String errorLevelName;
12+
13+
SituationTypes(String errorLevelName) {this.errorLevelName = errorLevelName;}
14+
15+
@Override
16+
public String getName() {
17+
return errorLevelName;
18+
}
819
}
20+
21+

src/main/resources/assets/gregtech/lang/en_us.lang

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,10 @@ cover.machine_controller.mode.cover_north=Control Cover (North)
757757
cover.machine_controller.mode.cover_east=Control Cover (East)
758758
cover.machine_controller.mode.cover_west=Control Cover (West)
759759

760+
gregtech.situation.level.working=WORKING
761+
gregtech.situation.level.idle=IDLING
762+
gregtech.situation.level.warning=WARNING
763+
gregtech.situation.level.error=ERROR
760764
gregtech.situation.idle=Idling
761765
gregtech.situation.disabled_by_controller=Disabled by controller cover
762766
gregtech.situation.working=Working

0 commit comments

Comments
 (0)