Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
Some Tweaks to the Clicks Block Events
Browse files Browse the repository at this point in the history 
Might or might not solve ziceptor's issue, but Sponge seems to have improved some stuff a bit so I updated our code.
  • Loading branch information
@Xenmai
Xenmai committed Jan 27, 2018
1 parent 9f771ec commit 5d66800
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 24 deletions.
27 changes: 13 additions & 14 deletions ...java/com/denizenscript/denizen2sponge/events/player/PlayerLeftClicksBlockScriptEvent.java
View file
Expand Up @@ -8,19 +8,21 @@
import com.denizenscript.denizen2sponge.tags.objects.LocationTag;
import com.denizenscript.denizen2sponge.tags.objects.PlayerTag;
import com.denizenscript.denizen2sponge.utilities.Utilities;
import com.flowpowered.math.vector.Vector3d;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.data.type.HandTypes;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.block.InteractBlockEvent;
import org.spongepowered.api.event.filter.cause.Root;
import org.spongepowered.api.item.ItemTypes;
import org.spongepowered.api.item.inventory.ItemStack;
import org.spongepowered.api.util.blockray.BlockRay;
import org.spongepowered.api.util.blockray.BlockRayHit;
import org.spongepowered.api.world.Location;
import org.spongepowered.api.world.World;

import java.util.HashMap;
import java.util.Optional;

