Infinite staff (#83)

* fix readme

* added a creative staff of travelling

* spotless

* add back tooltip

* adress reviews

README.md

@@ -8,11 +8,11 @@ Issues can be reported to the [GTNH tracker](https://github.com/GTNewHorizons/GT
 All code (excluding the bundled APIs from other mods, which are covered by their respective licenses) were released without restriction into the public domain under the CC0 1.0 license (http://creativecommons.org/publicdomain/zero/1.0/legalcode) FAQ (https://wiki.creativecommons.org/CC0_FAQ).
 Do what you want with it, as long as you smile while doing so.
 
-###GTNH Modifications:
+### GTNH Modifications:
 
 LGPL v3.0 or later. Feel free to use our changes, just give back any changes you make to the community as well!
 
-###Sound Credits
+### Sound Credits
 
 Most sound attributed under Creative Commons Attribution 3.0 Unported (CC BY 3.0)
 

src/main/java/crazypants/enderio/EnderIO.java

@@ -150,6 +150,7 @@ import crazypants.enderio.material.endergy.ItemAlloyEndergy;
 import crazypants.enderio.material.endergy.ItemGrindingBallEndergy;
 import crazypants.enderio.network.PacketHandler;
 import crazypants.enderio.rail.BlockEnderRail;
+import crazypants.enderio.teleport.ItemInfiniteTravelStaff;
 import crazypants.enderio.teleport.ItemTravelStaff;
 import crazypants.enderio.teleport.TeleportRecipes;
 import crazypants.enderio.teleport.TravelController;
@@ -228,6 +229,7 @@ public class EnderIO {
     public static BlockTelePad blockTelePad;
     public static ItemCoordSelector itemCoordSelector;
     public static ItemTravelStaff itemTravelStaff;
+    public static ItemInfiniteTravelStaff itemInfiniteTravelStaff;
 
     // Painter
     public static BlockPainter blockPainter;
@@ -479,6 +481,7 @@ public class EnderIO {
         itemYetaWench = ItemYetaWrench.create();
         itemEnderface = ItemEnderface.create();
         itemTravelStaff = ItemTravelStaff.create();
+        itemInfiniteTravelStaff = ItemInfiniteTravelStaff.create();
         itemConduitProbe = ItemConduitProbe.create();
 
         itemXpTransfer = ItemXpTransfer.create();

src/main/java/crazypants/enderio/ModObject.java

@@ -120,7 +120,9 @@ public enum ModObject {
 
     blockEnderRail,
 
-    itemEnderFood;
+    itemEnderFood,
+
+    itemInfiniteTravelStaff;
 
     public final String unlocalisedName;
 

src/main/java/crazypants/enderio/api/teleport/TravelSource.java

@@ -1,5 +1,7 @@
 package crazypants.enderio.api.teleport;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import crazypants.enderio.EnderIO;
 import crazypants.enderio.config.Config;
 import crazypants.enderio.teleport.TravelController;
@@ -41,6 +43,7 @@ public enum TravelSource {
         return STAFF.getMaxDistanceTravelledSq();
     }
 
+    @SideOnly(Side.CLIENT)
     public static int getMaxDistanceSq() {
         EntityPlayer player = Minecraft.getMinecraft().thePlayer;
 

src/main/java/crazypants/enderio/conduit/render/ConduitBundleRenderer.java

@@ -71,8 +71,7 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
 
                         RenderUtil.bindBlockTexture();
 
-                        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-                        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+                        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
                         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
                         GL11.glEnable(GL11.GL_BLEND);
                         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -94,7 +93,6 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
             GL11.glShadeModel(GL11.GL_FLAT);
             GL11.glPopMatrix();
             GL11.glPopAttrib();
-            GL11.glPopAttrib();
         }
     }
 

src/main/java/crazypants/enderio/machine/capbank/GuiCapBank.java

@@ -282,11 +282,9 @@ public class GuiCapBank extends GuiContainerBaseEIO {
     @SuppressWarnings("rawtypes")
     @Override
     public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
         super.drawHoveringText(par1List, par2 + 24, par3, font);
         GL11.glPopAttrib();
-        GL11.glPopAttrib();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/hypercube/GuiHyperCube.java

@@ -405,11 +405,9 @@ public class GuiHyperCube extends GuiContainerBaseEIO {
 
     @Override
     public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
         super.drawHoveringText(par1List, par2, par3, font);
         GL11.glPopAttrib();
-        GL11.glPopAttrib();
     }
 
     @Override

src/main/java/crazypants/enderio/machine/power/GuiCapacitorBank.java

@@ -295,11 +295,9 @@ public class GuiCapacitorBank extends GuiContainerBaseEIO {
 
     @Override
     public void drawHoveringText(List par1List, int par2, int par3, FontRenderer font) {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
         super.drawHoveringText(par1List, par2 + 24, par3, font);
         GL11.glPopAttrib();
-        GL11.glPopAttrib();
     }
 
     @Override

src/main/java/crazypants/enderio/nei/NEIEnderIOConfig.java

@@ -52,6 +52,7 @@ public class NEIEnderIOConfig implements IConfigureNEI {
         }
         if (!Config.travelAnchorEnabled) {
             API.hideItem(new ItemStack(EnderIO.itemTravelStaff));
+            API.hideItem(new ItemStack(EnderIO.itemInfiniteTravelStaff));
         }
         if (!Config.reinforcedObsidianEnabled) {
             API.hideItem(new ItemStack(EnderIO.blockReinforcedObsidian));

src/main/java/crazypants/enderio/teleport/ItemInfiniteTravelStaff.java

@@ -0,0 +1,89 @@
+package crazypants.enderio.teleport;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.EnderIO;
+import crazypants.enderio.ModObject;
+import crazypants.enderio.machine.power.PowerDisplayUtil;
+import java.util.List;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public class ItemInfiniteTravelStaff extends ItemTravelStaff {
+
+    protected ItemInfiniteTravelStaff() {
+        super();
+        setUnlocalizedName(ModObject.itemInfiniteTravelStaff.name());
+    }
+
+    public static ItemInfiniteTravelStaff create() {
+        ItemInfiniteTravelStaff result = new ItemInfiniteTravelStaff();
+        result.init();
+        return result;
+    }
+
+    public static boolean isEquipped(EntityPlayer ep) {
+        if (ep == null || ep.getCurrentEquippedItem() == null) {
+            return false;
+        }
+        return ep.getCurrentEquippedItem().getItem() == EnderIO.itemInfiniteTravelStaff;
+    }
+
+    @Override
+    protected void init() {
+        GameRegistry.registerItem(this, ModObject.itemInfiniteTravelStaff.unlocalisedName);
+    }
+
+    @Override
+    public void onCreated(ItemStack itemStack, World world, EntityPlayer entityPlayer) {
+        setFull(itemStack);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister IIconRegister) {
+        itemIcon = IIconRegister.registerIcon("enderio:itemInfiniteTravelStaff");
+    }
+
+    @Override
+    public void extractInternal(ItemStack item, int powerUse) {
+        return;
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) {
+        ItemStack is = new ItemStack(this);
+        setFull(is);
+        par3List.add(is);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void addInformation(ItemStack itemStack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
+        super.addInformation(itemStack, par2EntityPlayer, list, par4);
+        String str = "Infinite " + PowerDisplayUtil.abrevation();
+        list.set(list.size() - 1, str); // Changing charge indicator to infinite RF
+    }
+
+    @Override
+    public String getUnlocalizedNameForTooltip(ItemStack stack) {
+        return getUnlocalizedName();
+    }
+
+    @Override
+    public boolean isActive(EntityPlayer ep, ItemStack equipped) {
+        return isEquipped(ep);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public boolean isFull3D() {
+        return true;
+    }
+}

src/main/java/crazypants/enderio/teleport/anchor/TravelEntitySpecialRenderer.java

@@ -80,8 +80,7 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
         Minecraft.getMinecraft().entityRenderer.disableLightmap(0);
 
         RenderUtil.bindBlockTexture();
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_LIGHTING_BIT);
 
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
 
@@ -115,7 +114,6 @@ public class TravelEntitySpecialRenderer extends TileEntitySpecialRenderer {
 
         renderLabel(tileentity, x, y, z, ta, sf);
 
-        GL11.glPopAttrib();
         GL11.glPopAttrib();
 
         Minecraft.getMinecraft().entityRenderer.enableLightmap(0);

src/main/java/crazypants/util/IFacade.java

@@ -2,8 +2,12 @@ package crazypants.util;
 
 import cofh.api.block.IBlockAppearance;
 import cpw.mods.fml.common.Optional;
+import net.minecraft.block.Block;
+import net.minecraft.world.IBlockAccess;
 
 @Optional.Interface(modid = "chisel", iface = "com.cricketcraft.chisel.api.IFacade")
 public interface IFacade extends com.cricketcraft.chisel.api.IFacade, IBlockAppearance {
-    // :(
+    Block getFacade(IBlockAccess world, int x, int y, int z, int side);
+
+    int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side);
 }

src/main/resources/assets/enderio/lang/en_US.lang

@@ -726,6 +726,12 @@ item.itemTravelStaff.tooltip.detailed.line4=Shift-R-Click will teleport the
 item.itemTravelStaff.tooltip.detailed.line5=player a short distance
 enderio.itemTravelStaff.notEnoughPower=Not enough power
 
+item.itemInfiniteTravelStaff.name=Creative Staff of Traveling
+item.itemInfiniteTravelStaff.tooltip.detailed.line1=When held Travel Anchors and EnderIO
+item.itemInfiniteTravelStaff.tooltip.detailed.line2=blocks become visible and can be
+item.itemInfiniteTravelStaff.tooltip.detailed.line3=activated by R-Click
+item.itemInfiniteTravelStaff.tooltip.detailed.line4=Shift-R-Click will teleport the
+item.itemInfiniteTravelStaff.tooltip.detailed.line5=player a short distance
 item.itemCoordSelector.name=Coordinate Selector
 item.itemCoordSelector.tooltip.detailed.line1=Stores coordinates of a block.
 item.itemCoordSelector.tooltip.detailed.line2=Right click at block to select