From ce0ec1dc54060db0da20cd79e62579fd2724be53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Fri, 22 May 2015 20:08:29 +0200
Subject: [PATCH] Made boots not consume energy when in creative mode.

---
 .../li/cil/oc/common/event/HoverBootsHandler.scala   | 12 +++++++-----
 src/main/scala/li/cil/oc/common/item/Manual.scala    |  3 +--
 .../scala/li/cil/oc/common/item/RemoteControl.scala  | 11 -----------
 3 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/scala/li/cil/oc/common/item/RemoteControl.scala

diff --git a/src/main/scala/li/cil/oc/common/event/HoverBootsHandler.scala b/src/main/scala/li/cil/oc/common/event/HoverBootsHandler.scala
index ebc32ec63..0b2ddf1a4 100644
--- a/src/main/scala/li/cil/oc/common/event/HoverBootsHandler.scala
+++ b/src/main/scala/li/cil/oc/common/event/HoverBootsHandler.scala
@@ -17,7 +17,7 @@ object HoverBootsHandler {
       val hadHoverBoots = nbt.getBoolean(Settings.namespace + "hasHoverBoots")
       val hasHoverBoots = !player.isSneaking && equippedArmor(player).exists(stack => stack.getItem match {
         case boots: HoverBoots =>
-          if (player.onGround && player.worldObj.getTotalWorldTime % 20 == 0) {
+          if (player.onGround && !player.capabilities.isCreativeMode && player.worldObj.getTotalWorldTime % 20 == 0) {
             val velocity = player.motionX * player.motionX + player.motionY * player.motionY + player.motionZ * player.motionZ
             if (velocity > 0.015f) {
               boots.charge(stack, -Settings.get.hoverBootMove, simulate = false)
@@ -43,8 +43,9 @@ object HoverBootsHandler {
         case stack if stack.getItem.isInstanceOf[HoverBoots] =>
           val boots = stack.getItem.asInstanceOf[HoverBoots]
           val hoverJumpCost = -Settings.get.hoverBootJump
-          if (boots.charge(stack, hoverJumpCost, simulate = true) == 0) {
-            boots.charge(stack, hoverJumpCost, simulate = false)
+          val isCreative = player.capabilities.isCreativeMode
+          if (isCreative || boots.charge(stack, hoverJumpCost, simulate = true) == 0) {
+            if (!isCreative) boots.charge(stack, hoverJumpCost, simulate = false)
             if (player.isSprinting)
               player.addVelocity(player.motionX * 0.5, 0.4, player.motionZ * 0.5)
             else
@@ -61,8 +62,9 @@ object HoverBootsHandler {
         case stack if stack.getItem.isInstanceOf[HoverBoots] =>
           val boots = stack.getItem.asInstanceOf[HoverBoots]
           val hoverFallCost = -Settings.get.hoverBootAbsorb
-          if (boots.charge(stack, hoverFallCost, simulate = true) == 0) {
-            boots.charge(stack, hoverFallCost, simulate = false)
+          val isCreative = player.capabilities.isCreativeMode
+          if (isCreative || boots.charge(stack, hoverFallCost, simulate = true) == 0) {
+            if (!isCreative) boots.charge(stack, hoverFallCost, simulate = false)
             e.distance *= 0.3f
           }
       }
diff --git a/src/main/scala/li/cil/oc/common/item/Manual.scala b/src/main/scala/li/cil/oc/common/item/Manual.scala
index b1fc84d9c..e73e012f9 100644
--- a/src/main/scala/li/cil/oc/common/item/Manual.scala
+++ b/src/main/scala/li/cil/oc/common/item/Manual.scala
@@ -6,14 +6,13 @@ import cpw.mods.fml.relauncher.Side
 import cpw.mods.fml.relauncher.SideOnly
 import li.cil.oc.OpenComputers
 import li.cil.oc.api
-import li.cil.oc.common.item.traits.Delegate
 import li.cil.oc.util.BlockPosition
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.item.ItemStack
 import net.minecraft.util.EnumChatFormatting
 import net.minecraft.world.World
 
-class Manual(val parent: Delegator) extends Delegate {
+class Manual(val parent: Delegator) extends traits.Delegate {
   @SideOnly(Side.CLIENT)
   override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean): Unit = {
     tooltip.add(EnumChatFormatting.DARK_GRAY.toString + "v" + OpenComputers.Version)
diff --git a/src/main/scala/li/cil/oc/common/item/RemoteControl.scala b/src/main/scala/li/cil/oc/common/item/RemoteControl.scala
deleted file mode 100644
index 91170436c..000000000
--- a/src/main/scala/li/cil/oc/common/item/RemoteControl.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-package li.cil.oc.common.item
-
-import li.cil.oc.util.BlockPosition
-import net.minecraft.entity.player.EntityPlayer
-import net.minecraft.item.ItemStack
-
-class RemoteControl(val parent: Delegator) extends traits.Delegate {
-  override def onItemUse(stack: ItemStack, player: EntityPlayer, position: BlockPosition, side: Int, hitX: Float, hitY: Float, hitZ: Float): Boolean = {
-    super.onItemUse(stack, player, position, side, hitX, hitY, hitZ)
-  }
-}