fix issue regarding interaction with worksite while on a team. Closes

#84 fix a few code minor formatting areas add right-click chat output to a waterwheel generator
P3pp3rF1y · Sep 16, 2014 · d3e8117 · d3e8117
1 parent 54df696
commit d3e8117
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/...a/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueGeneratorWaterwheel.java b/...a/net/shadowmage/ancientwarfare/automation/tile/torque/TileTorqueGeneratorWaterwheel.java
@@ -6,6 +6,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChatComponentTranslation;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.shadowmage.ancientwarfare.automation.config.AWAutomationStatics;
 import net.shadowmage.ancientwarfare.core.interfaces.IInteractableTile;
@@ -135,6 +136,13 @@ public boolean canOutput(ForgeDirection towards)
 @Override
 public boolean onBlockClicked(EntityPlayer player)
   {
+  if(!player.worldObj.isRemote)
+    {
+    String key = "guistrings.automation.current_energy";
+    String value = String.format("%.2f", storedEnergy);
+    ChatComponentTranslation chat = new ChatComponentTranslation(key, new Object[]{value});
+    player.addChatComponentMessage(chat);    
+    }
   return false;
   }
 

diff --git a/src/main/java/net/shadowmage/ancientwarfare/automation/tile/worksite/TileWorksiteBase.java b/src/main/java/net/shadowmage/ancientwarfare/automation/tile/worksite/TileWorksiteBase.java
@@ -20,6 +20,7 @@
 import net.shadowmage.ancientwarfare.automation.item.ItemWorksiteUpgrade;
 import net.shadowmage.ancientwarfare.core.block.BlockRotationHandler.IRotatableTile;
 import net.shadowmage.ancientwarfare.core.config.AWCoreStatics;
+import net.shadowmage.ancientwarfare.core.config.AWLog;
 import net.shadowmage.ancientwarfare.core.interfaces.IInteractableTile;
 import net.shadowmage.ancientwarfare.core.interfaces.IOwnable;
 import net.shadowmage.ancientwarfare.core.interfaces.ITorque.ITorqueReceiver;
@@ -324,7 +325,7 @@ public final Team getTeam()
   {  
   if(owningPlayer!=null)
     {
-    worldObj.getScoreboard().getPlayersTeam(owningPlayer);
+    return worldObj.getScoreboard().getPlayersTeam(owningPlayer);
     }
   return null;
   }

diff --git a/src/main/java/net/shadowmage/ancientwarfare/automation/tile/worksite/WorkSiteAnimalFarm.java b/src/main/java/net/shadowmage/ancientwarfare/automation/tile/worksite/WorkSiteAnimalFarm.java
@@ -465,7 +465,6 @@ public boolean onBlockClicked(EntityPlayer player)
   if(!player.worldObj.isRemote)
     {
     NetworkHandler.INSTANCE.openGui(player, NetworkHandler.GUI_WORKSITE_ANIMAL_FARM, xCoord, yCoord, zCoord);
-    return true;
     }
   return true;
   }