mirror of
https://github.com/GTNewHorizons/bdlib.git
synced 2026-11-22 05:02:33 +00:00
Moved block rotation from player camera logic into a separate object
This commit is contained in:
1 parent
3dd917b2a0
commit
530d5add82
2 files changed
+33
-15
No files matched your search
@@ -69,21 +69,7 @@ trait BaseRotatableBlock extends Block {
|
||||
override def getValidRotations(worldObj: World, x: Int, y: Int, z: Int): Array[ForgeDirection] = getValidFacings.toArray(Array.empty[ForgeDirection])
|
||||
|
||||
override def onBlockPlacedBy(world: World, x: Int, y: Int, z: Int, ent: EntityLivingBase, stack: ItemStack) {
|
||||
val validRotations = getValidFacings
|
||||
var dir = getDefaultFacing
|
||||
if (ent != null) {
|
||||
val pitch: Int = Math.round(ent.rotationPitch)
|
||||
val yaw: Int = MathHelper.floor_double(ent.rotationYaw * 4.0F / 360.0F + 0.5D) & 3
|
||||
dir = yaw match {
|
||||
case _ if pitch >= 50 && validRotations.contains(ForgeDirection.UP) => ForgeDirection.UP
|
||||
case _ if pitch <= -50 && validRotations.contains(ForgeDirection.DOWN) => ForgeDirection.DOWN
|
||||
case 0 if validRotations.contains(ForgeDirection.NORTH) => ForgeDirection.NORTH
|
||||
case 1 if validRotations.contains(ForgeDirection.EAST) => ForgeDirection.EAST
|
||||
case 2 if validRotations.contains(ForgeDirection.SOUTH) => ForgeDirection.SOUTH
|
||||
case 3 if validRotations.contains(ForgeDirection.WEST) => ForgeDirection.WEST
|
||||
case _ => dir
|
||||
}
|
||||
}
|
||||
val dir = RotatedHelper.getFacingFromEntity(ent, getValidFacings, getDefaultFacing)
|
||||
setFacing(world, x, y, z, dir)
|
||||
super.onBlockPlacedBy(world, x, y, z, ent, stack)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
/*
|
||||
* Copyright (c) bdew, 2013 - 2015
|
||||
* https://github.com/bdew/bdlib
|
||||
*
|
||||
* This mod is distributed under the terms of the Minecraft Mod Public
|
||||
* License 1.0, or MMPL. Please check the contents of the license located in
|
||||
* http://bdew.net/minecraft-mod-public-license/
|
||||
*/
|
||||
|
||||
package net.bdew.lib.rotate
|
||||
|
||||
import java.util
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase
|
||||
import net.minecraft.util.MathHelper
|
||||
import net.minecraftforge.common.util.ForgeDirection
|
||||
|
||||
object RotatedHelper {
|
||||
def getFacingFromEntity(ent: EntityLivingBase, validRotations: util.EnumSet[ForgeDirection], default: ForgeDirection): ForgeDirection = {
|
||||
val pitch = Math.round(ent.rotationPitch)
|
||||
val yaw = MathHelper.floor_double(ent.rotationYaw * 4.0F / 360.0F + 0.5D) & 3
|
||||
yaw match {
|
||||
case _ if pitch >= 50 && validRotations.contains(ForgeDirection.UP) => ForgeDirection.UP
|
||||
case _ if pitch <= -50 && validRotations.contains(ForgeDirection.DOWN) => ForgeDirection.DOWN
|
||||
case 0 if validRotations.contains(ForgeDirection.NORTH) => ForgeDirection.NORTH
|
||||
case 1 if validRotations.contains(ForgeDirection.EAST) => ForgeDirection.EAST
|
||||
case 2 if validRotations.contains(ForgeDirection.SOUTH) => ForgeDirection.SOUTH
|
||||
case 3 if validRotations.contains(ForgeDirection.WEST) => ForgeDirection.WEST
|
||||
case _ => default
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user