mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use generic key mapping function

Browse Source
This commit is contained in:
Astrash 2022-11-25 14:10:07 +11:00
parent 8670c4cdf3
commit 4fdef98bd9
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/config/converter/mapping/DefinedBiomeColorMappingTemplate.java
View File

@ -17,6 +17,7 @@ public class DefinedBiomeColorMappingTemplate implements ObjectTemplate<ColorMap
@Override @Override
public ColorMapping<Biome> get() { public ColorMapping<Biome> get() {
return () -> MapUtil.convertKeysToInt(map); var map = MapUtil.mapKeys(this.map, Integer::decode);
return () -> map;
} }
} }

12
common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/util/MapUtil.java
View File

@ -2,6 +2,7 @@ package com.dfsek.terra.addons.image.util;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -10,13 +11,14 @@ public class MapUtil {
private MapUtil() {} private MapUtil() {}
/** /**
* Utility method for converting config keys into integers, * Utility method for applying transformations on a map's keys.
* used because Tectonic does not accept non string keys.
*/ */
public static <T> Map<Integer, T> convertKeysToInt(Map<String, T> map) { public static <O, N, T> Map<N, T> mapKeys(Map<O, T> map, Function<O, N> mappingFunction) {
return map.entrySet().stream() return map
.entrySet()
.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
e -> Integer.decode(e.getKey()), e -> mappingFunction.apply(e.getKey()),
Entry::getValue Entry::getValue
)); ));
} }