EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Renames the blox populator and block populator thread as I finally understand what they actually do

Browse Source
This commit is contained in:
Kristian Knarvik
2021-09-11 15:33:45 +02:00
parent 87735e4935
commit 1c3dbbe81d
6 changed files with 159 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/net/knarcraft/stargate/portal/Portal.java
View File

@ -1,7 +1,7 @@
package net.knarcraft.stargate.portal;
import net.knarcraft.stargate.BlockLocation;
import net.knarcraft.stargate.BloxPopulator;
import net.knarcraft.stargate.BlockChangeRequest;
import net.knarcraft.stargate.RelativeBlockVector;
import net.knarcraft.stargate.Stargate;
import net.knarcraft.stargate.event.StargateActivateEvent;
@ -49,7 +49,8 @@ public class Portal {
private final int modX;
private final int modZ;
private final float yaw;
private final Axis rot;
//The rotation axis is the axis along which the gate is placed. It's the cross axis of the button's axis
private final Axis rotationAxis;
// Block references
private final BlockLocation id;
@ -102,7 +103,7 @@ public class Portal {
this.modX = modX;
this.modZ = modZ;
this.yaw = yaw;
this.rot = yaw == 0.0F || yaw == 180.0F ? Axis.X : Axis.Z;
this.rotationAxis = yaw == 0.0F || yaw == 180.0F ? Axis.X : Axis.Z;
this.id = id;
this.destination = destination;
this.button = button;
@ -232,18 +233,6 @@ public class Portal {
return yaw;
}
/**
* Gets the axis the portal follows
*
* <p>If a relative vector's right is not zero, it will move along this axis.
* The axis is used to place the portal's open blocks correctly</p>
*
* @return <p>The axis the portal follows</p>
*/
public Axis getAxis() {
return rot;
}
/**
* Gets the player currently using this portal
*
@ -502,9 +491,9 @@ public class Portal {
//Change the opening blocks to the correct type
Material openType = gate.getPortalOpenBlock();
Axis axis = (openType.createBlockData() instanceof Orientable) ? rot : null;
Axis axis = (openType.createBlockData() instanceof Orientable) ? rotationAxis : null;
for (BlockLocation inside : getEntrances()) {
Stargate.blockPopulatorQueue.add(new BloxPopulator(inside, openType, axis));
Stargate.blockChangeRequestQueue.add(new BlockChangeRequest(inside, openType, axis));
}
updatePortalOpenState(openFor);
@ -556,7 +545,7 @@ public class Portal {
// Close this gate, then the dest gate.
Material closedType = gate.getPortalClosedBlock();
for (BlockLocation inside : getEntrances()) {
Stargate.blockPopulatorQueue.add(new BloxPopulator(inside, closedType, null));
Stargate.blockChangeRequestQueue.add(new BlockChangeRequest(inside, closedType, null));
}
updatePortalClosedState();