mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-04 23:06:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix MaterialSet issues

Browse Source
This commit is contained in:
dfsek
2021-07-05 01:14:34 -07:00
parent 1a50060ff0
commit d8eeeded60
7 changed files with 54 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
common/implementation/src/main/java/com/dfsek/terra/api/util/collections/MaterialSetImpl.java
View File

@@ -1,38 +0,0 @@
package com.dfsek.terra.api.util.collections;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.BlockType;
import com.dfsek.terra.api.util.MaterialSet;
import java.util.Arrays;
import java.util.HashSet;
public class MaterialSetImpl extends HashSet<BlockType> implements MaterialSet {
private static final long serialVersionUID = 3056512763631017301L;
public static MaterialSetImpl singleton(BlockType material) {
MaterialSetImpl set = new MaterialSetImpl();
set.add(material);
return set;
}
public static MaterialSetImpl get(BlockType... materials) {
MaterialSetImpl set = new MaterialSetImpl();
set.addAll(Arrays.asList(materials));
return set;
}
public static MaterialSetImpl get(BlockState... materials) {
MaterialSetImpl set = new MaterialSetImpl();
Arrays.stream(materials).forEach(set::add);
return set;
}
public static MaterialSetImpl empty() {
return new MaterialSetImpl();
}
private void add(BlockState data) {
add(data.getBlockType());
}
}

4
common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java
View File

@@ -5,9 +5,9 @@ import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.block.BlockType;
import com.dfsek.terra.api.tectonic.LoaderRegistrar;
import com.dfsek.terra.api.util.MaterialSet;
import com.dfsek.terra.api.util.ProbabilityCollection;
import com.dfsek.terra.api.util.Range;
import com.dfsek.terra.api.util.collections.MaterialSetImpl;
import com.dfsek.terra.api.world.biome.generation.pipeline.BiomeSource;
import com.dfsek.terra.config.loaders.LinkedHashMapLoader;
import com.dfsek.terra.config.loaders.MaterialSetLoader;
@@ -27,7 +27,7 @@ public class GenericLoaders implements LoaderRegistrar {
public void register(TypeRegistry registry) {
registry.registerLoader(ProbabilityCollection.class, new ProbabilityCollectionLoader())
.registerLoader(Range.class, new RangeLoader())
.registerLoader(MaterialSetImpl.class, new MaterialSetLoader())
.registerLoader(MaterialSet.class, new MaterialSetLoader())
.registerLoader(LinkedHashMap.class, new LinkedHashMapLoader())
.registerLoader(BiomeSource.Type.class, (t, object, cf) -> BiomeSource.Type.valueOf((String) object));

8
common/implementation/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java
View File

@@ -4,17 +4,17 @@ import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.api.block.BlockType;
import com.dfsek.terra.api.util.collections.MaterialSetImpl;
import com.dfsek.terra.api.util.MaterialSet;
import java.lang.reflect.Type;
import java.util.List;
@SuppressWarnings("unchecked")
public class MaterialSetLoader implements TypeLoader<MaterialSetImpl> {
public class MaterialSetLoader implements TypeLoader<MaterialSet> {
@Override
public MaterialSetImpl load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
public MaterialSet load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
List<String> stringData = (List<String>) o;
MaterialSetImpl set = new MaterialSetImpl();
MaterialSet set = new MaterialSet();
for(String string : stringData) {
try {