mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-12 10:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

API compiles now

Browse Source
This commit is contained in:
dfsek
2021-06-23 12:43:16 -07:00
parent 686680d731
commit f380247613
125 changed files with 421 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/implementation/src/main/java/com/dfsek/terra/api/util/logging/Logger.java → common/api/src/main/java/com/dfsek/terra/api/Logger.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.util.logging;
package com.dfsek.terra.api;
public interface Logger {
void info(String message);
@@ -6,4 +6,8 @@ public interface Logger {
void warning(String message);
void severe(String message);
default void stack(Throwable t) {
t.printStackTrace();
}
}

5
common/api/src/main/java/com/dfsek/terra/api/TerraPlugin.java
View File

@@ -2,12 +2,15 @@ package com.dfsek.terra.api;
import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.config.PluginConfig;
import com.dfsek.terra.api.event.EventManager;
import com.dfsek.terra.api.handle.ItemHandle;
import com.dfsek.terra.api.handle.WorldHandle;
import com.dfsek.terra.api.lang.Language;
import com.dfsek.terra.api.profiler.Profiler;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.util.JarUtil;
import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.World;
@@ -44,7 +47,7 @@ public interface TerraPlugin extends LoaderRegistrar {
String platformName();
DebugLogger getDebugLogger();
Logger getDebugLogger();
EventManager getEventManager();

14
common/api/src/main/java/com/dfsek/terra/api/block/BlockFace.java
View File

@@ -67,20 +67,6 @@ public enum BlockFace {
return modZ;
}
/**
* Gets the normal vector corresponding to this block face.
*
* @return the normal vector
*/
@NotNull
public Vector3 getDirection() {
Vector3 direction = new Vector3Impl(modX, modY, modZ);
if(modX != 0 || modY != 0 || modZ != 0) {
direction.normalize();
}
return direction;
}
@NotNull
public BlockFace getOppositeFace() {
switch(this) {

33
common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java Normal file
View File

@@ -0,0 +1,33 @@
package com.dfsek.terra.api.config;
import com.dfsek.terra.api.TerraPlugin;
public interface PluginConfig {
void load(TerraPlugin main);
String getLanguage();
boolean isDebugCommands();
boolean isDebugLogging();
boolean isDebugProfiler();
boolean isDebugScript();
long getDataSaveInterval();
int getBiomeSearchResolution();
int getCarverCacheSize();
int getStructureCache();
int getSamplerCache();
int getMaxRecursion();
int getBiomeCache();
int getProviderCache();
}

3
common/api/src/main/java/com/dfsek/terra/api/config/WorldConfig.java
View File

@@ -3,6 +3,7 @@ package com.dfsek.terra.api.config;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.api.world.generator.SamplerCache;
import java.util.Set;
@@ -14,7 +15,5 @@ public interface WorldConfig {
SamplerCache getSamplerCache();
Set<UserDefinedCarver> getCarvers();
BiomeProvider getProvider();
}

12
common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java
View File

@@ -6,6 +6,8 @@ import com.dfsek.terra.api.event.events.Cancellable;
import com.dfsek.terra.api.event.events.PackEvent;
import com.dfsek.terra.api.block.Block;
import com.dfsek.terra.api.block.state.Container;
import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.api.structure.Structure;
import org.jetbrains.annotations.NotNull;
/**
@@ -16,14 +18,14 @@ public class LootPopulateEvent extends AbstractCancellable implements PackEvent,
private final Container container;
private LootTable table;
private final ConfigPack pack;
private final StructureScript script;
private final Structure structure;
public LootPopulateEvent(Block block, Container container, LootTable table, ConfigPack pack, StructureScript script) {
public LootPopulateEvent(Block block, Container container, LootTable table, ConfigPack pack, Structure structure) {
this.block = block;
this.container = container;
this.table = table;
this.pack = pack;
this.script = script;
this.structure = structure;
}
@Override
@@ -71,7 +73,7 @@ public class LootPopulateEvent extends AbstractCancellable implements PackEvent,
*
* @return Structure script.
*/
public StructureScript getStructureScript() {
return script;
public Structure getStructure() {
return structure;
}
}

15
common/api/src/main/java/com/dfsek/terra/api/lang/Language.java Normal file
View File

@@ -0,0 +1,15 @@
package com.dfsek.terra.api.lang;
import com.dfsek.terra.api.entity.CommandSender;
import java.util.logging.Level;
import java.util.logging.Logger;
public interface Language {
@SuppressWarnings("unchecked")
Message getMessage(String id);
void log(String messageID, Level level, Logger logger, String... args);
void send(String messageID, CommandSender sender, String... args);
}

2
common/implementation/src/main/java/com/dfsek/terra/config/lang/Message.java → common/api/src/main/java/com/dfsek/terra/api/lang/Message.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.config.lang;
package com.dfsek.terra.api.lang;
import com.dfsek.terra.api.entity.CommandSender;

25
common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java Normal file
View File

@@ -0,0 +1,25 @@
package com.dfsek.terra.api.structure;
import com.dfsek.terra.api.inventory.Inventory;
import com.dfsek.terra.api.inventory.ItemStack;
import java.util.List;
import java.util.Random;
public interface LootTable {
/**
* Fetches a list of ItemStacks from the loot table using the given Random instance.
*
* @param r The Random instance to use.
* @return List&lt;ItemStack&gt; - The list of loot fetched.
*/
List<ItemStack> getLoot(Random r);
/**
* Fills an Inventory with loot.
*
* @param i The Inventory to fill.
* @param r The The Random instance to use.
*/
void fillInventory(Inventory i, Random r);
}

34
common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java Normal file
View File

@@ -0,0 +1,34 @@
package com.dfsek.terra.api.structure;
import com.dfsek.terra.api.structure.buffer.Buffer;
import com.dfsek.terra.api.structure.rotation.Rotation;
import com.dfsek.terra.api.vector.Location;
import com.dfsek.terra.api.world.Chunk;
import java.util.Random;
public interface Structure {
/**
* Paste the structure at a location
*
* @param location Location to paste structure
* @param rotation Rotation of structure
* @return Whether generation was successful
*/
@SuppressWarnings("try")
boolean generate(Location location, Random random, Rotation rotation);
@SuppressWarnings("try")
boolean generate(Location location, Chunk chunk, Random random, Rotation rotation);
@SuppressWarnings("try")
boolean test(Location location, Random random, Rotation rotation);
@SuppressWarnings("try")
boolean generate(Buffer buffer, Random random, Rotation rotation, int recursions);
@SuppressWarnings("try")
boolean generateDirect(Location location, Random random, Rotation rotation);
String getId();
}

0
common/implementation/src/main/java/com/dfsek/terra/api/util/JarUtil.java → common/api/src/main/java/com/dfsek/terra/api/util/JarUtil.java
View File

14
common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java
View File

@@ -1,6 +1,5 @@
package com.dfsek.terra.api.util;
import com.dfsek.terra.api.util.FastRandom;
import com.dfsek.terra.api.world.generator.Sampler;
import net.jafama.FastMath;
@@ -43,19 +42,6 @@ public final class MathUtil {
return FastMath.sqrt(standardDeviation / length);
}
/**
* Gets the carver seed for a chunk.
*
* @param chunkX Chunk's X coordinate
* @param chunkZ Chunk's Z coordinate
* @param seed World seed
* @return long - The carver seed.
*/
public static long getCarverChunkSeed(int chunkX, int chunkZ, long seed) {
Random r = new FastRandom(seed);
return chunkX * r.nextLong() ^ chunkZ * r.nextLong() ^ seed;
}
public static long hashToLong(String s) {
if(s == null) {
return 0;

8
common/api/src/main/java/com/dfsek/terra/api/world/Tree.java
View File

@@ -1,12 +1,14 @@
package com.dfsek.terra.api.world;
import com.dfsek.terra.api.vector.LocationImpl;
import com.dfsek.terra.api.block.BlockType;
import com.dfsek.terra.api.vector.Location;
import java.util.Random;
import java.util.Set;
public interface Tree {
boolean plant(LocationImpl l, Random r);
boolean plant(Location l, Random r);
MaterialSet getSpawnable();
Set<BlockType> getSpawnable();
}

9
common/api/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java Normal file
View File

@@ -0,0 +1,9 @@
package com.dfsek.terra.api.world.generator;
public interface SamplerCache {
Sampler get(int x, int z);
Sampler getChunk(int cx, int cz);
void clear();
}

4
common/implementation/src/main/java/com/dfsek/terra/api/math/GridSpawn.java
View File

@@ -1,6 +1,6 @@
package com.dfsek.terra.api.math;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.util.PopulationUtil;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.vector.Vector3Impl;
import com.dfsek.terra.api.util.FastRandom;
@@ -57,7 +57,7 @@ public class GridSpawn {
* @return Vector representing spawnpoint
*/
public Vector3 getChunkSpawn(int structureChunkX, int structureChunkZ, long seed) {
Random r = new FastRandom(MathUtil.getCarverChunkSeed(structureChunkX, structureChunkZ, seed + salt));
Random r = new FastRandom(PopulationUtil.getCarverChunkSeed(structureChunkX, structureChunkZ, seed + salt));
int offsetX = r.nextInt(width);
int offsetZ = r.nextInt(width);
int sx = structureChunkX * (width + 2 * separation) + offsetX;

18
common/implementation/src/main/java/com/dfsek/terra/api/structures/loot/LootTable.java → common/implementation/src/main/java/com/dfsek/terra/api/structures/loot/LootTableImpl.java
View File

@@ -15,7 +15,7 @@ import java.util.Random;
/**
* Class representation of a Loot Table to populate chest loot.
*/
public class LootTable {
public class LootTableImpl implements com.dfsek.terra.api.structure.LootTable {
private final List<Pool> pools = new GlueList<>();
/**
@@ -24,7 +24,7 @@ public class LootTable {
* @param json The JSON String representing the loot table.
* @throws ParseException if malformed JSON is passed.
*/
public LootTable(String json, TerraPlugin main) throws ParseException {
public LootTableImpl(String json, TerraPlugin main) throws ParseException {
JSONParser jsonParser = new JSONParser();
Object tableJSON = jsonParser.parse(json);
JSONArray poolArray = (JSONArray) ((JSONObject) tableJSON).get("pools");
@@ -33,12 +33,7 @@ public class LootTable {
}
}
/**
* Fetches a list of ItemStacks from the loot table using the given Random instance.
*
* @param r The Random instance to use.
* @return List&lt;ItemStack&gt; - The list of loot fetched.
*/
@Override
public List<ItemStack> getLoot(Random r) {
List<ItemStack> itemList = new GlueList<>();
for(Pool pool : pools) {
@@ -47,12 +42,7 @@ public class LootTable {
return itemList;
}
/**
* Fills an Inventory with loot.
*
* @param i The Inventory to fill.
* @param r The The Random instance to use.
*/
@Override
public void fillInventory(Inventory i, Random r) {
List<ItemStack> loot = getLoot(r);
for(ItemStack stack : loot) {

33
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java
View File

@@ -1,10 +1,12 @@
package com.dfsek.terra.api.structures.script;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.vector.Location;
import com.dfsek.terra.vector.LocationImpl;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structures.loot.LootTable;
import com.dfsek.terra.api.structures.parser.Parser;
import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
import com.dfsek.terra.api.structures.parser.lang.Block;
@@ -44,14 +46,14 @@ import java.nio.charset.Charset;
import java.util.Random;
import java.util.concurrent.ExecutionException;
public class StructureScript {
public class StructureScript implements Structure {
private final Block block;
private final String id;
private final Cache<LocationImpl, StructureBuffer> cache;
private final TerraPlugin main;
private String tempID;
public StructureScript(InputStream inputStream, TerraPlugin main, Registry<StructureScript> registry, Registry<LootTable> lootRegistry, Registry<FunctionBuilder<?>> functionRegistry) throws ParseException {
public StructureScript(InputStream inputStream, TerraPlugin main, Registry<Structure> registry, Registry<LootTable> lootRegistry, Registry<FunctionBuilder<?>> functionRegistry) throws ParseException {
Parser parser;
try {
parser = new Parser(IOUtils.toString(inputStream, Charset.defaultCharset()));
@@ -110,15 +112,9 @@ public class StructureScript {
this.cache = CacheBuilder.newBuilder().maximumSize(main.getTerraConfig().getStructureCache()).build();
}
/**
* Paste the structure at a location
*
* @param location Location to paste structure
* @param rotation Rotation of structure
* @return Whether generation was successful
*/
@Override
@SuppressWarnings("try")
public boolean execute(LocationImpl location, Random random, Rotation rotation) {
public boolean generate(Location location, Random random, Rotation rotation) {
try(ProfileFrame ignore = main.getProfiler().profile("terrascript:" + id)) {
StructureBuffer buffer = new StructureBuffer(location);
boolean level = applyBlock(new TerraImplementationArguments(buffer, rotation, random, 0));
@@ -127,8 +123,9 @@ public class StructureScript {
}
}
@Override
@SuppressWarnings("try")
public boolean execute(LocationImpl location, Chunk chunk, Random random, Rotation rotation) {
public boolean generate(Location location, Chunk chunk, Random random, Rotation rotation) {
try(ProfileFrame ignore = main.getProfiler().profile("terrascript_chunk:" + id)) {
StructureBuffer buffer = computeBuffer(location, random, rotation);
buffer.paste(chunk);
@@ -136,15 +133,16 @@ public class StructureScript {
}
}
@Override
@SuppressWarnings("try")
public boolean test(LocationImpl location, Random random, Rotation rotation) {
public boolean test(Location location, Random random, Rotation rotation) {
try(ProfileFrame ignore = main.getProfiler().profile("terrascript_test:" + id)) {
StructureBuffer buffer = computeBuffer(location, random, rotation);
return buffer.succeeded();
}
}
private StructureBuffer computeBuffer(LocationImpl location, Random random, Rotation rotation) {
private StructureBuffer computeBuffer(Location location, Random random, Rotation rotation) {
try {
return cache.get(location, () -> {
StructureBuffer buf = new StructureBuffer(location);
@@ -156,21 +154,24 @@ public class StructureScript {
}
}
@Override
@SuppressWarnings("try")
public boolean executeInBuffer(Buffer buffer, Random random, Rotation rotation, int recursions) {
public boolean generate(Buffer buffer, Random random, Rotation rotation, int recursions) {
try(ProfileFrame ignore = main.getProfiler().profile("terrascript_recursive:" + id)) {
return applyBlock(new TerraImplementationArguments(buffer, rotation, random, recursions));
}
}
@Override
@SuppressWarnings("try")
public boolean executeDirect(LocationImpl location, Random random, Rotation rotation) {
public boolean generateDirect(Location location, Random random, Rotation rotation) {
try(ProfileFrame ignore = main.getProfiler().profile("terrascript_direct:" + id)) {
DirectBuffer buffer = new DirectBuffer(location);
return applyBlock(new TerraImplementationArguments(buffer, rotation, random, 0));
}
}
@Override
public String getId() {
return id;
}

1
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/builders/CheckFunctionBuilder.java
View File

@@ -6,7 +6,6 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.api.structures.script.functions.CheckFunction;
import com.dfsek.terra.api.structures.tokenizer.Position;
import com.dfsek.terra.world.generation.math.SamplerCache;
import java.util.List;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/builders/LootFunctionBuilder.java
View File

@@ -2,7 +2,7 @@ package com.dfsek.terra.api.structures.script.builders;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structures.loot.LootTable;
import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.api.structures.script.StructureScript;

6
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/builders/StructureFunctionBuilder.java
View File

@@ -2,10 +2,10 @@ package com.dfsek.terra.api.structures.script.builders;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.structures.parser.exceptions.ParseException;
import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.api.structures.script.StructureScript;
import com.dfsek.terra.api.structures.script.functions.StructureFunction;
import com.dfsek.terra.api.structures.tokenizer.Position;
@@ -13,10 +13,10 @@ import java.util.List;
import java.util.stream.Collectors;
public class StructureFunctionBuilder implements FunctionBuilder<StructureFunction> {
private final Registry<StructureScript> registry;
private final Registry<Structure> registry;
private final TerraPlugin main;
public StructureFunctionBuilder(Registry<StructureScript> registry, TerraPlugin main) {
public StructureFunctionBuilder(Registry<Structure> registry, TerraPlugin main) {
this.registry = registry;
this.main = main;
}

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java
View File

@@ -10,7 +10,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.structure.buffer.items.BufferedBlock;
import com.dfsek.terra.api.structures.tokenizer.Position;
import net.jafama.FastMath;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java
View File

@@ -9,7 +9,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.tokenizer.Position;
import com.dfsek.terra.api.world.biome.UserDefinedBiome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java
View File

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.tokenizer.Position;
import net.jafama.FastMath;

4
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java
View File

@@ -1,6 +1,7 @@
package com.dfsek.terra.api.structures.script.functions;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.world.generator.SamplerCache;
import com.dfsek.terra.vector.LocationImpl;
import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.world.TerraWorld;
@@ -12,12 +13,11 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.tokenizer.Position;
import com.dfsek.terra.api.world.biome.UserDefinedBiome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.config.templates.BiomeTemplate;
import com.dfsek.terra.world.generation.math.SamplerCache;
import net.jafama.FastMath;
import java.util.Map;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java
View File

@@ -12,7 +12,7 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.structure.buffer.items.BufferedEntity;
import com.dfsek.terra.api.structures.tokenizer.Position;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java
View File

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.tokenizer.Position;
import net.jafama.FastMath;

7
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java
View File

@@ -1,18 +1,19 @@
package com.dfsek.terra.api.structures.script.functions;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.structure.LootTable;
import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.vector.Vector2Impl;
import com.dfsek.terra.vector.Vector3Impl;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structures.loot.LootTable;
import com.dfsek.terra.api.structures.loot.LootTableImpl;
import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.StructureScript;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.structure.buffer.items.BufferedLootApplication;
import com.dfsek.terra.api.structures.tokenizer.Position;
import net.jafama.FastMath;
@@ -46,7 +47,7 @@ public class LootFunction implements Function<Void> {
RotationUtil.rotateVector(xz, arguments.getRotation());
String id = data.apply(implementationArguments, variableMap);
LootTable table = registry.get(id);
LootTableImpl table = registry.get(id);
if(table == null) {
main.logger().severe("No such loot table " + id);

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java
View File

@@ -12,7 +12,7 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.structure.buffer.items.BufferedPulledBlock;
import com.dfsek.terra.api.structures.tokenizer.Position;
import net.jafama.FastMath;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java
View File

@@ -8,7 +8,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.tokenizer.Position;
import net.jafama.FastMath;

2
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java
View File

@@ -9,7 +9,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.structure.buffer.items.BufferedStateManipulator;
import com.dfsek.terra.api.structures.tokenizer.Position;
import net.jafama.FastMath;

12
common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java
View File

@@ -1,6 +1,7 @@
package com.dfsek.terra.api.structures.script.functions;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.vector.Vector2Impl;
import com.dfsek.terra.api.vector.Vector3;
@@ -10,10 +11,9 @@ import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments;
import com.dfsek.terra.api.structures.parser.lang.Returnable;
import com.dfsek.terra.api.structures.parser.lang.functions.Function;
import com.dfsek.terra.api.structures.parser.lang.variables.Variable;
import com.dfsek.terra.api.structures.script.StructureScript;
import com.dfsek.terra.api.structures.script.TerraImplementationArguments;
import com.dfsek.terra.api.structure.rotation.Rotation;
import com.dfsek.terra.api.structure.rotation.RotationUtil;
import com.dfsek.terra.api.util.RotationUtil;
import com.dfsek.terra.api.structures.structure.buffer.IntermediateBuffer;
import com.dfsek.terra.api.structures.tokenizer.Position;
import net.jafama.FastMath;
@@ -22,14 +22,14 @@ import java.util.List;
import java.util.Map;
public class StructureFunction implements Function<Boolean> {
private final Registry<StructureScript> registry;
private final Registry<Structure> registry;
private final Returnable<String> id;
private final Returnable<Number> x, y, z;
private final Position position;
private final TerraPlugin main;
private final List<Returnable<String>> rotations;
public StructureFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Returnable<String> id, List<Returnable<String>> rotations, Registry<StructureScript> registry, Position position, TerraPlugin main) {
public StructureFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Returnable<String> id, List<Returnable<String>> rotations, Registry<Structure> registry, Position position, TerraPlugin main) {
this.registry = registry;
this.id = id;
this.position = position;
@@ -57,7 +57,7 @@ public class StructureFunction implements Function<Boolean> {
RotationUtil.rotateVector(xz, arguments.getRotation());
String app = id.apply(implementationArguments, variableMap);
StructureScript script = registry.get(app);
Structure script = registry.get(app);
if(script == null) {
main.logger().severe("No such structure " + app);
return null;
@@ -74,7 +74,7 @@ public class StructureFunction implements Function<Boolean> {
Vector3 offset = new Vector3Impl(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ()));
return script.executeInBuffer(new IntermediateBuffer(arguments.getBuffer(), offset), arguments.getRandom(), arguments.getRotation().rotate(rotation1), arguments.getRecursions() + 1);
return script.generate(new IntermediateBuffer(arguments.getBuffer(), offset), arguments.getRandom(), arguments.getRotation().rotate(rotation1), arguments.getRecursions() + 1);
}
@Override

15
common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java
View File

@@ -1,6 +1,7 @@
package com.dfsek.terra.api.structures.structure.buffer;
import com.dfsek.terra.api.structure.buffer.Buffer;
import com.dfsek.terra.api.vector.Location;
import com.dfsek.terra.vector.LocationImpl;
import com.dfsek.terra.api.structure.buffer.BufferedItem;
@@ -11,31 +12,31 @@ import java.util.Map;
* Buffer implementation that directly pastes to the world.
*/
public class DirectBuffer implements Buffer {
private final LocationImpl origin;
private final Map<LocationImpl, String> marks = new LinkedHashMap<>();
private final Location origin;
private final Map<Location, String> marks = new LinkedHashMap<>();
public DirectBuffer(LocationImpl origin) {
public DirectBuffer(Location origin) {
this.origin = origin;
}
@Override
public Buffer addItem(BufferedItem item, LocationImpl location) {
public Buffer addItem(BufferedItem item, Location location) {
item.paste(origin.clone().add(location));
return this;
}
@Override
public LocationImpl getOrigin() {
public Location getOrigin() {
return origin;
}
@Override
public String getMark(LocationImpl location) {
public String getMark(Location location) {
return marks.get(location);
}
@Override
public Buffer setMark(String mark, LocationImpl location) {
public Buffer setMark(String mark, Location location) {
marks.put(location, mark);
return this;
}

6
common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java
View File

@@ -7,16 +7,16 @@ import com.dfsek.terra.vector.LocationImpl;
import com.dfsek.terra.api.block.Block;
import com.dfsek.terra.api.block.state.BlockState;
import com.dfsek.terra.api.block.state.Container;
import com.dfsek.terra.api.structures.loot.LootTable;
import com.dfsek.terra.api.structures.loot.LootTableImpl;
import com.dfsek.terra.api.structures.script.StructureScript;
import com.dfsek.terra.api.util.FastRandom;
public class BufferedLootApplication implements BufferedItem {
private final LootTable table;
private final LootTableImpl table;
private final TerraPlugin main;
private final StructureScript structure;
public BufferedLootApplication(LootTable table, TerraPlugin main, StructureScript structure) {
public BufferedLootApplication(LootTableImpl table, TerraPlugin main, StructureScript structure) {
this.table = table;
this.main = main;
this.structure = structure;

2
common/implementation/src/main/java/com/dfsek/terra/api/util/world/PaletteUtil.java → common/implementation/src/main/java/com/dfsek/terra/api/util/PaletteUtil.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.util.world;
package com.dfsek.terra.api.util;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.world.generator.Palette;

28
common/implementation/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java Normal file
View File

@@ -0,0 +1,28 @@
package com.dfsek.terra.api.util;
import com.dfsek.terra.api.world.Chunk;
import java.util.Random;
public final class PopulationUtil {
public static FastRandom getRandom(Chunk c) {
return getRandom(c, 0);
}
public static FastRandom getRandom(Chunk c, long salt) {
return new FastRandom(getCarverChunkSeed(c.getX(), c.getZ(), c.getWorld().getSeed() + salt));
}
/**
* Gets the carver seed for a chunk.
*
* @param chunkX Chunk's X coordinate
* @param chunkZ Chunk's Z coordinate
* @param seed World seed
* @return long - The carver seed.
*/
public static long getCarverChunkSeed(int chunkX, int chunkZ, long seed) {
Random r = new FastRandom(seed);
return chunkX * r.nextLong() ^ chunkZ * r.nextLong() ^ seed;
}
}

3
common/api/src/main/java/com/dfsek/terra/api/structure/rotation/RotationUtil.java → common/implementation/src/main/java/com/dfsek/terra/api/util/RotationUtil.java
View File

@@ -1,5 +1,6 @@
package com.dfsek.terra.api.structure.rotation;
package com.dfsek.terra.api.util;
import com.dfsek.terra.api.structure.rotation.Rotation;
import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.block.Axis;
import com.dfsek.terra.api.block.BlockData;

2
common/implementation/src/main/java/com/dfsek/terra/api/util/logging/DebugLogger.java
View File

@@ -1,5 +1,7 @@
package com.dfsek.terra.api.util.logging;
import com.dfsek.terra.api.Logger;
public class DebugLogger {
private final Logger logger;
private boolean debug = false;

2
common/implementation/src/main/java/com/dfsek/terra/api/util/logging/JavaLogger.java
View File

@@ -1,5 +1,7 @@
package com.dfsek.terra.api.util.logging;
import com.dfsek.terra.api.Logger;
public class JavaLogger implements Logger {
private final java.util.logging.Logger logger;

15
common/implementation/src/main/java/com/dfsek/terra/api/util/world/PopulationUtil.java
View File

@@ -1,15 +0,0 @@
package com.dfsek.terra.api.util.world;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.world.Chunk;
import com.dfsek.terra.api.util.FastRandom;
public final class PopulationUtil {
public static FastRandom getRandom(Chunk c) {
return getRandom(c, 0);
}
public static FastRandom getRandom(Chunk c, long salt) {
return new FastRandom(MathUtil.getCarverChunkSeed(c.getX(), c.getZ(), c.getWorld().getSeed() + salt));
}
}

4
common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.api.world.locate;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.util.PopulationUtil;
import com.dfsek.terra.vector.LocationImpl;
import com.dfsek.terra.api.vector.Vector3;
import com.dfsek.terra.api.structure.rotation.Rotation;
@@ -30,7 +30,7 @@ public class AsyncStructureFinder extends AsyncFeatureFinder<TerraStructure> {
public boolean isValid(int x, int z, TerraStructure target) {
LocationImpl spawn = target.getSpawn().getChunkSpawn(x, z, world.getSeed()).toLocation(world);
if(!((UserDefinedBiome) provider.getBiome(spawn)).getConfig().getStructures().contains(target)) return false;
Random random = new FastRandom(MathUtil.getCarverChunkSeed(FastMath.floorDiv(spawn.getBlockX(), 16), FastMath.floorDiv(spawn.getBlockZ(), 16), world.getSeed()));
Random random = new FastRandom(PopulationUtil.getCarverChunkSeed(FastMath.floorDiv(spawn.getBlockX(), 16), FastMath.floorDiv(spawn.getBlockZ(), 16), world.getSeed()));
return target.getStructure().get(random).test(spawn.setY(target.getSpawnStart().get(random)), random, Rotation.fromDegrees(90 * random.nextInt(4)));
}
}

5
common/implementation/src/main/java/com/dfsek/terra/carving/CarverCache.java
View File

@@ -2,6 +2,7 @@ package com.dfsek.terra.carving;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.util.MathUtil;
import com.dfsek.terra.api.util.PopulationUtil;
import com.dfsek.terra.vector.Vector3Impl;
import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.util.FastRandom;
@@ -33,8 +34,8 @@ public class CarverCache {
int chunkX = (int) (key >> 32);
int chunkZ = (int) key.longValue();
BiomeProvider provider = main.getWorld(w).getBiomeProvider();
if(CarverCache.this.carver.isChunkCarved(w, chunkX, chunkZ, new FastRandom(MathUtil.getCarverChunkSeed(chunkX, chunkZ, w.getSeed() + CarverCache.this.carver.hashCode())))) {
long seed = MathUtil.getCarverChunkSeed(chunkX, chunkZ, w.getSeed());
if(CarverCache.this.carver.isChunkCarved(w, chunkX, chunkZ, new FastRandom(PopulationUtil.getCarverChunkSeed(chunkX, chunkZ, w.getSeed() + CarverCache.this.carver.hashCode())))) {
long seed = PopulationUtil.getCarverChunkSeed(chunkX, chunkZ, w.getSeed());
Random r = new FastRandom(seed);
Worm carving = CarverCache.this.carver.getWorm(seed, new Vector3Impl((chunkX << 4) + r.nextInt(16), CarverCache.this.carver.getConfig().getHeight().get(r), (chunkZ << 4) + r.nextInt(16)));
List<Worm.WormPoint> points = new GlueList<>();

8
common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java
View File

@@ -14,7 +14,7 @@ import com.dfsek.terra.api.command.arg.IntegerArgumentParser;
import com.dfsek.terra.api.injection.annotations.Inject;
import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.entity.Player;
import com.dfsek.terra.api.structures.script.StructureScript;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.structure.rotation.Rotation;
import com.dfsek.terra.api.util.FastRandom;
import com.dfsek.terra.commands.structure.argument.ScriptArgumentParser;
@@ -56,7 +56,7 @@ public class StructureLoadCommand implements CommandTemplate {
private boolean chunk;
@ArgumentTarget("structure")
private StructureScript script;
private Structure script;
@Inject
private TerraPlugin main;
@@ -79,9 +79,9 @@ public class StructureLoadCommand implements CommandTemplate {
return;
}
if(this.chunk) {
script.execute(player.getLocation(), player.getWorld().getChunkAt(player.getLocation()), random, r);
script.generate(player.getLocation(), player.getWorld().getChunkAt(player.getLocation()), random, r);
} else {
script.execute(player.getLocation(), random, r);
script.generate(player.getLocation(), random, r);
}
long l = System.nanoTime() - t;

5
common/implementation/src/main/java/com/dfsek/terra/commands/structure/argument/ScriptArgumentParser.java
View File

@@ -5,14 +5,15 @@ import com.dfsek.terra.api.command.arg.ArgumentParser;
import com.dfsek.terra.api.injection.annotations.Inject;
import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.entity.Player;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.structures.script.StructureScript;
public class ScriptArgumentParser implements ArgumentParser<StructureScript> {
public class ScriptArgumentParser implements ArgumentParser<Structure> {
@Inject
private TerraPlugin main;
@Override
public StructureScript parse(CommandSender sender, String arg) {
public Structure parse(CommandSender sender, String arg) {
return main.getWorld(((Player) sender).getWorld()).getConfig().getRegistry(StructureScript.class).get(arg);
}
}

3
common/implementation/src/main/java/com/dfsek/terra/commands/structure/completer/ScriptCompleter.java
View File

@@ -5,6 +5,7 @@ import com.dfsek.terra.api.command.tab.TabCompleter;
import com.dfsek.terra.api.injection.annotations.Inject;
import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.entity.Player;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.structures.script.StructureScript;
import java.util.List;
@@ -16,6 +17,6 @@ public class ScriptCompleter implements TabCompleter {
@Override
public List<String> complete(CommandSender sender) {
return main.getWorld(((Player) sender).getWorld()).getConfig().getRegistry(StructureScript.class).entries().stream().map(StructureScript::getId).collect(Collectors.toList());
return main.getWorld(((Player) sender).getWorld()).getConfig().getRegistry(StructureScript.class).entries().stream().map(Structure::getId).collect(Collectors.toList());
}
}

4
common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java
View File

@@ -6,8 +6,8 @@ import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.addon.TerraAddon;
import com.dfsek.terra.api.math.GridSpawn;
import com.dfsek.terra.api.math.range.ConstantRange;
import com.dfsek.terra.api.noise.samplers.ImageSampler;
import com.dfsek.terra.api.noise.samplers.noise.CellularSampler;
import com.dfsek.terra.noise.samplers.ImageSampler;
import com.dfsek.terra.noise.samplers.noise.CellularSampler;
import com.dfsek.terra.api.block.BlockType;
import com.dfsek.terra.api.util.collections.MaterialSet;
import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;

22
common/implementation/src/main/java/com/dfsek/terra/config/PluginConfig.java → common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java
View File

@@ -7,7 +7,7 @@ import com.dfsek.tectonic.exception.ConfigException;
import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.util.JarUtil;
import com.dfsek.terra.api.util.logging.Logger;
import com.dfsek.terra.api.Logger;
import java.io.File;
import java.io.FileInputStream;
@@ -17,7 +17,7 @@ import java.time.Duration;
import java.util.jar.JarFile;
@SuppressWarnings("FieldMayBeFinal")
public class PluginConfig implements ConfigTemplate {
public class PluginConfigImpl implements ConfigTemplate, com.dfsek.terra.api.config.PluginConfig {
@Value("debug.commands")
@Default
private boolean debugCommands = false;
@@ -74,6 +74,7 @@ public class PluginConfig implements ConfigTemplate {
@Default
private int maxRecursion = 1000;
@Override
public void load(TerraPlugin main) {
Logger logger = main.logger();
logger.info("Loading config values");
@@ -84,9 +85,9 @@ public class PluginConfig implements ConfigTemplate {
try(JarFile jar = main.getModJar()) {
JarUtil.copyResourcesToDirectory(jar, "packs", new File(main.getDataFolder(), "packs").toString());
} catch(IOException | URISyntaxException e) {
main.getDebugLogger().error("Failed to dump default config files!");
main.getDebugLogger().severe("Failed to dump default config files!");
e.printStackTrace();
main.getDebugLogger().error("Either you're on Forge, or this is a bug. If it's the latter, report this to Terra!");
main.getDebugLogger().severe("Either you're on Forge, or this is a bug. If it's the latter, report this to Terra!");
}
}
} catch(ConfigException | IOException e) {
@@ -99,54 +100,67 @@ public class PluginConfig implements ConfigTemplate {
if(isDebugScript()) logger.info("Script debug blocks enabled.");
}
@Override
public String getLanguage() {
return language;
}
@Override
public boolean isDebugCommands() {
return debugCommands;
}
@Override
public boolean isDebugLogging() {
return debugLog;
}
@Override
public boolean isDebugProfiler() {
return debugProfiler;
}
@Override
public boolean isDebugScript() {
return debugScript;
}
@Override
public long getDataSaveInterval() {
return dataSave.toMillis() / 20L;
}
@Override
public int getBiomeSearchResolution() {
return biomeSearch;
}
@Override
public int getCarverCacheSize() {
return carverCache;
}
@Override
public int getStructureCache() {
return structureCache;
}
@Override
public int getSamplerCache() {
return samplerCache;
}
@Override
public int getMaxRecursion() {
return maxRecursion;
}
@Override
public int getBiomeCache() {
return biomeCache;
}
@Override
public int getProviderCache() {
return providerCache;
}

4
common/implementation/src/main/java/com/dfsek/terra/config/builder/UserDefinedBiomeBuilder.java
View File

@@ -3,8 +3,8 @@ package com.dfsek.terra.config.builder;
import com.dfsek.paralithic.eval.parser.Scope;
import com.dfsek.paralithic.eval.tokenizer.ParseException;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.ExpressionSampler;
import com.dfsek.terra.api.noise.samplers.noise.ConstantSampler;
import com.dfsek.terra.noise.samplers.ExpressionSampler;
import com.dfsek.terra.noise.samplers.noise.ConstantSampler;
import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;

2
common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.config.factories;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler;
import com.dfsek.terra.api.world.Flora;
import com.dfsek.terra.api.world.palette.NoisePalette;
import com.dfsek.terra.api.world.palette.PaletteImpl;

5
common/implementation/src/main/java/com/dfsek/terra/config/lang/LangUtil.java
View File

@@ -2,7 +2,8 @@ package com.dfsek.terra.config.lang;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.util.logging.Logger;
import com.dfsek.terra.api.Logger;
import com.dfsek.terra.api.lang.Language;
import java.io.File;
import java.io.IOException;
@@ -26,7 +27,7 @@ public final class LangUtil {
try {
File file1 = new File(file, langID + ".yml");
logger.info(file1.getAbsolutePath());
language = new Language(file1);
language = new LanguageImpl(file1);
logger.info("Loaded language " + langID);
} catch(IOException e) {
logger.severe("Unable to load language: " + langID);

8
common/implementation/src/main/java/com/dfsek/terra/config/lang/Language.java → common/implementation/src/main/java/com/dfsek/terra/config/lang/LanguageImpl.java
View File

@@ -3,6 +3,7 @@ package com.dfsek.terra.config.lang;
import com.dfsek.tectonic.config.Configuration;
import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.lang.Message;
import java.io.File;
import java.io.FileInputStream;
@@ -11,11 +12,12 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
public class Language {
public class LanguageImpl implements com.dfsek.terra.api.lang.Language {
private final Configuration configuration;
public Language(File file) throws IOException {
public LanguageImpl(File file) throws IOException {
configuration = new Configuration(new FileInputStream(file));
}
@Override
@SuppressWarnings("unchecked")
public Message getMessage(String id) {
Message temp = null;
@@ -31,9 +33,11 @@ public class Language {
if(temp == null || temp.isEmpty()) return new SingleLineMessage("message:" + id + ":translation_undefined");
return temp;
}
@Override
public void log(String messageID, Level level, Logger logger, String... args) {
getMessage(messageID).log(logger, level, args);
}
@Override
public void send(String messageID, CommandSender sender, String... args) {
getMessage(messageID).send(sender, args);
}

1
common/implementation/src/main/java/com/dfsek/terra/config/lang/MultiLineMessage.java
View File

@@ -1,6 +1,7 @@
package com.dfsek.terra.config.lang;
import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.lang.Message;
import java.util.Arrays;
import java.util.List;

1
common/implementation/src/main/java/com/dfsek/terra/config/lang/SingleLineMessage.java
View File

@@ -2,6 +2,7 @@ package com.dfsek.terra.config.lang;
import com.dfsek.terra.api.entity.CommandSender;
import com.dfsek.terra.api.lang.Message;
import java.util.Arrays;
import java.util.logging.Level;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java
View File

@@ -5,7 +5,7 @@ import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.api.math.range.ConstantRange;
import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler;
import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.world.Flora;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java
View File

@@ -4,7 +4,7 @@ import com.dfsek.tectonic.exception.LoadException;
import com.dfsek.tectonic.loading.ConfigLoader;
import com.dfsek.tectonic.loading.TypeLoader;
import com.dfsek.terra.api.math.range.ConstantRange;
import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler;
import com.dfsek.terra.api.world.Tree;
import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/provider/BiomeProviderTemplate.java
View File

@@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.loading.object.ObjectTemplate;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.ConstantSampler;
import com.dfsek.terra.noise.samplers.noise.ConstantSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/DomainWarpTemplate.java
View File

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.DomainWarpedSampler;
import com.dfsek.terra.noise.samplers.DomainWarpedSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
@SuppressWarnings({"unused", "FieldMayBeFinal"})

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/ImageSamplerTemplate.java
View File

@@ -2,7 +2,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.ImageSampler;
import com.dfsek.terra.noise.samplers.ImageSampler;
import java.awt.image.BufferedImage;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/KernelTemplate.java
View File

@@ -5,7 +5,7 @@ import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ValidatedConfigTemplate;
import com.dfsek.tectonic.exception.ValidationException;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.KernelSampler;
import com.dfsek.terra.noise.samplers.KernelSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import java.util.List;

4
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java
View File

@@ -3,8 +3,8 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.CellularSampler;
import com.dfsek.terra.api.noise.samplers.noise.simplex.OpenSimplex2Sampler;
import com.dfsek.terra.noise.samplers.noise.CellularSampler;
import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2Sampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
@SuppressWarnings("FieldMayBeFinal")

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ConstantNoiseTemplate.java
View File

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.ConstantSampler;
import com.dfsek.terra.noise.samplers.noise.ConstantSampler;
import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
@SuppressWarnings("FieldMayBeFinal")

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/ExpressionFunctionTemplate.java
View File

@@ -9,7 +9,7 @@ import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ValidatedConfigTemplate;
import com.dfsek.tectonic.exception.ValidationException;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.ExpressionFunction;
import com.dfsek.terra.noise.samplers.noise.ExpressionFunction;
import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction;
import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2;
import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/GaborNoiseTemplate.java
View File

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.GaborNoiseSampler;
import com.dfsek.terra.noise.samplers.noise.GaborNoiseSampler;
public class GaborNoiseTemplate extends NoiseTemplate<GaborNoiseSampler> {
@Value("rotation")

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/NoiseTemplate.java
View File

@@ -2,7 +2,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
import com.dfsek.terra.noise.samplers.noise.NoiseFunction;
import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;
@SuppressWarnings({"unused", "FieldMayBeFinal"})

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/SimpleNoiseTemplate.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.config.loaders.config.sampler.templates.noise;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
import com.dfsek.terra.noise.samplers.noise.NoiseFunction;
import java.util.function.Function;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/BrownianMotionTemplate.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.fractal.BrownianMotionSampler;
import com.dfsek.terra.noise.samplers.noise.fractal.BrownianMotionSampler;
public class BrownianMotionTemplate extends FractalTemplate<BrownianMotionSampler> {
@Override

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java
View File

@@ -2,7 +2,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.samplers.noise.fractal.FractalNoiseFunction;
import com.dfsek.terra.noise.samplers.noise.fractal.FractalNoiseFunction;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java
View File

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.fractal.PingPongSampler;
import com.dfsek.terra.noise.samplers.noise.fractal.PingPongSampler;
@SuppressWarnings({"unused", "FieldMayBeFinal"})
public class PingPongTemplate extends FractalTemplate<PingPongSampler> {
@Value("ping-pong")

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/RidgedFractalTemplate.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.fractal.RidgedFractalSampler;
import com.dfsek.terra.noise.samplers.noise.fractal.RidgedFractalSampler;
public class RidgedFractalTemplate extends FractalTemplate<RidgedFractalSampler> {
@Override

4
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/ClampNormalizerTemplate.java
View File

@@ -2,8 +2,8 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.normalizer.ClampNormalizer;
import com.dfsek.terra.api.noise.normalizer.LinearNormalizer;
import com.dfsek.terra.noise.normalizer.ClampNormalizer;
import com.dfsek.terra.noise.normalizer.LinearNormalizer;
@SuppressWarnings({"unused", "FieldMayBeFinal"})
public class ClampNormalizerTemplate extends NormalizerTemplate<LinearNormalizer> {

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/LinearNormalizerTemplate.java
View File

@@ -2,7 +2,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.normalizer.LinearNormalizer;
import com.dfsek.terra.noise.normalizer.LinearNormalizer;
@SuppressWarnings({"unused", "FieldMayBeFinal"})
public class LinearNormalizerTemplate extends NormalizerTemplate<LinearNormalizer> {

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalNormalizerTemplate.java
View File

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.normalizer.NormalNormalizer;
import com.dfsek.terra.noise.normalizer.NormalNormalizer;
@SuppressWarnings({"unused", "FieldMayBeFinal"})
public class NormalNormalizerTemplate extends NormalizerTemplate<NormalNormalizer> {

2
common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/normalizer/NormalizerTemplate.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.config.loaders.config.sampler.templates.normalizer;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.normalizer.Normalizer;
import com.dfsek.terra.noise.normalizer.Normalizer;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate;

11
common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
View File

@@ -15,7 +15,8 @@ import com.dfsek.terra.api.event.events.config.ConfigPackPreLoadEvent;
import com.dfsek.terra.api.registry.CheckedRegistry;
import com.dfsek.terra.api.registry.OpenRegistry;
import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structures.loot.LootTable;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.structures.loot.LootTableImpl;
import com.dfsek.terra.api.structures.parser.lang.functions.FunctionBuilder;
import com.dfsek.terra.api.structures.script.StructureScript;
import com.dfsek.terra.api.util.generic.pair.ImmutablePair;
@@ -190,7 +191,7 @@ public class ConfigPackImpl implements ConfigPack {
putPair(map, NoiseProvider.class, new NoiseRegistry());
putPair(map, FunctionBuilder.class, (OpenRegistry<FunctionBuilder>) (Object) new FunctionRegistry());
putPair(map, LootTable.class, new LootRegistry());
putPair(map, LootTableImpl.class, new LootRegistry());
putPair(map, StructureScript.class, new ScriptRegistry());
return map;
@@ -217,8 +218,8 @@ public class ConfigPackImpl implements ConfigPack {
loader.open("", ".tesf").thenEntries(entries -> {
for(Map.Entry<String, InputStream> entry : entries) {
try(InputStream stream = entry.getValue()) {
StructureScript structureScript = new StructureScript(stream, main, getRegistry(StructureScript.class), getRegistry(LootTable.class), (Registry<FunctionBuilder<?>>) (Object) getRegistry(FunctionBuilder.class));
getOpenRegistry(StructureScript.class).add(structureScript.getId(), structureScript);
Structure structure = new StructureScript(stream, main, getRegistry(StructureScript.class), getRegistry(LootTableImpl.class), (Registry<FunctionBuilder<?>>) (Object) getRegistry(FunctionBuilder.class));
getOpenRegistry(StructureScript.class).add(structure.getId(), structure);
} catch(com.dfsek.terra.api.structures.parser.exceptions.ParseException | IOException e) {
throw new LoadException("Unable to load script \"" + entry.getKey() + "\"", e);
}
@@ -226,7 +227,7 @@ public class ConfigPackImpl implements ConfigPack {
}).close().open("structures/loot", ".json").thenEntries(entries -> {
for(Map.Entry<String, InputStream> entry : entries) {
try {
getOpenRegistry(LootTable.class).add(entry.getKey(), new LootTable(IOUtils.toString(entry.getValue(), StandardCharsets.UTF_8), main));
getOpenRegistry(LootTableImpl.class).add(entry.getKey(), new LootTableImpl(IOUtils.toString(entry.getValue(), StandardCharsets.UTF_8), main));
} catch(ParseException | IOException | NullPointerException e) {
throw new LoadException("Unable to load loot table \"" + entry.getKey() + "\"", e);
}

11
common/implementation/src/main/java/com/dfsek/terra/config/pack/WorldConfigImpl.java
View File

@@ -6,11 +6,11 @@ import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.world.TerraWorld;
import com.dfsek.terra.api.world.biome.TerraBiome;
import com.dfsek.terra.api.world.biome.generation.BiomeProvider;
import com.dfsek.terra.carving.UserDefinedCarver;
import com.dfsek.terra.api.world.generator.SamplerCache;
import com.dfsek.terra.config.builder.BiomeBuilder;
import com.dfsek.terra.registry.LockedRegistryImpl;
import com.dfsek.terra.registry.OpenRegistryImpl;
import com.dfsek.terra.world.generation.math.SamplerCache;
import com.dfsek.terra.world.generation.math.SamplerCacheImpl;
import com.dfsek.terra.world.population.items.TerraStructure;
import java.util.HashMap;
@@ -31,7 +31,7 @@ public class WorldConfigImpl implements com.dfsek.terra.api.config.WorldConfig {
public WorldConfigImpl(TerraWorld world, ConfigPackImpl pack, TerraPlugin main) {
this.world = world;
this.pack = pack;
this.samplerCache = new SamplerCache(main, world);
this.samplerCache = new SamplerCacheImpl(main, world);
pack.getRegistryMap().forEach((clazz, pair) -> registryMap.put(clazz, new LockedRegistryImpl<>(pair.getLeft())));
@@ -58,11 +58,6 @@ public class WorldConfigImpl implements com.dfsek.terra.api.config.WorldConfig {
return samplerCache;
}
@Override
public Set<UserDefinedCarver> getCarvers() {
return new HashSet<>(getRegistry(UserDefinedCarver.class).entries());
}
@Override
public BiomeProvider getProvider() {
return provider;

2
common/implementation/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
View File

@@ -11,7 +11,7 @@ import com.dfsek.tectonic.exception.ValidationException;
import com.dfsek.terra.api.TerraPlugin;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.ConstantSampler;
import com.dfsek.terra.noise.samplers.noise.ConstantSampler;
import com.dfsek.terra.api.math.paralithic.BlankFunction;
import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction;
import com.dfsek.terra.api.block.BlockType;

2
common/implementation/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java
View File

@@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Abstractable;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder;

6
common/implementation/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java
View File

@@ -5,7 +5,7 @@ import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ConfigTemplate;
import com.dfsek.terra.api.math.GridSpawn;
import com.dfsek.terra.api.structures.script.StructureScript;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.util.GlueList;
import com.dfsek.terra.api.util.Range;
import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
@@ -19,7 +19,7 @@ public class StructureTemplate extends AbstractableTemplate implements ConfigTem
@Value("scripts")
@Abstractable
private ProbabilityCollectionImpl<StructureScript> structure;
private ProbabilityCollectionImpl<Structure> structure;
@Value("spawn.start")
@Abstractable
@@ -38,7 +38,7 @@ public class StructureTemplate extends AbstractableTemplate implements ConfigTem
return id;
}
public ProbabilityCollectionImpl<StructureScript> getStructures() {
public ProbabilityCollectionImpl<Structure> getStructures() {
return structure;
}

6
common/implementation/src/main/java/com/dfsek/terra/config/templates/TreeTemplate.java
View File

@@ -3,7 +3,7 @@ package com.dfsek.terra.config.templates;
import com.dfsek.tectonic.annotations.Abstractable;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.terra.api.structures.script.StructureScript;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.util.collections.MaterialSet;
import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
@@ -11,7 +11,7 @@ import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl;
public class TreeTemplate extends AbstractableTemplate {
@Value("scripts")
@Abstractable
private ProbabilityCollectionImpl<StructureScript> structure;
private ProbabilityCollectionImpl<Structure> structure;
@Value("id")
private String id;
@@ -25,7 +25,7 @@ public class TreeTemplate extends AbstractableTemplate {
@Abstractable
private MaterialSet spawnable;
public ProbabilityCollectionImpl<StructureScript> getStructures() {
public ProbabilityCollectionImpl<Structure> getStructures() {
return structure;
}

2
common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/ClampNormalizer.java → common/implementation/src/main/java/com/dfsek/terra/noise/normalizer/ClampNormalizer.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.normalizer;
package com.dfsek.terra.noise.normalizer;
import com.dfsek.terra.api.noise.NoiseSampler;
import net.jafama.FastMath;

2
common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/LinearNormalizer.java → common/implementation/src/main/java/com/dfsek/terra/noise/normalizer/LinearNormalizer.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.normalizer;
package com.dfsek.terra.noise.normalizer;
import com.dfsek.terra.api.noise.NoiseSampler;

2
common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/NormalNormalizer.java → common/implementation/src/main/java/com/dfsek/terra/noise/normalizer/NormalNormalizer.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.normalizer;
package com.dfsek.terra.noise.normalizer;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.MathUtil;

2
common/api/src/main/java/com/dfsek/terra/api/noise/normalizer/Normalizer.java → common/implementation/src/main/java/com/dfsek/terra/noise/normalizer/Normalizer.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.normalizer;
package com.dfsek.terra.noise.normalizer;
import com.dfsek.terra.api.noise.NoiseSampler;

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/DomainWarpedSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/DomainWarpedSampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers;
package com.dfsek.terra.noise.samplers;
import com.dfsek.terra.api.noise.NoiseSampler;

7
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/ExpressionSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/ExpressionSampler.java
View File

@@ -1,10 +1,15 @@
package com.dfsek.terra.api.noise.samplers;
package com.dfsek.terra.noise.samplers;
import com.dfsek.paralithic.Expression;
import com.dfsek.paralithic.eval.parser.Parser;
import com.dfsek.paralithic.eval.parser.Scope;
import com.dfsek.paralithic.eval.tokenizer.ParseException;
import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction;
import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2;
import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.util.seeded.NoiseSeeded;
import com.dfsek.terra.config.loaders.config.function.FunctionTemplate;
import java.util.Map;

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/ImageSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/ImageSampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers;
package com.dfsek.terra.noise.samplers;
import com.dfsek.terra.api.noise.NoiseSampler;
import net.jafama.FastMath;

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/KernelSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/KernelSampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers;
package com.dfsek.terra.noise.samplers;
import com.dfsek.terra.api.noise.NoiseSampler;

4
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/CellularSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/CellularSampler.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.api.noise.samplers.noise;
package com.dfsek.terra.noise.samplers.noise;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.simplex.OpenSimplex2Sampler;
import com.dfsek.terra.noise.samplers.noise.simplex.OpenSimplex2Sampler;
import com.dfsek.terra.api.vector.Vector2;
import com.dfsek.terra.api.vector.Vector3;

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/ConstantSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/ConstantSampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers.noise;
package com.dfsek.terra.noise.samplers.noise;
/**
* Sampler3D implementation that returns a constant.

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/ExpressionFunction.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/ExpressionFunction.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers.noise;
package com.dfsek.terra.noise.samplers.noise;
import com.dfsek.paralithic.Expression;
import com.dfsek.paralithic.eval.parser.Parser;

4
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/GaborNoiseSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/GaborNoiseSampler.java
View File

@@ -1,6 +1,6 @@
package com.dfsek.terra.api.noise.samplers.noise;
package com.dfsek.terra.noise.samplers.noise;
import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler;
import com.dfsek.terra.noise.samplers.noise.random.WhiteNoiseSampler;
import net.jafama.FastMath;
public class GaborNoiseSampler extends NoiseFunction {

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/NoiseFunction.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/NoiseFunction.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers.noise;
package com.dfsek.terra.noise.samplers.noise;
import com.dfsek.terra.api.noise.NoiseSampler;
import net.jafama.FastMath;

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/fractal/BrownianMotionSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/fractal/BrownianMotionSampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers.noise.fractal;
package com.dfsek.terra.noise.samplers.noise.fractal;
import com.dfsek.terra.api.noise.NoiseSampler;

4
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/fractal/FractalNoiseFunction.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/fractal/FractalNoiseFunction.java
View File

@@ -1,7 +1,7 @@
package com.dfsek.terra.api.noise.samplers.noise.fractal;
package com.dfsek.terra.noise.samplers.noise.fractal;
import com.dfsek.terra.api.noise.NoiseSampler;
import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
import com.dfsek.terra.noise.samplers.noise.NoiseFunction;
public abstract class FractalNoiseFunction extends NoiseFunction {
protected final NoiseSampler input;

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/fractal/PingPongSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/fractal/PingPongSampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers.noise.fractal;
package com.dfsek.terra.noise.samplers.noise.fractal;
import com.dfsek.terra.api.noise.NoiseSampler;

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/fractal/RidgedFractalSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/fractal/RidgedFractalSampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers.noise.fractal;
package com.dfsek.terra.noise.samplers.noise.fractal;
import com.dfsek.terra.api.noise.NoiseSampler;

4
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/random/GaussianNoiseSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/random/GaussianNoiseSampler.java
View File

@@ -1,6 +1,6 @@
package com.dfsek.terra.api.noise.samplers.noise.random;
package com.dfsek.terra.noise.samplers.noise.random;
import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
import com.dfsek.terra.noise.samplers.noise.NoiseFunction;
/**
* NoiseSampler implementation to provide random, normally distributed (Gaussian) noise.

4
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/random/WhiteNoiseSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/random/WhiteNoiseSampler.java
View File

@@ -1,6 +1,6 @@
package com.dfsek.terra.api.noise.samplers.noise.random;
package com.dfsek.terra.noise.samplers.noise.random;
import com.dfsek.terra.api.noise.samplers.noise.NoiseFunction;
import com.dfsek.terra.noise.samplers.noise.NoiseFunction;
/**
* NoiseSampler implementation to produce random, uniformly distributed (white) noise.

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/simplex/OpenSimplex2SSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/simplex/OpenSimplex2SSampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers.noise.simplex;
package com.dfsek.terra.noise.samplers.noise.simplex;
/**
* NoiseSampler implementation to provide OpenSimplex2 (Smooth Variant) noise.

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/simplex/OpenSimplex2Sampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/simplex/OpenSimplex2Sampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers.noise.simplex;
package com.dfsek.terra.noise.samplers.noise.simplex;
/**
* NoiseSampler implementation to provide OpenSimplex2 noise.

2
common/api/src/main/java/com/dfsek/terra/api/noise/samplers/noise/simplex/PerlinSampler.java → common/implementation/src/main/java/com/dfsek/terra/noise/samplers/noise/simplex/PerlinSampler.java
View File

@@ -1,4 +1,4 @@
package com.dfsek.terra.api.noise.samplers.noise.simplex;
package com.dfsek.terra.noise.samplers.noise.simplex;
/**
* NoiseSampler implementation to provide Perlin Noise.

Some files were not shown because too many files have changed in this diff Show More