mirror of
https://github.com/BentoBoxWorld/CaveBlock.git
synced 2024-12-01 13:03:23 +01:00
Change Map structure:
- It will return Integer to pair...
This commit is contained in:
parent
2db3f0ddfa
commit
3854617fca
@ -270,9 +270,9 @@ public class ChunkGeneratorWorld extends ChunkGenerator
|
|||||||
* @param objectList List with objects that contains data.
|
* @param objectList List with objects that contains data.
|
||||||
* @return Map that contains material, its rarity and pack size.
|
* @return Map that contains material, its rarity and pack size.
|
||||||
*/
|
*/
|
||||||
private Map<Material, Pair<Integer, Integer>> getMaterialMap(List<String> objectList)
|
private Map<Integer, Pair<Material, Integer>> getMaterialMap(List<String> objectList)
|
||||||
{
|
{
|
||||||
Map<Material, Pair<Integer, Integer>> materialMap = new HashMap<>(objectList.size());
|
Map<Integer, Pair<Material, Integer>> materialMap = new HashMap<>(objectList.size());
|
||||||
|
|
||||||
// wrong material object.
|
// wrong material object.
|
||||||
objectList.stream().
|
objectList.stream().
|
||||||
@ -280,12 +280,12 @@ public class ChunkGeneratorWorld extends ChunkGenerator
|
|||||||
map(object -> object.split(":")).
|
map(object -> object.split(":")).
|
||||||
filter(splitString -> splitString.length == 4).
|
filter(splitString -> splitString.length == 4).
|
||||||
forEach(splitString -> {
|
forEach(splitString -> {
|
||||||
Material material = Material.getMaterial(splitString[0]);
|
Material material = Material.getMaterial(splitString[1]);
|
||||||
|
|
||||||
if (material != null)
|
if (material != null)
|
||||||
{
|
{
|
||||||
materialMap.put(material,
|
materialMap.put(Integer.parseInt(splitString[2]),
|
||||||
new Pair<>(Integer.parseInt(splitString[1]), Integer.parseInt(splitString[2])));
|
new Pair<>(material, Integer.parseInt(splitString[3])));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -298,9 +298,9 @@ public class ChunkGeneratorWorld extends ChunkGenerator
|
|||||||
* @param objectList List with objects that contains data.
|
* @param objectList List with objects that contains data.
|
||||||
* @return Map that contains entity, its rarity and pack size.
|
* @return Map that contains entity, its rarity and pack size.
|
||||||
*/
|
*/
|
||||||
private Map<EntityType, Pair<Integer, Integer>> getEntityMap(List<String> objectList)
|
private Map<Integer, Pair<EntityType, Integer>> getEntityMap(List<String> objectList)
|
||||||
{
|
{
|
||||||
Map<EntityType, Pair<Integer, Integer>> entityMap = new HashMap<>(objectList.size());
|
Map<Integer, Pair<EntityType, Integer>> entityMap = new HashMap<>(objectList.size());
|
||||||
|
|
||||||
Map<String, EntityType> entityTypeMap = Arrays.stream(EntityType.values()).
|
Map<String, EntityType> entityTypeMap = Arrays.stream(EntityType.values()).
|
||||||
collect(Collectors.toMap(Enum::name,
|
collect(Collectors.toMap(Enum::name,
|
||||||
@ -318,8 +318,8 @@ public class ChunkGeneratorWorld extends ChunkGenerator
|
|||||||
|
|
||||||
if (entity != null)
|
if (entity != null)
|
||||||
{
|
{
|
||||||
entityMap.put(entity,
|
entityMap.put(Integer.parseInt(splitString[2]),
|
||||||
new Pair<>(Integer.parseInt(splitString[1]), Integer.parseInt(splitString[2])));
|
new Pair<>(entity, Integer.parseInt(splitString[3])));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user