Merge changes from hamusuke (#1)

This commit is contained in:
KingRainbow44
2023-08-26 17:57:46 -04:00
parent 7dd63e9816
commit 396f302eac
14 changed files with 195 additions and 89 deletions

View File

@@ -2,6 +2,7 @@ package emu.grasscutter.game.props;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;
@@ -13,17 +14,18 @@ public enum ClimateType {
CLIMATE_RAIN(3),
CLIMATE_THUNDERSTORM(4),
CLIMATE_SNOW(5),
CLIMATE_MIST(6);
CLIMATE_MIST(6),
CLIMATE_DESERT(7);
private static final Int2ObjectMap<ClimateType> map = new Int2ObjectOpenHashMap<>();
private static final Map<String, ClimateType> stringMap = new HashMap<>();
static {
Stream.of(values())
.forEach(
e -> {
map.put(e.getValue(), e);
stringMap.put(e.name(), e);
.forEach(
e -> {
map.put(e.getValue(), e);
stringMap.put(e.name(), e);
});
}