tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Updated Calclavia Core

Browse source
This commit is contained in:
Calclavia 2014-01-10 19:11:31 +08:00
parent 662acb7c23
commit b78d5d1c8e
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/resonantinduction/electrical/armbot/TileEntityArmbot.java
View file

@ -29,7 +29,7 @@ import calclavia.lib.multiblock.link.IMultiBlock;
import calclavia.lib.network.PacketHandler;
import calclavia.lib.utility.HelperMethods;
import calclavia.lib.utility.LanguageUtility;
import calclavia.lib.utility.MathHelper;
import calclavia.lib.utility.MathUtility;
import com.builtbroken.common.Pair;
import com.google.common.io.ByteArrayDataInput;
@ -120,7 +120,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
public void updateRotation()
{
// Clamp target angles
this.targetYaw = (int) MathHelper.clampAngleTo360(this.targetYaw);
this.targetYaw = (int) MathUtility.clampAngleTo360(this.targetYaw);
if (this.targetPitch < 0)
this.targetPitch = 0;
if (this.targetPitch > 60)
@ -179,7 +179,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
this.playRotationSound();
}
// Clamp actual angles angles
this.actualYaw = (int) MathHelper.clampAngleTo360(this.actualYaw);
this.actualYaw = (int) MathUtility.clampAngleTo360(this.actualYaw);
if (this.actualPitch < 0)
this.actualPitch = 0;
if (this.actualPitch > 60)

2
src/main/java/resonantinduction/electrical/armbot/command/TaskGive.java
View file

@ -63,7 +63,7 @@ public class TaskGive extends TaskBaseArmbot
if (targetTile != null && ((IArmbot) this.program.getMachine()).getHeldObject() instanceof ItemStack)
{
ForgeDirection direction = MathHelper.getFacingDirectionFromAngle((float) ((IArmbot) this.program.getMachine()).getRotation().x);
ForgeDirection direction = MathUtility.getFacingDirectionFromAngle((float) ((IArmbot) this.program.getMachine()).getRotation().x);
ItemStack itemStack = (ItemStack) ((IArmbot) this.program.getMachine()).getHeldObject();
List<ItemStack> stacks = new ArrayList<ItemStack>();
if (this.stack != null)

4
src/main/java/resonantinduction/electrical/armbot/command/TaskRotateBy.java
View file

@ -41,8 +41,8 @@ public class TaskRotateBy extends TaskBaseArmbot
{
if (super.onMethodCalled() == ProcessReturn.CONTINUE)
{
this.targetRotationYaw = (int) MathHelper.clampAngleTo360((float) (((IArmbot) this.program.getMachine()).getRotation().x + UnitHelper.tryToParseInt(this.getArg("yaw"))));
this.targetRotationPitch = (int) MathHelper.clampAngleTo360((float) (((IArmbot) this.program.getMachine()).getRotation().x + UnitHelper.tryToParseInt(this.getArg("pitch"))));
this.targetRotationYaw = (int) MathUtility.clampAngleTo360((float) (((IArmbot) this.program.getMachine()).getRotation().x + UnitHelper.tryToParseInt(this.getArg("yaw"))));
this.targetRotationPitch = (int) MathUtility.clampAngleTo360((float) (((IArmbot) this.program.getMachine()).getRotation().x + UnitHelper.tryToParseInt(this.getArg("pitch"))));
return ProcessReturn.CONTINUE;
}
return ProcessReturn.GENERAL_ERROR;

4
src/main/java/resonantinduction/electrical/armbot/command/TaskRotateTo.java
View file

@ -43,8 +43,8 @@ public class TaskRotateTo extends TaskBaseArmbot
{
if (super.onMethodCalled() == ProcessReturn.CONTINUE)
{
this.targetRotationYaw = (int) MathHelper.clampAngleTo360(UnitHelper.tryToParseInt(this.getArg("yaw")));
this.targetRotationPitch = (int) MathHelper.clampAngleTo360(UnitHelper.tryToParseInt(this.getArg("pitch")));
this.targetRotationYaw = (int) MathUtility.clampAngleTo360(UnitHelper.tryToParseInt(this.getArg("yaw")));
this.targetRotationPitch = (int) MathUtility.clampAngleTo360(UnitHelper.tryToParseInt(this.getArg("pitch")));
return ProcessReturn.CONTINUE;
}
return ProcessReturn.GENERAL_ERROR;

2
src/main/java/resonantinduction/electrical/armbot/command/TaskTake.java
View file

@ -61,7 +61,7 @@ public class TaskTake extends TaskBaseArmbot
if (targetTile != null && ((IArmbot) this.program.getMachine()).getHeldObject() instanceof ItemStack)
{
ForgeDirection direction = MathHelper.getFacingDirectionFromAngle(((IArmbot) this.program.getMachine()).getRotation().x);
ForgeDirection direction = MathUtility.getFacingDirectionFromAngle(((IArmbot) this.program.getMachine()).getRotation().x);
List<ItemStack> stacks = new ArrayList<ItemStack>();
if (this.stack != null)
{