public class PlayerLeftClicksBlockScriptEvent extends ScriptEvent {

Expand Down Expand Up @@ -110,23 +112,20 @@ public void onLeftClickBlock(InteractBlockEvent.Primary evt, @Root Player player
PlayerLeftClicksBlockScriptEvent event = (PlayerLeftClicksBlockScriptEvent) clone();
event.internal = evt;
event.player = new PlayerTag(player);
if (evt.getTargetBlock().getLocation().isPresent()) {
event.location = new LocationTag(evt.getTargetBlock().getLocation().get());
BlockRayHit<World> brh = BlockRay.from(player).stopFilter(BlockRay.continueAfterFilter(BlockRay.onlyAirFilter(), 1)).end().get();
event.precise_location = new LocationTag(brh.getPosition());
event.precise_location.getInternal().world = event.location.getInternal().world;
event.intersection_point = new LocationTag(brh.getPosition().sub(brh.getBlockPosition().toDouble()));
// event.precise_location = new LocationTag(evt.getInteractionPoint().get().add(evt.getTargetBlock().getPosition().toDouble()));
// event.precise_location.getInternal().world = event.location.getInternal().world;
// event.intersection_point = new LocationTag(evt.getInteractionPoint().get());
// TODO: Switch back to these ^ once Sponge fixes the Interaction Point.
World world = player.getWorld();
Optional<Location<World>> opt = evt.getTargetBlock().getLocation();
if (opt.isPresent()) {
event.location = new LocationTag(opt.get());
Vector3d point = evt.getInteractionPoint().get();
event.precise_location = new LocationTag(point, world);
event.intersection_point = new LocationTag(point.sub(opt.get().getPosition()));
event.impact_normal = new LocationTag(evt.getTargetSide().asOffset());
}
else {
BlockRayHit<World> brh = BlockRay.from(player).distanceLimit(Utilities.getHandReach(player)).build().end().get();
BlockRayHit<World> brh = BlockRay.from(player)
.distanceLimit(Utilities.getHandReach(player)).build().end().get();
event.location = new LocationTag(brh.getLocation());
event.precise_location = new LocationTag(brh.getPosition());
event.precise_location.getInternal().world = event.location.getInternal().world;
event.precise_location = new LocationTag(brh.getPosition(), world);
event.intersection_point = new LocationTag(brh.getPosition().sub(brh.getBlockPosition().toDouble()));
event.impact_normal = new LocationTag(0, 0, 0);
}
Expand Down
23 changes: 13 additions & 10 deletions ...ava/com/denizenscript/denizen2sponge/events/player/PlayerRightClicksBlockScriptEvent.java
View file
Expand Up @@ -3,26 +3,27 @@
import com.denizenscript.denizen2core.events.ScriptEvent;
import com.denizenscript.denizen2core.tags.AbstractTagObject;
import com.denizenscript.denizen2core.tags.objects.TextTag;
import com.denizenscript.denizen2core.utilities.CoreUtilities;
import com.denizenscript.denizen2sponge.Denizen2Sponge;
import com.denizenscript.denizen2sponge.events.D2SpongeEventHelper;
import com.denizenscript.denizen2sponge.tags.objects.ItemTag;
import com.denizenscript.denizen2sponge.tags.objects.LocationTag;
import com.denizenscript.denizen2sponge.tags.objects.PlayerTag;
import com.denizenscript.denizen2sponge.utilities.Utilities;
import com.flowpowered.math.vector.Vector3d;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.data.type.HandType;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.block.InteractBlockEvent;
import org.spongepowered.api.event.filter.cause.Root;
import org.spongepowered.api.item.ItemTypes;
import org.spongepowered.api.item.inventory.ItemStack;
import org.spongepowered.api.util.blockray.BlockRay;
import org.spongepowered.api.util.blockray.BlockRayHit;
import org.spongepowered.api.world.Location;
import org.spongepowered.api.world.World;

import java.util.HashMap;
import java.util.Optional;

public class PlayerRightClicksBlockScriptEvent extends ScriptEvent {

Expand Down Expand Up @@ -120,18 +121,20 @@ public void onRightClickBlock(InteractBlockEvent.Secondary evt, @Root Player pla
PlayerRightClicksBlockScriptEvent event = (PlayerRightClicksBlockScriptEvent) clone();
event.internal = evt;
event.player = new PlayerTag(player);
if (evt.getTargetBlock().getLocation().isPresent()) {
event.location = new LocationTag(evt.getTargetBlock().getLocation().get());
event.precise_location = new LocationTag(evt.getInteractionPoint().get().add(evt.getTargetBlock().getPosition().toDouble()));
event.precise_location.getInternal().world = event.location.getInternal().world;
event.intersection_point = new LocationTag(evt.getInteractionPoint().get());
World world = player.getWorld();
Optional<Location<World>> opt = evt.getTargetBlock().getLocation();
if (opt.isPresent()) {
event.location = new LocationTag(opt.get());
Vector3d point = evt.getInteractionPoint().get();
event.precise_location = new LocationTag(point, world);
event.intersection_point = new LocationTag(point.sub(opt.get().getPosition()));
event.impact_normal = new LocationTag(evt.getTargetSide().asOffset());
}
else {
BlockRayHit<World> brh = BlockRay.from(player).distanceLimit(Utilities.getHandReach(player)).build().end().get();
BlockRayHit<World> brh = BlockRay.from(player)
.distanceLimit(Utilities.getHandReach(player)).build().end().get();
event.location = new LocationTag(brh.getLocation());
event.precise_location = new LocationTag(brh.getPosition());
event.precise_location.getInternal().world = event.location.getInternal().world;
event.precise_location = new LocationTag(brh.getPosition(), world);
event.intersection_point = new LocationTag(brh.getPosition().sub(brh.getBlockPosition().toDouble()));
event.impact_normal = new LocationTag(0, 0, 0);
}
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/denizenscript/denizen2sponge/tags/objects/LocationTag.java
View file
Expand Up @@ -64,6 +64,10 @@ public LocationTag(Vector3i location, World world) {
this(location.getX(), location.getY(), location.getZ(), world);
}

public LocationTag(Vector3d location, World world) {
this(location.getX(), location.getY(), location.getZ(), world);
}

public LocationTag(Vector3d location) {
this(location.getX(), location.getY(), location.getZ());
}
Expand Down

0 comments on commit 5d66800

Please sign in to comment.