From c537605880fc74c9123543209cc8d110e6bdaa1b Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 28 Dec 2025 20:53:51 -0700 Subject: [PATCH] rename MaterialSet --- .../terra/addons/flora/FloraTemplate.java | 6 +++--- .../addons/flora/flora/gen/TerraFlora.java | 6 +++--- .../pattern/BlockSetMatchPatternTemplate.java | 4 ++-- .../dfsek/terra/addons/ore/OreTemplate.java | 6 +++--- .../terra/addons/ore/ores/VanillaOre.java | 8 ++++---- .../addons/ore/ores/VanillaScatteredOre.java | 4 ++-- .../addons/ore/utils/VanillaOreUtils.java | 4 ++-- .../{MaterialSet.java => BlockStateSet.java} | 18 +++++++++--------- .../com/dfsek/terra/config/GenericLoaders.java | 4 ++-- .../config/loaders/MaterialSetLoader.java | 10 +++++----- 10 files changed, 35 insertions(+), 35 deletions(-) rename common/api/src/main/java/com/dfsek/terra/api/util/collection/{MaterialSet.java => BlockStateSet.java} (89%) diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java index 6be89444e..0f94a9e82 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java @@ -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; } } diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java index 26c8fbd26..43128f137 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java @@ -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 layers, boolean physics, boolean ceiling, - MaterialSet testRotation, + BlockStateSet testRotation, Sampler distribution, String id) { this.physics = physics; this.testRotation = testRotation; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java index 08116ae0c..cf97dc558 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java @@ -13,13 +13,13 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern; import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.terra.api.util.collection.MaterialSet; +import com.dfsek.terra.api.util.collection.BlockStateSet; import com.dfsek.terra.api.util.range.Range; public class BlockSetMatchPatternTemplate implements ObjectTemplate { @Value("blocks") - private @Meta MaterialSet blocks; + private @Meta BlockStateSet blocks; @Value("offset") private @Meta Range offset; diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java index d10d03e02..82c16ba11 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java @@ -19,7 +19,7 @@ import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; 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({ "unused", "FieldMayBeFinal" }) @@ -36,7 +36,7 @@ public class OreTemplate implements AbstractableTemplate { private @Meta Map<@Meta BlockType, @Meta BlockState> materials = new HashMap<>(); @Value("replace") - private @Meta MaterialSet replaceable; + private @Meta BlockStateSet replaceable; @Value("physics") @Default @@ -62,7 +62,7 @@ public class OreTemplate implements AbstractableTemplate { return material; } - public MaterialSet getReplaceable() { + public BlockStateSet getReplaceable() { return replaceable; } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java index a3f5b8d00..be1971529 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java @@ -20,7 +20,7 @@ import java.util.random.RandomGenerator; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; 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.world.WritableWorld; import static com.dfsek.terra.addons.ore.utils.VanillaOreUtils.shouldPlace; @@ -31,12 +31,12 @@ public class VanillaOre implements Structure { protected final BlockState material; protected final double size; - protected final MaterialSet replaceable; + protected final BlockStateSet replaceable; protected final boolean applyGravity; protected final double exposed; protected final Map materials; - public VanillaOre(BlockState material, double size, MaterialSet replaceable, boolean applyGravity, + public VanillaOre(BlockState material, double size, BlockStateSet replaceable, boolean applyGravity, double exposed, Map materials) { this.material = material; this.size = size; @@ -171,7 +171,7 @@ public class VanillaOre implements Structure { return materials.getOrDefault(replace, material); } - public MaterialSet getReplaceable() { + public BlockStateSet getReplaceable() { return replaceable; } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java index 708450a35..9f7e70168 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java @@ -8,7 +8,7 @@ import java.util.random.RandomGenerator; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.util.collection.MaterialSet; +import com.dfsek.terra.api.util.collection.BlockStateSet; import com.dfsek.terra.api.world.WritableWorld; import static com.dfsek.terra.addons.ore.utils.VanillaOreUtils.shouldPlace; @@ -17,7 +17,7 @@ import static com.dfsek.terra.addons.ore.utils.VanillaOreUtils.shouldPlace; public class VanillaScatteredOre extends VanillaOre { protected final int spread; - public VanillaScatteredOre(BlockState material, double size, MaterialSet replaceable, boolean applyGravity, double exposed, + public VanillaScatteredOre(BlockState material, double size, BlockStateSet replaceable, boolean applyGravity, double exposed, Map materials, int spread) { super(material, size, replaceable, applyGravity, exposed, materials); diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/utils/VanillaOreUtils.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/utils/VanillaOreUtils.java index 4f892db37..993d808ef 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/utils/VanillaOreUtils.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/utils/VanillaOreUtils.java @@ -3,7 +3,7 @@ package com.dfsek.terra.addons.ore.utils; import java.util.random.RandomGenerator; import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.util.collection.MaterialSet; +import com.dfsek.terra.api.util.collection.BlockStateSet; import com.dfsek.terra.api.world.WritableWorld; @@ -14,7 +14,7 @@ public class VanillaOreUtils { return random.nextFloat() < exposedChance; } - public static boolean shouldPlace(MaterialSet replaceable, BlockType type, Double exposedChance, RandomGenerator random, + public static boolean shouldPlace(BlockStateSet replaceable, BlockType type, Double exposedChance, RandomGenerator random, WritableWorld world, int x, int y, int z) { diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java b/common/api/src/main/java/com/dfsek/terra/api/util/collection/BlockStateSet.java similarity index 89% rename from common/api/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java rename to common/api/src/main/java/com/dfsek/terra/api/util/collection/BlockStateSet.java index 7875535e6..a23c6ea0f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/collection/BlockStateSet.java @@ -21,35 +21,35 @@ import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; -public class MaterialSet extends HashSet { +public class BlockStateSet extends HashSet { @Serial private static final long serialVersionUID = 3056512763631017301L; - public static MaterialSet singleton(BlockType material) { + public static BlockStateSet singleton(BlockType material) { return new Singleton(material); } - public static MaterialSet get(BlockType... materials) { - MaterialSet set = new MaterialSet(); + public static BlockStateSet get(BlockType... materials) { + BlockStateSet set = new BlockStateSet(); set.addAll(Arrays.asList(materials)); return set; } - public static MaterialSet get(BlockState... materials) { - MaterialSet set = new MaterialSet(); + public static BlockStateSet get(BlockState... materials) { + BlockStateSet set = new BlockStateSet(); Arrays.stream(materials).forEach(set::add); return set; } - public static MaterialSet empty() { - return new MaterialSet(); + public static BlockStateSet empty() { + return new BlockStateSet(); } private void add(BlockState data) { add(data.getBlockType()); } - private static final class Singleton extends MaterialSet { + private static final class Singleton extends BlockStateSet { private final BlockType element; Singleton(BlockType e) { diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java index bdb243e71..23500f90a 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java @@ -29,7 +29,7 @@ import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.tectonic.LoaderRegistrar; -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.util.range.Range; import com.dfsek.terra.config.loaders.ExpressionParserOptionsTemplate; @@ -53,7 +53,7 @@ public class GenericLoaders implements LoaderRegistrar { registry.registerLoader(ProbabilityCollection.class, new ProbabilityCollectionLoader()) .registerLoader(Range.class, new RangeLoader()) .registerLoader(Version.class, new VersionLoader()) - .registerLoader(MaterialSet.class, new MaterialSetLoader()) + .registerLoader(BlockStateSet.class, new MaterialSetLoader()) .registerLoader(VersionRange.class, new VersionRangeLoader()) .registerLoader(LinkedHashMap.class, new LinkedHashMapLoader()) .registerLoader(ParseOptions.class, ExpressionParserOptionsTemplate::new); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java index 8d2f0fb5f..3cfe3fa53 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java @@ -27,21 +27,21 @@ import java.lang.reflect.AnnotatedType; import java.util.List; import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.util.collection.MaterialSet; +import com.dfsek.terra.api.util.collection.BlockStateSet; @SuppressWarnings("unchecked") -public class MaterialSetLoader implements TypeLoader { +public class MaterialSetLoader implements TypeLoader { @Override - public MaterialSet load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker) + public BlockStateSet load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker) throws LoadException { List stringData = (List) o; if(stringData.size() == 1) { - return MaterialSet.singleton(configLoader.loadType(BlockType.class, stringData.get(0), depthTracker)); + return BlockStateSet.singleton(configLoader.loadType(BlockType.class, stringData.get(0), depthTracker)); } - MaterialSet set = new MaterialSet(); + BlockStateSet set = new BlockStateSet(); for(String string : stringData) { try {