mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-19 02:36:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add entity spawn location setting

Browse Source 
Also prevents entities from spawning when a building was not spawned
This commit is contained in:
CocoTheOwner 2021-03-06 14:54:28 +01:00
parent 24c4cbe901
commit f3ceda1b3d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java
View File

@ -50,6 +50,11 @@ public class IrisJigsawPieceConnector
@Required @Required
private IrisPosition position = new IrisPosition(0,0,0); private IrisPosition position = new IrisPosition(0,0,0);
@DontObfuscate
@Desc("The relative position to this connector to place entities at")
@DependsOn({"spawnEntity"})
private IrisPosition entityPosition = null;
@DontObfuscate @DontObfuscate
@Desc("The direction this connector is facing. If the direction is set to UP, then pieces will place ABOVE the connector.") @Desc("The direction this connector is facing. If the direction is set to UP, then pieces will place ABOVE the connector.")
@Required @Required

9
src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java
View File

@ -114,9 +114,14 @@ public class PlannedStructure {
for(IrisJigsawPieceConnector j : i.getAvailableConnectors()) for(IrisJigsawPieceConnector j : i.getAvailableConnectors())
{ {
if(j.getSpawnEntity() != null) if(j.getSpawnEntity() != null && h != -1)
{ {
IrisPosition p = i.getWorldPosition(j).add(new IrisPosition(j.getDirection().toVector().multiply(2))); IrisPosition p = null;
if (j.getEntityPosition() == null){
p = new IrisPosition(j.getDirection().toVector().multiply(2));
} else {
p = i.getWorldPosition(j).add(j.getEntityPosition());
}
if(options.getMode().equals(ObjectPlaceMode.PAINT) || options.isVacuum()) if(options.getMode().equals(ObjectPlaceMode.PAINT) || options.isVacuum())
{ {