mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 10:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

implement LootFunction

Browse Source
This commit is contained in:
dfsek
2021-01-01 00:08:03 -07:00
parent a9df684b80
commit ce033b0956
13 changed files with 105 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import com.dfsek.terra.api.structures.parser.lang.Block;
import com.dfsek.terra.api.structures.script.builders.BlockFunctionBuilder;
import com.dfsek.terra.api.structures.script.builders.CheckFunctionBuilder;
import com.dfsek.terra.api.structures.script.builders.GetMarkFunctionBuilder;
import com.dfsek.terra.api.structures.script.builders.LootFunctionBuilder;
import com.dfsek.terra.api.structures.script.builders.MarkFunctionBuilder;
import com.dfsek.terra.api.structures.script.builders.PullFunctionBuilder;
import com.dfsek.terra.api.structures.script.builders.RandomFunctionBuilder;
@@ -18,6 +19,7 @@ import com.dfsek.terra.api.structures.structure.Rotation;
import com.dfsek.terra.api.structures.structure.buffer.Buffer;
import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer;
import com.dfsek.terra.api.structures.world.CheckCache;
import com.dfsek.terra.registry.LootRegistry;
import com.dfsek.terra.registry.ScriptRegistry;
import org.apache.commons.io.IOUtils;
@@ -32,7 +34,7 @@ public class StructureScript {
private final String id;
private final LinkedHashMap<Location, StructureBuffer> cache;
public StructureScript(InputStream inputStream, TerraPlugin main, ScriptRegistry registry, CheckCache cache) {
public StructureScript(InputStream inputStream, TerraPlugin main, ScriptRegistry registry, LootRegistry lootRegistry, CheckCache cache) {
Parser parser;
try {
parser = new Parser(IOUtils.toString(inputStream));
@@ -46,7 +48,8 @@ public class StructureScript {
.addFunction("recursions", new RecursionsFunctionBuilder())
.addFunction("setMark", new MarkFunctionBuilder())
.addFunction("getMark", new GetMarkFunctionBuilder())
.addFunction("pull", new PullFunctionBuilder(main));
.addFunction("pull", new PullFunctionBuilder(main))
.addFunction("loot", new LootFunctionBuilder(main, lootRegistry));
try {
block = parser.parse();

45
common/src/main/java/com/dfsek/terra/api/structures/script/builders/LootFunctionBuilder.java Normal file
View File

@@ -0,0 +1,45 @@
package com.dfsek.terra.api.structures.script.builders;
import com.dfsek.terra.api.platform.TerraPlugin;
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.LootFunction;
import com.dfsek.terra.api.structures.tokenizer.Position;
import com.dfsek.terra.registry.LootRegistry;
import java.util.List;
public class LootFunctionBuilder implements FunctionBuilder<LootFunction> {
private final TerraPlugin main;
private final LootRegistry registry;
public LootFunctionBuilder(TerraPlugin main, LootRegistry registry) {
this.main = main;
this.registry = registry;
}
@SuppressWarnings("unchecked")
@Override
public LootFunction build(List<Returnable<?>> argumentList, Position position) {
return new LootFunction(registry, (Returnable<Number>) argumentList.get(0), (Returnable<Number>) argumentList.get(1), (Returnable<Number>) argumentList.get(2), (Returnable<String>) argumentList.get(3), main, position);
}
@Override
public int argNumber() {
return 4;
}
@Override
public Returnable.ReturnType getArgument(int position) {
switch(position) {
case 0:
case 1:
case 2:
return Returnable.ReturnType.NUMBER;
case 3:
return Returnable.ReturnType.STRING;
default:
return null;
}
}
}

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

@@ -1,26 +1,36 @@
package com.dfsek.terra.api.structures.script.functions;
import com.dfsek.terra.api.loot.LootTable;
import com.dfsek.terra.api.math.vector.Vector2;
import com.dfsek.terra.api.math.vector.Vector3;
import com.dfsek.terra.api.platform.TerraPlugin;
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.structure.Rotation;
import com.dfsek.terra.api.structures.structure.RotationUtil;
import com.dfsek.terra.api.structures.structure.buffer.Buffer;
import com.dfsek.terra.api.structures.structure.buffer.items.BufferedLootApplication;
import com.dfsek.terra.api.structures.tokenizer.Position;
import com.dfsek.terra.registry.LootRegistry;
import net.jafama.FastMath;
import java.util.Random;
public class LootFunction implements Function<Void> {
private final LootRegistry registry;
private final Returnable<String> data;
private final Returnable<Number> x, y, z;
private final Position position;
private final TerraPlugin main;
public LootFunction(Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Returnable<String> data, TerraPlugin main, Position position) {
public LootFunction(LootRegistry registry, Returnable<Number> x, Returnable<Number> y, Returnable<Number> z, Returnable<String> data, TerraPlugin main, Position position) {
this.registry = registry;
this.position = position;
this.data = data;
this.x = x;
this.y = y;
this.z = z;
this.main = main;
}
@Override
@@ -32,7 +42,17 @@ public class LootFunction implements Function<Void> {
public Void apply(Buffer buffer, Rotation rotation, Random random, int recursions) {
Vector2 xz = new Vector2(x.apply(buffer, rotation, random, recursions).doubleValue(), z.apply(buffer, rotation, random, recursions).doubleValue());
RotationUtil.rotateVector(xz, rotation);
String id = data.apply(buffer, rotation, random, recursions);
LootTable table = registry.get(id);
if(table == null) {
main.getLogger().severe("No such loot table " + id);
return null;
}
buffer.addItem(new BufferedLootApplication(table, main), new Vector3(FastMath.roundToInt(xz.getX()), y.apply(buffer, rotation, random, recursions).intValue(), FastMath.roundToInt(xz.getZ())));
return null;
}

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

@@ -53,9 +53,10 @@ public class StructureFunction implements Function<Boolean> {
RotationUtil.rotateVector(xz, rotation);
StructureScript script = registry.get(id.apply(buffer, rotation, random, recursions));
String app = id.apply(buffer, rotation, random, recursions);
StructureScript script = registry.get(app);
if(script == null) {
main.getLogger().severe("No such structure " + id.apply(buffer, rotation, random, recursions));
main.getLogger().severe("No such structure " + app);
return null;
}

4
common/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java
View File

@@ -7,11 +7,11 @@ import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem;
import com.dfsek.terra.api.structures.structure.buffer.items.Mark;
import net.jafama.FastMath;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
public class StructureBuffer implements Buffer {
private final Map<Vector3, Cell> bufferedItemMap = new HashMap<>();
private final Map<Vector3, Cell> bufferedItemMap = new LinkedHashMap<>();
private final Location origin;
private boolean succeeded;

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

@@ -1,11 +1,29 @@
package com.dfsek.terra.api.structures.structure.buffer.items;
import com.dfsek.terra.api.loot.LootTable;
import com.dfsek.terra.api.math.vector.Location;
import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.platform.TerraPlugin;
import com.dfsek.terra.api.platform.block.state.BlockState;
import com.dfsek.terra.api.platform.block.state.Container;
import com.dfsek.terra.api.util.FastRandom;
public class BufferedLootApplication implements BufferedItem {
private final LootTable table;
private final TerraPlugin main;
public BufferedLootApplication(LootTable table, TerraPlugin main) {
this.table = table;
this.main = main;
}
@Override
public void paste(Location origin) {
BlockData data = origin.getBlock().getBlockData();
BlockState data = origin.getBlock().getState();
if(!(data instanceof Container)) {
main.getLogger().severe("Failed to place loot at " + origin + "; block " + data.toString() + " is not container.");
return;
}
Container container = (Container) data;
table.fillInventory(container.getInventory(), new FastRandom(origin.hashCode()));
}
}

2
common/src/main/java/com/dfsek/terra/config/base/ConfigPack.java
View File

@@ -155,7 +155,7 @@ public class ConfigPack implements LoaderRegistrar {
}
loader.open("structures/data", ".tesf").then(streams -> streams.forEach(stream -> {
StructureScript structureScript = new StructureScript(stream, main, scriptRegistry, checkCache);
StructureScript structureScript = new StructureScript(stream, main, scriptRegistry, lootRegistry, checkCache);
scriptRegistry.add(structureScript.getId(), structureScript);
})).close().open("structures/loot", ".json").thenEntries(entries -> {
for(Map.Entry<String, InputStream> entry : entries) {

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

@@ -8,6 +8,6 @@ import com.dfsek.terra.generation.items.TerraStructure;
public class StructureFactory implements TerraFactory<StructureTemplate, TerraStructure> {
@Override
public TerraStructure build(StructureTemplate config, TerraPlugin main) throws LoadException {
return new TerraStructure(config.getStructures(), config.getY(), config.getSpawn(), config.getLoot(), config);
return new TerraStructure(config.getStructures(), config.getY(), config.getSpawn(), config);
}
}

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

@@ -4,7 +4,6 @@ import com.dfsek.tectonic.annotations.Abstractable;
import com.dfsek.tectonic.annotations.Default;
import com.dfsek.tectonic.annotations.Value;
import com.dfsek.tectonic.config.ConfigTemplate;
import com.dfsek.terra.api.loot.LootTable;
import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.Range;
import com.dfsek.terra.api.structures.script.StructureScript;
@@ -12,7 +11,6 @@ import com.dfsek.terra.api.util.GlueList;
import com.dfsek.terra.procgen.GridSpawn;
import java.util.List;
import java.util.Map;
@SuppressWarnings({"unused", "FieldMayBeFinal"})
public class StructureTemplate extends AbstractableTemplate implements ConfigTemplate {
@@ -31,19 +29,11 @@ public class StructureTemplate extends AbstractableTemplate implements ConfigTem
@Abstractable
private GridSpawn spawn;
@Value("loot")
@Abstractable
private Map<String, LootTable> loot;
@Value("features")
@Abstractable
@Default
private List<Void> features = new GlueList<>();
public Map<String, LootTable> getLoot() {
return loot;
}
public String getID() {
return id;
}

11
common/src/main/java/com/dfsek/terra/generation/items/TerraStructure.java
View File

@@ -1,26 +1,21 @@
package com.dfsek.terra.generation.items;
import com.dfsek.terra.api.loot.LootTable;
import com.dfsek.terra.api.math.ProbabilityCollection;
import com.dfsek.terra.api.math.Range;
import com.dfsek.terra.api.structures.script.StructureScript;
import com.dfsek.terra.config.templates.StructureTemplate;
import com.dfsek.terra.procgen.GridSpawn;
import java.util.Map;
public class TerraStructure {
private final ProbabilityCollection<StructureScript> structure;
private final Range spawnStart;
private final GridSpawn spawn;
private final Map<String, LootTable> loot;
private final StructureTemplate template;
public TerraStructure(ProbabilityCollection<StructureScript> structures, Range spawnStart, GridSpawn spawn, Map<String, LootTable> loot, StructureTemplate template) {
public TerraStructure(ProbabilityCollection<StructureScript> structures, Range spawnStart, GridSpawn spawn, StructureTemplate template) {
this.structure = structures;
this.spawnStart = spawnStart;
this.spawn = spawn;
this.loot = loot;
this.template = template;
}
@@ -39,8 +34,4 @@ public class TerraStructure {
public GridSpawn getSpawn() {
return spawn;
}
public Map<String, LootTable> getLoot() {
return loot;
}
}

3
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlock.java
View File

@@ -9,6 +9,7 @@ import com.dfsek.terra.api.platform.block.state.BlockState;
import com.dfsek.terra.bukkit.BukkitWorld;
import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
import com.dfsek.terra.bukkit.world.block.data.BukkitEnumAdapter;
import com.dfsek.terra.bukkit.world.block.state.BukkitBlockState;
public class BukkitBlock implements Block {
private final org.bukkit.block.Block delegate;
@@ -29,7 +30,7 @@ public class BukkitBlock implements Block {
@Override
public BlockState getState() {
return null;
return BukkitBlockState.newInstance(delegate.getState());
}
@Override

2
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockState.java
View File

@@ -5,6 +5,7 @@ import com.dfsek.terra.api.platform.block.BlockData;
import com.dfsek.terra.api.platform.block.state.BlockState;
import com.dfsek.terra.bukkit.world.block.BukkitBlock;
import com.dfsek.terra.bukkit.world.block.data.BukkitBlockData;
import org.bukkit.block.Container;
public class BukkitBlockState implements BlockState {
private final org.bukkit.block.BlockState delegate;
@@ -14,6 +15,7 @@ public class BukkitBlockState implements BlockState {
}
public static BukkitBlockState newInstance(org.bukkit.block.BlockState block) {
if(block instanceof Container) return new BukkitContainer((Container) block);
return new BukkitBlockState(block);
}

3
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/inventory/BukkitInventory.java
View File

@@ -17,7 +17,8 @@ public class BukkitInventory implements Inventory {
@Override
public ItemStack getItem(int slot) {
return new BukkitItemStack(delegate.getItem(slot));
org.bukkit.inventory.ItemStack itemStack = delegate.getItem(slot);
return itemStack == null ? null : new BukkitItemStack(itemStack);
}
@Override