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

Iris fixes

Browse Source
This commit is contained in:
Daniel Mills 2021-01-09 02:01:43 -05:00
parent 2b8d5541af
commit 8a4208ab18
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/object/IrisDirection.java
View File

@ -224,7 +224,7 @@ public enum IrisDirection
break; break;
} }
return null; return EAST_POSITIVE_X;
} }
public int x() public int x()

15
src/main/java/com/volmit/iris/object/IrisPosition.java
View File

@ -6,7 +6,10 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.util.BlockVector; import org.bukkit.util.BlockVector;
import org.bukkit.util.Vector;
@Accessors(chain = true) @Accessors(chain = true)
@NoArgsConstructor @NoArgsConstructor
@ -31,6 +34,14 @@ public class IrisPosition
this(bv.getBlockX(), bv.getBlockY(), bv.getBlockZ()); this(bv.getBlockX(), bv.getBlockY(), bv.getBlockZ());
} }
public IrisPosition(Location l) {
this(l.getBlockX(), l.getBlockY(), l.getBlockZ());
}
public IrisPosition(Vector v) {
this(v.getBlockX(), v.getBlockY(), v.getBlockZ());
}
public IrisPosition add(IrisPosition relativePosition) { public IrisPosition add(IrisPosition relativePosition) {
return new IrisPosition(relativePosition.x+x, relativePosition.y+y, relativePosition.z + z); return new IrisPosition(relativePosition.x+x, relativePosition.y+y, relativePosition.z + z);
} }
@ -38,4 +49,8 @@ public class IrisPosition
public IrisPosition sub(IrisPosition relativePosition) { public IrisPosition sub(IrisPosition relativePosition) {
return new IrisPosition(x-relativePosition.x, y-relativePosition.y, z-relativePosition.z); return new IrisPosition(x-relativePosition.x, y-relativePosition.y, z-relativePosition.z);
} }
public Location toLocation(World world) {
return new Location(world, x,y,z);
}
} }

2
src/main/java/com/volmit/iris/object/TileResult.java
View File

@ -19,7 +19,7 @@ public class TileResult
this.tile = tile; this.tile = tile;
IrisObjectPlacement p = new IrisObjectPlacement(); IrisObjectPlacement p = new IrisObjectPlacement();
IrisObjectRotation rt = new IrisObjectRotation(); IrisObjectRotation rt = new IrisObjectRotation();
rt.setYAxis(new IrisAxisRotationClamp(rot != 0, rot, rot, 0)); rt.setYAxis(new IrisAxisRotationClamp(rot != 0, false, rot, rot, 0));
p.setRotation(rt); p.setRotation(rt);
p.setBottom(true); p.setBottom(true);
p.setBore(structure.isBore()); p.setBore(structure.isBore());