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

Begin absorbing Gaea into Terra

Browse Source
This commit is contained in:
dfsek
2020-12-18 19:36:27 -07:00
parent 9ac098f1ca
commit d1af8c1224
241 changed files with 779 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/dfsek/terra/biome/BiomeZone.java
+2 -2
View File
@@ -1,8 +1,8 @@
package com.dfsek.terra.biome;
import com.dfsek.terra.api.gaea.biome.BiomeGrid;
import com.dfsek.terra.api.gaea.biome.NormalizationUtil;
import com.dfsek.terra.api.gaea.math.FastNoiseLite;
import com.dfsek.terra.api.world.biome.BiomeGrid;
import com.dfsek.terra.api.world.biome.NormalizationUtil;
import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.base.ConfigPackTemplate;
import com.dfsek.terra.image.ImageLoader;
common/src/main/java/com/dfsek/terra/biome/UserDefinedBiome.java
+7 -7
View File
@@ -1,9 +1,9 @@
package com.dfsek.terra.biome;
import com.dfsek.terra.api.gaea.biome.Biome;
import com.dfsek.terra.api.gaea.biome.Decorator;
import com.dfsek.terra.api.gaea.biome.Generator;
import com.dfsek.terra.api.generic.world.World;
import com.dfsek.terra.api.platform.world.World;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.Decorator;
import com.dfsek.terra.api.world.biome.Generator;
import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.builder.GeneratorBuilder;
import com.dfsek.terra.config.templates.BiomeTemplate;
@@ -15,14 +15,14 @@ import com.dfsek.terra.generation.UserDefinedDecorator;
public class UserDefinedBiome implements Biome {
private final GeneratorBuilder gen;
private final UserDefinedDecorator decorator;
private final com.dfsek.terra.api.generic.world.Biome vanilla;
private final com.dfsek.terra.api.platform.world.Biome vanilla;
private final String id;
private final BiomeTemplate config;
private final ConfigPack pack;
private UserDefinedBiome erode;
public UserDefinedBiome(com.dfsek.terra.api.generic.world.Biome vanilla, UserDefinedDecorator dec, GeneratorBuilder gen, BiomeTemplate config, ConfigPack pack) {
public UserDefinedBiome(com.dfsek.terra.api.platform.world.Biome vanilla, UserDefinedDecorator dec, GeneratorBuilder gen, BiomeTemplate config, ConfigPack pack) {
this.vanilla = vanilla;
this.decorator = dec;
this.gen = gen;
@@ -37,7 +37,7 @@ public class UserDefinedBiome implements Biome {
* @return Biome - The Vanilla biome.
*/
@Override
public com.dfsek.terra.api.generic.world.Biome getVanillaBiome() {
public com.dfsek.terra.api.platform.world.Biome getVanillaBiome() {
return vanilla;
}
common/src/main/java/com/dfsek/terra/biome/grid/SingleBiomeGrid.java
+4 -4
View File
@@ -1,9 +1,9 @@
package com.dfsek.terra.biome.grid;
import com.dfsek.terra.api.gaea.biome.Biome;
import com.dfsek.terra.api.gaea.biome.BiomeGrid;
import com.dfsek.terra.api.gaea.generation.GenerationPhase;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.BiomeGrid;
import com.dfsek.terra.api.world.generation.GenerationPhase;
/**
* BiomeGrid implementation that holds a single biome.
common/src/main/java/com/dfsek/terra/biome/grid/UserDefinedGrid.java
+5 -5
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.biome.grid;
import com.dfsek.terra.api.gaea.biome.Biome;
import com.dfsek.terra.api.gaea.biome.BiomeGrid;
import com.dfsek.terra.api.gaea.biome.NormalizationUtil;
import com.dfsek.terra.api.gaea.generation.GenerationPhase;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.BiomeGrid;
import com.dfsek.terra.api.world.biome.NormalizationUtil;
import com.dfsek.terra.api.world.generation.GenerationPhase;
import com.dfsek.terra.config.base.ConfigPack;
import com.dfsek.terra.config.base.ConfigPackTemplate;
import com.dfsek.terra.image.ImageLoader;
common/src/main/java/com/dfsek/terra/biome/grid/master/TerraBiomeGrid.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.biome.grid.master;
import com.dfsek.terra.api.gaea.biome.BiomeGrid;
import com.dfsek.terra.api.generic.TerraPlugin;
import com.dfsek.terra.api.platform.TerraPlugin;
import com.dfsek.terra.api.world.biome.BiomeGrid;
import com.dfsek.terra.biome.BiomeZone;
import com.dfsek.terra.biome.grid.UserDefinedGrid;
import com.dfsek.terra.config.base.ConfigPack;
common/src/main/java/com/dfsek/terra/biome/grid/master/TerraRadialBiomeGrid.java
+5 -5
View File
@@ -1,10 +1,10 @@
package com.dfsek.terra.biome.grid.master;
import com.dfsek.terra.api.gaea.biome.Biome;
import com.dfsek.terra.api.gaea.biome.BiomeGrid;
import com.dfsek.terra.api.gaea.generation.GenerationPhase;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.generic.world.vector.Vector2;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.api.platform.world.vector.Vector2;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.biome.BiomeGrid;
import com.dfsek.terra.api.world.generation.GenerationPhase;
import com.dfsek.terra.biome.BiomeZone;
import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.UserDefinedGrid;
common/src/main/java/com/dfsek/terra/biome/grid/master/TerraStandardBiomeGrid.java
+4 -4
View File
@@ -1,9 +1,9 @@
package com.dfsek.terra.biome.grid.master;
import com.dfsek.terra.api.gaea.biome.Biome;
import com.dfsek.terra.api.gaea.generation.GenerationPhase;
import com.dfsek.terra.api.generic.world.vector.Location;
import com.dfsek.terra.api.generic.world.vector.Vector2;
import com.dfsek.terra.api.platform.world.vector.Location;
import com.dfsek.terra.api.platform.world.vector.Vector2;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.generation.GenerationPhase;
import com.dfsek.terra.biome.BiomeZone;
import com.dfsek.terra.biome.UserDefinedBiome;
import com.dfsek.terra.biome.grid.UserDefinedGrid;
common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolder.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.biome.palette;
import com.dfsek.terra.api.gaea.world.palette.Palette;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.world.palette.Palette;
public class PaletteHolder {
private final Palette<BlockData>[] palettes;
common/src/main/java/com/dfsek/terra/biome/palette/PaletteHolderBuilder.java
+2 -2
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.biome.palette;
import com.dfsek.terra.api.gaea.world.palette.Palette;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.BlockData;
import com.dfsek.terra.api.world.palette.Palette;
import net.jafama.FastMath;
import java.util.Map;
common/src/main/java/com/dfsek/terra/biome/palette/PaletteLayer.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.biome.palette;
import com.dfsek.terra.api.gaea.math.ProbabilityCollection;
import com.dfsek.terra.api.generic.world.block.BlockData;
import com.dfsek.terra.api.platform.world.block.BlockData;
import org.jetbrains.annotations.NotNull;
public class PaletteLayer {
common/src/main/java/com/dfsek/terra/biome/palette/SinglePalette.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.dfsek.terra.biome.palette;
import com.dfsek.terra.api.gaea.world.palette.Palette;
import com.dfsek.terra.api.world.palette.Palette;
public class SinglePalette<E> extends Palette<E> {
private final E item;
common/src/main/java/com/dfsek/terra/biome/postprocessing/CoordinatePerturb.java
+1 -1
View File
@@ -1,7 +1,7 @@
package com.dfsek.terra.biome.postprocessing;
import com.dfsek.terra.api.gaea.math.FastNoiseLite;
import com.dfsek.terra.api.generic.world.vector.Vector2;
import com.dfsek.terra.api.platform.world.vector.Vector2;
/**
* Offset a coordinate pair by an amount.