Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(JOML): migrate usages of Vector3i #44

Merged
merged 1 commit into from
Jan 16, 2021
Merged

feat(JOML): migrate usages of Vector3i #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/main/java/org/terasology/additionalRails/action/PlantAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package org.terasology.additionalRails.action;

import org.joml.Vector3i;
import org.joml.Vector3ic;
import org.terasology.additionalRails.components.PlantCartComponent;
import org.terasology.additionalRails.events.CartActivatedEvent;
import org.terasology.entitySystem.entity.EntityManager;
Expand All @@ -25,8 +27,6 @@
import org.terasology.entitySystem.systems.RegisterSystem;
import org.terasology.logic.inventory.InventoryManager;
import org.terasology.math.Direction;
import org.terasology.math.JomlUtil;
import org.terasology.math.geom.Vector3i;
import org.terasology.registry.In;
import org.terasology.segmentedpaths.components.PathFollowerComponent;
import org.terasology.simpleFarming.components.SeedDefinitionComponent;
Expand All @@ -53,14 +53,14 @@ public class PlantAction extends BaseComponentSystem {
@In
private EntityManager entityManager;

public void planting(EntityRef entity, Vector3i vector) {
public void planting(EntityRef entity, Vector3ic vector) {
for (int i = 0; i <= 30; i++) {
EntityRef myseed = inventoryManager.getItemInSlot(entity, i);
if (myseed.hasComponent(SeedDefinitionComponent.class)) {
SeedDefinitionComponent seedComponent = myseed.getComponent(SeedDefinitionComponent.class);
EntityRef seed = myseed;
EntityRef plantEntity = seedComponent.prefab == null ? seed : entityManager.create(seedComponent.prefab);
plantEntity.send(new OnSeedPlanted(JomlUtil.from(vector)));
plantEntity.send(new OnSeedPlanted(vector));
inventoryManager.removeItem(seed.getOwner(), seed, seed, true, 1);
break;

Expand All @@ -76,17 +76,17 @@ public void cartActivatedEvent(CartActivatedEvent event, EntityRef entity) {
EntityRef entityref = pfComponent.segmentMeta.association;

BlockComponent blockcomponent = entityref.getComponent(BlockComponent.class);
Vector3i location = new Vector3i(blockcomponent.getPosition());
Vector3i location = blockcomponent.getPosition(new Vector3i());

Direction direction = Direction.inDirection(JomlUtil.from(pfComponent.heading));
Vector3i leftVector = direction.toSide().yawClockwise(1).getVector3i();
Vector3i rightVector = direction.toSide().yawClockwise(3).getVector3i();
Direction direction = Direction.inDirection(pfComponent.heading);
Vector3ic leftVector = direction.toSide().yawClockwise(1).direction();
Vector3ic rightVector = direction.toSide().yawClockwise(3).direction();

Vector3i leftPosition = new Vector3i(location).add(leftVector);
Vector3i rightPosition = new Vector3i(location).add(rightVector);

Vector3i leftdownPosition = new Vector3i(leftPosition).add(Vector3i.down());
Vector3i rightdownPosition = new Vector3i(rightPosition).add(Vector3i.down());
Vector3i leftdownPosition = leftPosition.add(0, -1, 0, new Vector3i());
Vector3i rightdownPosition = rightPosition.add(0, -1, 0, new Vector3i());

Block leftdown = worldprovider.getBlock(leftdownPosition);
Block rightdown = worldprovider.getBlock(rightdownPosition);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/terasology/additionalRails/action/RailSwitchAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package org.terasology.additionalRails.action;

import org.joml.Vector3i;
import org.terasology.additionalRails.components.RailSwitchLeverComponent;
import org.terasology.additionalRails.components.RailSwitchSignalComponent;
import org.terasology.entitySystem.entity.EntityRef;
Expand All @@ -25,15 +26,14 @@
import org.terasology.entitySystem.systems.RegisterSystem;
import org.terasology.logic.common.ActivateEvent;
import org.terasology.math.SideBitFlag;
import org.terasology.minecarts.blocks.RailComponent;
import org.terasology.minecarts.blocks.RailBlockFamily;
import org.terasology.minecarts.blocks.RailComponent;
import org.terasology.registry.In;
import org.terasology.signalling.components.SignalConsumerStatusComponent;
import org.terasology.world.BlockEntityRegistry;
import org.terasology.world.WorldProvider;
import org.terasology.world.block.Block;
import org.terasology.world.block.BlockComponent;
import org.terasology.math.geom.Vector3i;
import org.terasology.world.block.BlockManager;

/**
Expand Down Expand Up @@ -80,7 +80,7 @@ public void initialise() {
*/
@ReceiveEvent(components = {BlockComponent.class, RailSwitchLeverComponent.class})
public void railSwitchLeverAction(ActivateEvent event, EntityRef entity, BlockComponent blockComponent, RailSwitchLeverComponent rslComponent) {
Vector3i blockLocation = new Vector3i(blockComponent.getPosition());
Vector3i blockLocation = blockComponent.getPosition(new Vector3i());

//switch the block from on to off, from off to on; rslComponent.isOn is set in block prefab
if (rslComponent.isOn) {
Expand All @@ -101,7 +101,7 @@ public void railSwitchLeverAction(ActivateEvent event, EntityRef entity, BlockCo
*/
@ReceiveEvent(components = {BlockComponent.class, RailSwitchSignalComponent.class, SignalConsumerStatusComponent.class})
public void railSwitchSignalAction(OnChangedComponent event, EntityRef entity, BlockComponent blockComponent, SignalConsumerStatusComponent scsComponent) {
Vector3i blockLocation = new Vector3i(blockComponent.getPosition());
Vector3i blockLocation = blockComponent.getPosition(new Vector3i());
Block block = worldProvider.getBlock(blockLocation);

//switch the block from on to off, from off to on based on signal
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/terasology/additionalRails/action/WrenchOnewayAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
*/
package org.terasology.additionalRails.action;

import org.joml.Vector3i;
import org.terasology.additionalRails.components.OnewayBoosterRailComponent;
import org.terasology.entitySystem.entity.EntityRef;
import org.terasology.entitySystem.event.ReceiveEvent;
import org.terasology.entitySystem.systems.BaseComponentSystem;
import org.terasology.entitySystem.systems.RegisterMode;
import org.terasology.entitySystem.systems.RegisterSystem;
import org.terasology.logic.common.ActivateEvent;
import org.terasology.math.geom.Vector3i;
import org.terasology.minecarts.blocks.RailBlockFamily;
import org.terasology.minecarts.components.WrenchComponent;
import org.terasology.registry.In;
Expand Down Expand Up @@ -51,7 +51,7 @@ public void onRailFlipAction(ActivateEvent event, EntityRef item) {
return;
}

Vector3i position = targetEntity.getComponent(BlockComponent.class).getPosition();
Vector3i position = targetEntity.getComponent(BlockComponent.class).getPosition(new Vector3i());

RailBlockFamily originalFamily = (RailBlockFamily) blockManager.getBlockFamily("AdditionalRails:OnewayBoosterRail");
RailBlockFamily invertedFamily = (RailBlockFamily) blockManager.getBlockFamily("AdditionalRails:OnewayBoosterRailInverted");
Expand Down