mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-08-29 21:30:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve ProbabilityCollection#map impl

Browse Source
This commit is contained in:
dfsek
2021-06-14 19:13:16 -07:00
parent 733b9fab4b
commit 7473119238
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/dfsek/terra/api/util/collections/ProbabilityCollection.java
+1 -6
View File
@@ -49,12 +49,7 @@ public class ProbabilityCollection<E> implements Collection<E> {
public <T> ProbabilityCollection<T> map(Function<E, T> mapper, boolean carryNull) { public <T> ProbabilityCollection<T> map(Function<E, T> mapper, boolean carryNull) {
ProbabilityCollection<T> newCollection = new ProbabilityCollection<>(); ProbabilityCollection<T> newCollection = new ProbabilityCollection<>();
newCollection.array = new Object[array.length]; cont.forEach((o, count) -> newCollection.add(mapper.apply(o), count.get()));
for(int i = 0; i < array.length; i++) {
if(carryNull && array[i] == null) continue;
newCollection.array[i] = mapper.apply((E) array[i]);
}
return newCollection; return newCollection;
} }
common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/StageTemplate.java
+2 -1
View File
@@ -2,6 +2,7 @@ package com.dfsek.terra.config.loaders.config.biome.templates.stage;
import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.loading.object.ObjectTemplate; import com.dfsek.tectonic.loading.object.ObjectTemplate;
import com.dfsek.terra.api.config.meta.MetaValue;
import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.util.seeded.SeededBuilder; import com.dfsek.terra.api.util.seeded.SeededBuilder;
import com.dfsek.terra.api.util.seeded.StageSeeded; import com.dfsek.terra.api.util.seeded.StageSeeded;
@@ -9,7 +10,7 @@ import com.dfsek.terra.api.world.biome.pipeline.stages.Stage;
public abstract class StageTemplate implements ObjectTemplate<SeededBuilder<Stage>>, StageSeeded { public abstract class StageTemplate implements ObjectTemplate<SeededBuilder<Stage>>, StageSeeded {
@Value("noise") @Value("noise")
protected NoiseSeeded noise; protected MetaValue<NoiseSeeded> noise;
@Override @Override
public StageSeeded get() { public StageSeeded get() {
common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/expander/ExpanderStageTemplate.java
+1 -1
View File
@@ -8,6 +8,6 @@ import com.dfsek.terra.config.loaders.config.biome.templates.stage.StageTemplate
public class ExpanderStageTemplate extends StageTemplate { public class ExpanderStageTemplate extends StageTemplate {
@Override @Override
public Stage apply(Long seed) { public Stage apply(Long seed) {
return new ExpanderStage(new FractalExpander(noise.apply(seed))); return new ExpanderStage(new FractalExpander(noise.get().apply(seed)));
} }
} }
common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/stage/mutator/BorderListMutatorTemplate.java
+1 -1
View File
@@ -31,6 +31,6 @@ public class BorderListMutatorTemplate extends MutatorStageTemplate {
replace.forEach((keyBuilder, replacements) -> replaceMap.put(keyBuilder.apply(seed), replacements.map(replacement -> replacement.apply(seed), true))); replace.forEach((keyBuilder, replacements) -> replaceMap.put(keyBuilder.apply(seed), replacements.map(replacement -> replacement.apply(seed), true)));
return new BorderListMutator(replaceMap, from, defaultReplace, noise.apply(seed), defaultTo.map(biomeBuilder -> biomeBuilder.apply(seed), true)); return new BorderListMutator(replaceMap, from, defaultReplace, noise.get().apply(seed), defaultTo.map(biomeBuilder -> biomeBuilder.apply(seed), true));
} }
} }