mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-06-18 06:40:55 +00:00
Change Java whitespace handling in .editorconfig (#425)
* Change whitespace handling in .editorconfig * Reformat code * fix format error * Reformat code --------- Co-authored-by: Zoë Gidiere <duplexsys@protonmail.com>
This commit is contained in:
+9
-9
@@ -20,19 +20,19 @@ import com.dfsek.terra.api.inject.annotations.Inject;
|
||||
public class PaletteAddon implements AddonInitializer {
|
||||
@Inject
|
||||
private Platform platform;
|
||||
|
||||
|
||||
@Inject
|
||||
private BaseAddon addon;
|
||||
|
||||
|
||||
@Override
|
||||
public void initialize() {
|
||||
platform.getEventManager()
|
||||
.getHandler(FunctionalEventHandler.class)
|
||||
.register(addon, ConfigPackPreLoadEvent.class)
|
||||
.then(event -> {
|
||||
event.getPack().registerConfigType(new PaletteConfigType(platform), addon.key("PALETTE"), 2);
|
||||
event.getPack().applyLoader(PaletteLayerHolder.class, PaletteLayerLoader::new);
|
||||
})
|
||||
.failThrough();
|
||||
.getHandler(FunctionalEventHandler.class)
|
||||
.register(addon, ConfigPackPreLoadEvent.class)
|
||||
.then(event -> {
|
||||
event.getPack().registerConfigType(new PaletteConfigType(platform), addon.key("PALETTE"), 2);
|
||||
event.getPack().applyLoader(PaletteLayerHolder.class, PaletteLayerLoader::new);
|
||||
})
|
||||
.failThrough();
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -20,21 +20,21 @@ public class PaletteConfigType implements ConfigType<PaletteTemplate, Palette> {
|
||||
};
|
||||
private final PaletteFactory factory = new PaletteFactory();
|
||||
private final Platform platform;
|
||||
|
||||
|
||||
public PaletteConfigType(Platform platform) {
|
||||
this.platform = platform;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public PaletteTemplate getTemplate(ConfigPack pack, Platform platform) {
|
||||
return new PaletteTemplate();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ConfigFactory<PaletteTemplate, Palette> getFactory() {
|
||||
return factory;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public TypeKey<Palette> getTypeKey() {
|
||||
return PALETTE_TYPE_TOKEN;
|
||||
|
||||
+5
-5
@@ -24,22 +24,22 @@ public class PaletteTemplate implements AbstractableTemplate {
|
||||
@Value("sampler")
|
||||
@Default
|
||||
private @Meta NoiseSampler noise = NoiseSampler.zero();
|
||||
|
||||
|
||||
@Value("id")
|
||||
@Final
|
||||
private String id;
|
||||
|
||||
|
||||
@Value("layers")
|
||||
private @Meta List<@Meta PaletteLayerHolder> palette;
|
||||
|
||||
|
||||
public String getID() {
|
||||
return id;
|
||||
}
|
||||
|
||||
|
||||
public List<PaletteLayerHolder> getPalette() {
|
||||
return palette;
|
||||
}
|
||||
|
||||
|
||||
public NoiseSampler getNoise() {
|
||||
return noise;
|
||||
}
|
||||
|
||||
+11
-11
@@ -23,18 +23,18 @@ import com.dfsek.terra.api.world.chunk.generation.util.Palette;
|
||||
public class PaletteImpl implements Palette {
|
||||
private final List<PaletteLayer> pallet = new ArrayList<>();
|
||||
private final NoiseSampler sampler;
|
||||
|
||||
|
||||
public PaletteImpl(NoiseSampler sampler) {
|
||||
this.sampler = sampler;
|
||||
}
|
||||
|
||||
|
||||
public Palette add(ProbabilityCollection<BlockState> m, int layers, NoiseSampler sampler) {
|
||||
for(int i = 0; i < layers; i++) {
|
||||
pallet.add(new PaletteLayer(m, sampler));
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public BlockState get(int layer, double x, double y, double z, long seed) {
|
||||
PaletteLayer paletteLayer;
|
||||
@@ -47,23 +47,23 @@ public class PaletteImpl implements Palette {
|
||||
NoiseSampler paletteSampler = paletteLayer.getSampler();
|
||||
return paletteLayer.get(paletteSampler == null ? sampler : paletteSampler, x, y, z, seed);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public int getSize() {
|
||||
return pallet.size();
|
||||
}
|
||||
|
||||
|
||||
public List<PaletteLayer> getLayers() {
|
||||
return pallet;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Class representation of a layer of a BlockPalette.
|
||||
*/
|
||||
public static class PaletteLayer {
|
||||
private final NoiseSampler sampler;
|
||||
private final ProbabilityCollection<BlockState> collection;
|
||||
|
||||
|
||||
/**
|
||||
* Constructs a PaletteLayerHolder with a ProbabilityCollection of materials and a number of layers.
|
||||
*
|
||||
@@ -74,14 +74,14 @@ public class PaletteImpl implements Palette {
|
||||
this.sampler = sampler;
|
||||
this.collection = type;
|
||||
}
|
||||
|
||||
|
||||
public BlockState get(NoiseSampler random, double x, double y, double z, long seed) {
|
||||
return this.collection.get(random, x, y, z, seed);
|
||||
}
|
||||
|
||||
|
||||
public NoiseSampler getSampler() {
|
||||
return sampler;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -18,22 +18,22 @@ public class PaletteLayerHolder {
|
||||
private final ProbabilityCollection<BlockState> layer;
|
||||
private final NoiseSampler sampler;
|
||||
private final int size;
|
||||
|
||||
|
||||
public PaletteLayerHolder(@NotNull ProbabilityCollection<BlockState> layer, NoiseSampler sampler, int size) {
|
||||
this.layer = layer;
|
||||
this.sampler = sampler;
|
||||
this.size = size;
|
||||
}
|
||||
|
||||
|
||||
@NotNull
|
||||
public ProbabilityCollection<BlockState> getLayer() {
|
||||
return layer;
|
||||
}
|
||||
|
||||
|
||||
public int getSize() {
|
||||
return size;
|
||||
}
|
||||
|
||||
|
||||
public NoiseSampler getSampler() {
|
||||
return sampler;
|
||||
}
|
||||
|
||||
+3
-3
@@ -20,14 +20,14 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection;
|
||||
public class PaletteLayerLoader implements ObjectTemplate<PaletteLayerHolder> {
|
||||
@Value("materials")
|
||||
private @Meta ProbabilityCollection<@Meta BlockState> collection;
|
||||
|
||||
|
||||
@Value("sampler")
|
||||
@Default
|
||||
private @Meta NoiseSampler sampler = null;
|
||||
|
||||
|
||||
@Value("layers")
|
||||
private @Meta int layers;
|
||||
|
||||
|
||||
@Override
|
||||
public PaletteLayerHolder get() {
|
||||
return new PaletteLayerHolder(collection, sampler, layers);
|
||||
|
||||
Reference in New Issue
Block a user