Skip to content

Commit

Permalink
Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@NextdoorPsycho
NextdoorPsycho committed Nov 7, 2022
1 parent 8df163f commit 943dbd8
Show file tree
Hide file tree
Showing 8 changed files with 116 additions and 15 deletions.
3 changes: 2 additions & 1 deletion src/main/java/com/volmit/WormholesMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ public WormholesMod() {

@SubscribeEvent
public void onServerStarting(ServerStartingEvent event) {
LOGGER.info("""
LOGGER.info("""
██╗ ██╗ ██████╗ ██████╗ ███╗ ███╗██╗ ██╗ ██████╗ ██╗ ███████╗███████╗
██║ ██║██╔═══██╗██╔══██╗████╗ ████║██║ ██║██╔═══██╗██║ ██╔════╝██╔════╝
██║ █╗ ██║██║ ██║██████╔╝██╔████╔██║███████║██║ ██║██║ █████╗ ███████╗
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/volmit/util/PlayerUtil.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.volmit.util;

public class PlayerUtil {

}
5 changes: 0 additions & 5 deletions src/main/java/com/volmit/util/PlayerUtilities.java
View file

This file was deleted.

1 change: 0 additions & 1 deletion src/main/java/com/volmit/wormholes/FrameBlock.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.block.state.properties.DirectionProperty;
import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.minecraft.world.phys.AABB;
import qouteall.imm_ptl.core.portal.Portal;
import qouteall.imm_ptl.core.portal.PortalManipulation;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/volmit/wormholes/Framer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,7 @@ private void setIndicatorBlock(Cuboid c, Block type) {
}

private boolean isValid(Cuboid frame, String a) {
if (
Math.max(frame.getSizeX(), Math.max(frame.getSizeY(), frame.getSizeZ())) != frame.volume()
) {
if (Math.max(frame.getSizeX(), Math.max(frame.getSizeY(), frame.getSizeZ())) != frame.volume()) {
System.out.println("Invalid size on " + a + " " + frame.getSizeX() + " " + frame.getSizeY() + " " + frame.getSizeZ());
return false;
}
Expand Down
109 changes: 106 additions & 3 deletions src/main/java/com/volmit/wormholes/ItemWand.java
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,32 @@
package com.volmit.wormholes;

import com.volmit.util.SoundUtil;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.NotNull;
import qouteall.imm_ptl.core.portal.Portal;

import java.util.Arrays;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;

public class ItemWand extends Item {
Expand All @@ -29,12 +41,55 @@ public void clear(ItemStack item) {
item.removeTagKey("wormholesdir");
}

@Override
public @NotNull InteractionResultHolder<ItemStack> use(Level pLevel, Player pPlayer, InteractionHand pUsedHand) {
if (pLevel.isClientSide()) {
return super.use(pLevel, pPlayer, pUsedHand);
}
if (pPlayer.isCrouching() && getNearestEntity(pPlayer).getEntity() instanceof Portal) {
// List<Portal> portals = PortalManipulation.getPortalCluster(pLevel, pPortal.getOriginPos(), pPortal.getNormal(), p -> true);
// for (Portal portal : portals) {
// Quaternion q = new Quaternion(0, 180, 0, true);
// portal.axisW = RotationHelper.getRotated(q, portal.axisW);
// portal.axisH = RotationHelper.getRotated(q, portal.axisH);
// portal.reloadAndSyncToClient();
// }
// Bad code, but it works. The api that's exposed for the code above is broken, and does not attach to respected portals. this does the same thing but for whatever reason works.
if (pLevel.getServer() != null && pPlayer.getLevel().getServer() != null) {

System.out.println("Rotating portal: " + pPlayer.getLookAngle().get(Direction.Axis.Y));
double yaw = pPlayer.getLookAngle().get(Direction.Axis.Y) * 100;

if (yaw > 75 || yaw < -75) {
System.out.println("Rotating portal on the X axis");
pLevel.getServer().getCommands().performCommand(new CommandSourceStack(pPlayer, pPlayer.getEyePosition(), pPlayer.getRotationVector(), (ServerLevel) pPlayer.getLevel(), 4, "Wormhole", pPlayer.getDisplayName(), pPlayer.getLevel().getServer(), pPlayer), "/portal rotate_portal_rotation_along x 180");
SoundUtil.play((ServerLevel) pPlayer.getLevel(), pPlayer.position(), SoundEvents.CHEST_CLOSE, 1f, 3.25f);
} else {
System.out.println("Rotating portal on the Z axis");
pLevel.getServer().getCommands().performCommand(new CommandSourceStack(pPlayer, pPlayer.getEyePosition(), pPlayer.getRotationVector(), (ServerLevel) pPlayer.getLevel(), 4, "Wormhole", pPlayer.getDisplayName(), pPlayer.getLevel().getServer(), pPlayer), "/portal rotate_portal_rotation_along y 180");
SoundUtil.play((ServerLevel) pPlayer.getLevel(), pPlayer.position(), SoundEvents.CHEST_CLOSE, 1f, 3.25f);
}
}

}
return super.use(pLevel, pPlayer, pUsedHand);
}


@Override
public InteractionResult useOn(UseOnContext pContext) {
if (pContext.getLevel().isClientSide()) {
return super.useOn(pContext);
}

if (pContext.getPlayer() == null) {
return super.useOn(pContext);
}

if (getNearestEntity(pContext.getPlayer()).getEntity() instanceof Portal) {
return super.useOn(pContext);
}

pContext.getPlayer().getCooldowns().addCooldown(this, 5);
if (pContext.getPlayer().isCrouching()) {
pContext.getPlayer().displayClientMessage(new TextComponent("Hole Applicator Cleared."), true);
Expand All @@ -61,7 +116,7 @@ public InteractionResult useOn(UseOnContext pContext) {
if (!pContext.getPlayer().isCreative()) {
pContext.getItemInHand().setDamageValue(pContext.getItemInHand().getDamageValue() + 1);
}
SoundUtil.play((ServerLevel) pContext.getLevel(), pContext.getPlayer().position(), SoundEvents.BELL_RESONATE, 1f, 1.25f);
SoundUtil.play((ServerLevel) pContext.getLevel(), pContext.getPlayer().position(), SoundEvents.BELL_RESONATE, 1f, 0.9f);
SoundUtil.play((ServerLevel) pContext.getLevel(), pContext.getPlayer().position(), SoundEvents.BELL_RESONATE, 1f, 1.25f);
SoundUtil.play((ServerLevel) pContext.getLevel(), pContext.getPlayer().position(), SoundEvents.END_PORTAL_SPAWN, 0.25f, 0.5f);
} else {
Expand Down Expand Up @@ -98,9 +153,9 @@ public String getDimension(ItemStack stack) {
public static Direction computeDirection(BlockPos point, BlockPos toward, Cuboid cc) {
Set<Direction> allowed = new HashSet<>();

if(cc == null) {
if (cc == null) {
allowed.addAll(Arrays.stream(Direction.values()).toList());
}else if (cc.getSizeY() == 1) {
} else if (cc.getSizeY() == 1) {
allowed.add(Direction.UP);
allowed.add(Direction.DOWN);
} else if (cc.getSizeX() == 1) {
Expand Down Expand Up @@ -156,6 +211,54 @@ public void setCuboid(ItemStack stack, Cuboid c) {
});
}

@NotNull
public static EntityHitResult getNearestEntity(Player player) {
float playerRotX = player.getXRot();
float playerRotY = player.getYRot();
Vec3 startPos = player.getEyePosition();
float f2 = Mth.cos(-playerRotY * ((float) Math.PI / 180F) - (float) Math.PI);
float f3 = Mth.sin(-playerRotY * ((float) Math.PI / 180F) - (float) Math.PI);
float f4 = -Mth.cos(-playerRotX * ((float) Math.PI / 180F));
float additionY = Mth.sin(-playerRotX * ((float) Math.PI / 180F));
float additionX = f3 * f4;
float additionZ = f2 * f4;
double d0 = 15;
Vec3 endVec = startPos.add((double) additionX * d0, (double) additionY * d0, (double) additionZ * d0);
AABB startEndBox = new AABB(startPos, endVec);
Entity entity = player;
for (Entity entity1 : player.level.getEntities(player, startEndBox, (val) -> true)) {
AABB aabb = entity1.getBoundingBox().inflate(entity1.getPickRadius());
Optional<Vec3> optional = aabb.clip(startPos, endVec);
if (aabb.contains(startPos)) {
if (d0 >= 0.0D) {
entity = entity1;
startPos = optional.orElse(startPos);
d0 = 0.0D;
}
} else if (optional.isPresent()) {
Vec3 vec31 = optional.get();
double d1 = startPos.distanceToSqr(vec31);
if (d1 < d0 || d0 == 0.0D) {
if (entity1.getRootVehicle() == player.getRootVehicle() && !entity1.canRiderInteract()) {
if (d0 == 0.0D) {
entity = entity1;
startPos = vec31;
}
} else {
entity = entity1;
startPos = vec31;
d0 = d1;
}
}
}
}
if (entity == player) {
return new EntityHitResult(player);
} else {
return new EntityHitResult(entity);
}
}

public Cuboid getCuboid(ItemStack item) {
try {
int[] f = item.getTag().getIntArray("wormholesframe");
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/data/wormholes/recipes/frame_light_gray.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
},
"result": {
"item": "wormholes:frame__light_gray",
"item": "wormholes:frame_light_gray",
"count": 8
}
}
2 changes: 1 addition & 1 deletion src/main/resources/data/wormholes/recipes/frame_pink.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
},
"result": {
"item": "wormholes:frame_bpink",
"item": "wormholes:frame_pink",
"count": 8
}
}

0 comments on commit 943dbd8

Please sign in to comment.