mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-06-21 08:11:06 +00:00
rename MaterialSet
This commit is contained in:
+3
-3
@@ -17,7 +17,7 @@ import java.util.List;
|
||||
import com.dfsek.terra.addons.flora.flora.gen.BlockLayer;
|
||||
import com.dfsek.terra.api.config.AbstractableTemplate;
|
||||
import com.dfsek.terra.api.config.meta.Meta;
|
||||
import com.dfsek.terra.api.util.collection.MaterialSet;
|
||||
import com.dfsek.terra.api.util.collection.BlockStateSet;
|
||||
|
||||
|
||||
@SuppressWarnings({ "FieldMayBeFinal", "unused" })
|
||||
@@ -27,7 +27,7 @@ public class FloraTemplate implements AbstractableTemplate {
|
||||
private String id;
|
||||
@Value("rotatable")
|
||||
@Default
|
||||
private @Meta MaterialSet rotatable = MaterialSet.empty();
|
||||
private @Meta BlockStateSet rotatable = BlockStateSet.empty();
|
||||
|
||||
@Value("physics")
|
||||
@Default
|
||||
@@ -63,7 +63,7 @@ public class FloraTemplate implements AbstractableTemplate {
|
||||
return ceiling;
|
||||
}
|
||||
|
||||
public MaterialSet getRotatable() {
|
||||
public BlockStateSet getRotatable() {
|
||||
return rotatable;
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -20,7 +20,7 @@ import java.util.random.RandomGeneratorFactory;
|
||||
import com.dfsek.terra.api.block.state.BlockState;
|
||||
import com.dfsek.terra.api.block.state.properties.enums.Direction;
|
||||
import com.dfsek.terra.api.structure.Structure;
|
||||
import com.dfsek.terra.api.util.collection.MaterialSet;
|
||||
import com.dfsek.terra.api.util.collection.BlockStateSet;
|
||||
import com.dfsek.terra.api.util.collection.ProbabilityCollection;
|
||||
import com.dfsek.terra.api.world.WritableWorld;
|
||||
|
||||
@@ -30,14 +30,14 @@ public class TerraFlora implements Structure {
|
||||
private final boolean physics;
|
||||
private final boolean ceiling;
|
||||
|
||||
private final MaterialSet testRotation;
|
||||
private final BlockStateSet testRotation;
|
||||
|
||||
private final Sampler distribution;
|
||||
|
||||
private final String id;
|
||||
|
||||
public TerraFlora(List<BlockLayer> layers, boolean physics, boolean ceiling,
|
||||
MaterialSet testRotation,
|
||||
BlockStateSet testRotation,
|
||||
Sampler distribution, String id) {
|
||||
this.physics = physics;
|
||||
this.testRotation = testRotation;
|
||||
|
||||
Reference in New Issue
Block a user