Anvilcraft/DimDoors
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added SchematicGenerator offset

Browse source
This commit is contained in:
CreepyCre 2021-02-09 11:14:24 +01:00
parent 3c950dc5eb
commit d2e0e1e32d
2 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/dimdev/dimdoors/pockets/PocketTemplateV2.java
View file

@ -1,5 +1,6 @@
package org.dimdev.dimdoors.pockets;
import net.minecraft.util.math.Vec3i;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.dimdev.dimdoors.DimensionalDoorsInitializer;
@ -56,12 +57,16 @@ public class PocketTemplateV2 {
}
*/
public void place(Pocket pocket) {
public void place(Pocket pocket, int xOffset, int yOffset, int zOffset) {
place(pocket, new Vec3i(xOffset, yOffset, zOffset));
}
public void place(Pocket pocket, Vec3i offset) {
pocket.setSize(schematic.getWidth(), schematic.getHeight(), schematic.getLength());
ServerWorld world = DimensionalDoorsInitializer.getWorld(pocket.world);
BlockPos origin = pocket.getOrigin();
LOGGER.info("Placing new pocket using schematic " + this.id + " at x = " + origin.getX() + ", z = " + origin.getZ());
SchematicPlacer.place(this.schematic, world, origin);
SchematicPlacer.place(this.schematic, world, origin.add(offset));
}
public static boolean isReplacingPlaceholders() {

34
src/main/java/org/dimdev/dimdoors/pockets/generator/SchematicGenerator.java
View file

@ -8,9 +8,13 @@ import org.apache.logging.log4j.Logger;
import org.dimdev.dimdoors.pockets.PocketTemplateV2;
import org.dimdev.dimdoors.pockets.SchematicV2Handler;
import org.dimdev.dimdoors.util.PocketGenerationParameters;
import org.dimdev.dimdoors.util.math.Equation;
import org.dimdev.dimdoors.world.level.DimensionalRegistry;
import org.dimdev.dimdoors.world.pocket.Pocket;
import java.util.HashMap;
import java.util.Map;
public class SchematicGenerator extends PocketGenerator {
private static final Logger LOGGER = LogManager.getLogger();
public static final String KEY = "schematic";
@ -26,7 +30,16 @@ public class SchematicGenerator extends PocketGenerator {
private String id;
private Identifier templateID;
public SchematicGenerator() {}
private Equation lengthEquation;
private String offsetX;
private Equation offsetXEquation;
private String offsetY;
private Equation offsetYEquation;
private String offsetZ;
private Equation offsetZEquation;
public SchematicGenerator() {
}
public SchematicGenerator(String id) {
this.id = id;
@ -51,6 +64,17 @@ public class SchematicGenerator extends PocketGenerator {
SchematicV2Handler.getInstance().loadSchematic(templateID, id);
try {
offsetX = tag.contains("offset_x") ? tag.getString("offset_x") : "0";
offsetXEquation = Equation.parse(offsetX);
offsetY = tag.contains("offset_y") ? tag.getString("offset_y") : "0";
offsetYEquation = Equation.parse(offsetY);
offsetZ = tag.contains("offset_z") ? tag.getString("offset_z") : "0";
offsetZEquation = Equation.parse(offsetZ);
} catch (Equation.EquationParseException e) {
LOGGER.error(e);
}
return this;
}
@ -59,12 +83,18 @@ public class SchematicGenerator extends PocketGenerator {
super.toTag(tag);
tag.putString("id", this.id);
if (!offsetX.equals("0")) tag.putString("offset_x", offsetX);
if (!offsetY.equals("0")) tag.putString("offset_y", offsetY);
if (!offsetZ.equals("0")) tag.putString("offset_z", offsetZ);
return tag;
}
@Override
public Pocket prepareAndPlacePocket(PocketGenerationParameters parameters) {
ServerWorld world = parameters.getWorld();
Map<String, Double> variableMap = parameters.toVariableMap(new HashMap<>());
PocketTemplateV2 template = SchematicV2Handler.getInstance().getTemplates().get(templateID);
if (template == null) throw new RuntimeException("Pocket template of id " + templateID + " not found!");
@ -72,7 +102,7 @@ public class SchematicGenerator extends PocketGenerator {
Pocket pocket = DimensionalRegistry.getPocketDirectory(world.getRegistryKey()).newPocket();
LOGGER.info("Generating pocket from template " + template.getId() + " at location " + pocket.getOrigin());
template.place(pocket);
template.place(pocket, (int) offsetXEquation.apply(variableMap), (int) offsetYEquation.apply(variableMap), (int) offsetZEquation.apply(variableMap));
return pocket;
}