Fix multipart dependency

This commit is contained in:
aidancbrady committed 2017-04-04 20:43:02 -04:00
1 parent acde30dee3
commit 0f0136b40b
5 files changed
+151 -148

No files matched your search

@@ -8,9 +8,8 @@ import mekanism.common.MekanismBlocks;
import mekanism.common.block.property.PropertyColor;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.block.states.BlockStateGlowPanel;
import mekanism.common.integration.multipart.MultipartMekanism;
import mekanism.common.tile.TileEntityBasicBlock;
import mekanism.common.tile.TileEntityGlowPanel;
import mekanism.common.util.MultipartUtils;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
@@ -45,7 +44,7 @@ public class BlockGlowPanel extends Block implements ITileEntityProvider
for(EnumFacing side : EnumFacing.VALUES)
{
bounds[side.ordinal()] = MultipartMekanism.rotate(cuboid.offset(fromOrigin.xCoord, fromOrigin.yCoord, fromOrigin.zCoord), side).offset(-fromOrigin.xCoord, -fromOrigin.zCoord, -fromOrigin.zCoord);
bounds[side.ordinal()] = MultipartUtils.rotate(cuboid.offset(fromOrigin.xCoord, fromOrigin.yCoord, fromOrigin.zCoord), side).offset(-fromOrigin.xCoord, -fromOrigin.zCoord, -fromOrigin.zCoord);
}
}
@@ -14,8 +14,6 @@ import mekanism.common.block.property.PropertyConnection;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType.Size;
import mekanism.common.integration.multipart.MultipartMekanism;
import mekanism.common.integration.multipart.MultipartMekanism.AdvancedRayTraceResult;
import mekanism.common.tile.transmitter.TileEntityDiversionTransporter;
import mekanism.common.tile.transmitter.TileEntityLogisticalTransporter;
import mekanism.common.tile.transmitter.TileEntityMechanicalPipe;
@@ -26,6 +24,8 @@ import mekanism.common.tile.transmitter.TileEntitySidedPipe.ConnectionType;
import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor;
import mekanism.common.tile.transmitter.TileEntityUniversalCable;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MultipartUtils;
import mekanism.common.util.MultipartUtils.AdvancedRayTraceResult;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
import net.minecraft.block.material.Material;
@@ -190,7 +190,7 @@ public class BlockTransmitter extends Block implements ITileEntityProvider
}
List<AxisAlignedBB> boxes = tile.getCollisionBoxes();
AdvancedRayTraceResult result = MultipartMekanism.collisionRayTrace(pos, start, end, boxes);
AdvancedRayTraceResult result = MultipartUtils.collisionRayTrace(pos, start, end, boxes);
if(result != null)
{
@@ -3,8 +3,6 @@ package mekanism.common.integration.multipart;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1;
import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2;
import java.util.Collection;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -16,18 +14,11 @@ import mekanism.common.MekanismBlocks;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.tile.TileEntityGlowPanel;
import mekanism.common.tile.transmitter.TileEntityTransmitter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
@@ -35,8 +26,6 @@ import net.minecraftforge.event.AttachCapabilitiesEvent;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.apache.commons.lang3.tuple.Pair;
@MCMPAddon
public class MultipartMekanism implements IMCMPAddon
{
@@ -121,129 +110,4 @@ public class MultipartMekanism implements IMCMPAddon
FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.BasicBlock2, 1, 0));
FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.CardboardBox));
}
public static AxisAlignedBB rotate(AxisAlignedBB aabb, EnumFacing side)
{
Vec3d v1 = rotate(new Vec3d(aabb.minX, aabb.minY, aabb.minZ), side);
Vec3d v2 = rotate(new Vec3d(aabb.maxX, aabb.maxY, aabb.maxZ), side);
return new AxisAlignedBB(v1.xCoord, v1.yCoord, v1.zCoord, v2.xCoord, v2.yCoord, v2.zCoord);
}
public static Vec3d rotate(Vec3d vec, EnumFacing side)
{
switch(side)
{
case DOWN:
return new Vec3d(vec.xCoord, vec.yCoord, vec.zCoord);
case UP:
return new Vec3d(vec.xCoord, -vec.yCoord, -vec.zCoord);
case NORTH:
return new Vec3d(vec.xCoord, -vec.zCoord, vec.yCoord);
case SOUTH:
return new Vec3d(vec.xCoord, vec.zCoord, -vec.yCoord);
case WEST:
return new Vec3d(vec.yCoord, -vec.xCoord, vec.zCoord);
case EAST:
return new Vec3d(-vec.yCoord, vec.xCoord, vec.zCoord);
}
return null;
}
/* taken from MCMP */
public static Pair<Vec3d, Vec3d> getRayTraceVectors(EntityPlayer player)
{
float pitch = player.rotationPitch;
float yaw = player.rotationYaw;
Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
float f1 = MathHelper.cos(-yaw * 0.017453292F - (float) Math.PI);
float f2 = MathHelper.sin(-yaw * 0.017453292F - (float) Math.PI);
float f3 = -MathHelper.cos(-pitch * 0.017453292F);
float f4 = MathHelper.sin(-pitch * 0.017453292F);
float f5 = f2 * f3;
float f6 = f1 * f3;
double d3 = 5.0D;
if(player instanceof EntityPlayerMP)
{
d3 = ((EntityPlayerMP)player).interactionManager.getBlockReachDistance();
}
Vec3d end = start.addVector(f5 * d3, f4 * d3, f6 * d3);
return Pair.of(start, end);
}
public static AdvancedRayTraceResult collisionRayTrace(BlockPos pos, Vec3d start, Vec3d end, Collection<AxisAlignedBB> boxes)
{
double minDistance = Double.POSITIVE_INFINITY;
AdvancedRayTraceResult hit = null;
int i = -1;
for(AxisAlignedBB aabb : boxes)
{
AdvancedRayTraceResult result = aabb == null ? null : collisionRayTrace(pos, start, end, aabb, i, null);
if(result != null)
{
double d = result.squareDistanceTo(start);
if(d < minDistance)
{
minDistance = d;
hit = result;
}
}
i++;
}
return hit;
}
public static AdvancedRayTraceResult collisionRayTrace(BlockPos pos, Vec3d start, Vec3d end, AxisAlignedBB bounds, int subHit, Object hitInfo)
{
RayTraceResult result = bounds.offset(pos).calculateIntercept(start, end);
if(result == null)
{
return null;
}
result = new RayTraceResult(RayTraceResult.Type.BLOCK, result.hitVec, result.sideHit, pos);
result.subHit = subHit;
result.hitInfo = hitInfo;
return new AdvancedRayTraceResult(result, bounds);
}
private static class AdvancedRayTraceResultBase<T extends RayTraceResult>
{
public final AxisAlignedBB bounds;
public final T hit;
public AdvancedRayTraceResultBase(T mop, AxisAlignedBB aabb)
{
hit = mop;
bounds = aabb;
}
public boolean valid()
{
return hit != null && bounds != null;
}
public double squareDistanceTo(Vec3d vec)
{
return hit.hitVec.squareDistanceTo(vec);
}
}
public static class AdvancedRayTraceResult extends AdvancedRayTraceResultBase<RayTraceResult>
{
public AdvancedRayTraceResult(RayTraceResult mop, AxisAlignedBB bounds)
{
super(mop, bounds);
}
}
}
@@ -6,7 +6,6 @@ import java.util.ArrayList;
import java.util.List;
import mcmultipart.api.multipart.IMultipart;
import mcmultipart.api.multipart.OcclusionHelper;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.IConfigurable;
@@ -20,14 +19,13 @@ import mekanism.common.Tier.BaseTier;
import mekanism.common.base.ITileNetwork;
import mekanism.common.block.BlockTransmitter;
import mekanism.common.block.property.PropertyConnection;
import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType.Size;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.integration.multipart.MultipartMekanism;
import mekanism.common.integration.multipart.MultipartMekanism.AdvancedRayTraceResult;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MultipartUtils;
import mekanism.common.util.MultipartUtils.AdvancedRayTraceResult;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
@@ -607,8 +605,8 @@ public abstract class TileEntitySidedPipe extends TileEntity implements ITileNet
private RayTraceResult reTrace(World world, BlockPos pos, EntityPlayer player)
{
Pair<Vec3d, Vec3d> vecs = MultipartMekanism.getRayTraceVectors(player);
AdvancedRayTraceResult result = MultipartMekanism.collisionRayTrace(getPos(), vecs.getLeft(), vecs.getRight(), getCollisionBoxes());
Pair<Vec3d, Vec3d> vecs = MultipartUtils.getRayTraceVectors(player);
AdvancedRayTraceResult result = MultipartUtils.collisionRayTrace(getPos(), vecs.getLeft(), vecs.getRight(), getCollisionBoxes());
return result == null ? null : result.hit;
}
@@ -0,0 +1,142 @@
package mekanism.common.util;
import java.util.Collection;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import org.apache.commons.lang3.tuple.Pair;
public final class MultipartUtils
{
public static AxisAlignedBB rotate(AxisAlignedBB aabb, EnumFacing side)
{
Vec3d v1 = rotate(new Vec3d(aabb.minX, aabb.minY, aabb.minZ), side);
Vec3d v2 = rotate(new Vec3d(aabb.maxX, aabb.maxY, aabb.maxZ), side);
return new AxisAlignedBB(v1.xCoord, v1.yCoord, v1.zCoord, v2.xCoord, v2.yCoord, v2.zCoord);
}
public static Vec3d rotate(Vec3d vec, EnumFacing side)
{
switch(side)
{
case DOWN:
return new Vec3d(vec.xCoord, vec.yCoord, vec.zCoord);
case UP:
return new Vec3d(vec.xCoord, -vec.yCoord, -vec.zCoord);
case NORTH:
return new Vec3d(vec.xCoord, -vec.zCoord, vec.yCoord);
case SOUTH:
return new Vec3d(vec.xCoord, vec.zCoord, -vec.yCoord);
case WEST:
return new Vec3d(vec.yCoord, -vec.xCoord, vec.zCoord);
case EAST:
return new Vec3d(-vec.yCoord, vec.xCoord, vec.zCoord);
}
return null;
}
/* taken from MCMP */
public static Pair<Vec3d, Vec3d> getRayTraceVectors(EntityPlayer player)
{
float pitch = player.rotationPitch;
float yaw = player.rotationYaw;
Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
float f1 = MathHelper.cos(-yaw * 0.017453292F - (float) Math.PI);
float f2 = MathHelper.sin(-yaw * 0.017453292F - (float) Math.PI);
float f3 = -MathHelper.cos(-pitch * 0.017453292F);
float f4 = MathHelper.sin(-pitch * 0.017453292F);
float f5 = f2 * f3;
float f6 = f1 * f3;
double d3 = 5.0D;
if(player instanceof EntityPlayerMP)
{
d3 = ((EntityPlayerMP)player).interactionManager.getBlockReachDistance();
}
Vec3d end = start.addVector(f5 * d3, f4 * d3, f6 * d3);
return Pair.of(start, end);
}
public static AdvancedRayTraceResult collisionRayTrace(BlockPos pos, Vec3d start, Vec3d end, Collection<AxisAlignedBB> boxes)
{
double minDistance = Double.POSITIVE_INFINITY;
AdvancedRayTraceResult hit = null;
int i = -1;
for(AxisAlignedBB aabb : boxes)
{
AdvancedRayTraceResult result = aabb == null ? null : collisionRayTrace(pos, start, end, aabb, i, null);
if(result != null)
{
double d = result.squareDistanceTo(start);
if(d < minDistance)
{
minDistance = d;
hit = result;
}
}
i++;
}
return hit;
}
public static AdvancedRayTraceResult collisionRayTrace(BlockPos pos, Vec3d start, Vec3d end, AxisAlignedBB bounds, int subHit, Object hitInfo)
{
RayTraceResult result = bounds.offset(pos).calculateIntercept(start, end);
if(result == null)
{
return null;
}
result = new RayTraceResult(RayTraceResult.Type.BLOCK, result.hitVec, result.sideHit, pos);
result.subHit = subHit;
result.hitInfo = hitInfo;
return new AdvancedRayTraceResult(result, bounds);
}
private static class AdvancedRayTraceResultBase<T extends RayTraceResult>
{
public final AxisAlignedBB bounds;
public final T hit;
public AdvancedRayTraceResultBase(T mop, AxisAlignedBB aabb)
{
hit = mop;
bounds = aabb;
}
public boolean valid()
{
return hit != null && bounds != null;
}
public double squareDistanceTo(Vec3d vec)
{
return hit.hitVec.squareDistanceTo(vec);
}
}
public static class AdvancedRayTraceResult extends AdvancedRayTraceResultBase<RayTraceResult>
{
public AdvancedRayTraceResult(RayTraceResult mop, AxisAlignedBB bounds)
{
super(mop, bounds);
}
}
}