From 12e8d6c1913324132b33d6990e4f296eb6f5d8ea Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 1 Jul 2015 18:00:39 -0400 Subject: [PATCH] #2609 Travel anchor GUI opening on client, also fix creative tab listing --- build.gradle | 7 +++++-- gradle.properties | 8 +++++--- src/main/java/crazypants/enderio/BlockEio.java | 3 ++- .../crazypants/enderio/machine/AbstractMachineBlock.java | 1 - .../enderio/teleport/anchor/BlockTravelAnchor.java | 4 ++-- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index e588fa12..7ba032f9 100644 --- a/build.gradle +++ b/build.gradle @@ -50,10 +50,13 @@ dependencies { exportedCompile 'cglib:cglib-nodep:3.1' compile "com.enderio.core:EnderCore:${minecraft_version}-${endercore_version}:dev" - compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api" compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev" - compile "net.sengir.forestry:${forestry_version}:api" + compile "net.sengir.forestry:${forestry_version}:api" + + // WAILA ships really old CCC/CCL versions, so we force the new versions + compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev" + compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev" } sourceSets { diff --git a/gradle.properties b/gradle.properties index 10f8d642..66bc89ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,10 +8,12 @@ mod_version=2.3.0 mod_appendix=beta buildcraft_version=6.1.5 -waila_version=1.5.9 +waila_version=1.5.10 +ccc_version=1.0.7.46 +ccl_version=1.1.3.138 ae2_version=rv1-stable-1 -endercore_version=0.0.1.7_alpha -forestry_version=forestry_1.7.10:3.3.0.423-unstable +endercore_version=0.0.1.10_alpha +forestry_version=forestry_1.7.10:3.6.2.19 toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,) diff --git a/src/main/java/crazypants/enderio/BlockEio.java b/src/main/java/crazypants/enderio/BlockEio.java index 83acadfd..68d54b4c 100644 --- a/src/main/java/crazypants/enderio/BlockEio.java +++ b/src/main/java/crazypants/enderio/BlockEio.java @@ -3,7 +3,6 @@ package crazypants.enderio; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -17,10 +16,12 @@ public abstract class BlockEio extends BlockEnder { protected BlockEio(String name, Class teClass) { super(name, teClass); + setCreativeTab(EnderIOTab.tabEnderIO); } protected BlockEio(String name, Class teClass, Material mat) { super(name, teClass, mat); + setCreativeTab(EnderIOTab.tabEnderIO); } @Override diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 0e6df397..0994be6e 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -65,7 +65,6 @@ public abstract class AbstractMachineBlock exte modObject = mo; setHardness(2.0F); setStepSound(soundTypeMetal); - setCreativeTab(EnderIOTab.tabEnderIO); setHarvestLevel("pickaxe", 0); random = new Random(); } diff --git a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index a37eca72..3c4375fa 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -127,7 +127,7 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt @Override public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof ITravelAccessable) { + if (!world.isRemote && te instanceof ITravelAccessable) { ITravelAccessable ta = (ITravelAccessable) te; if (ta.canUiBeAccessed(entityPlayer)) { entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); @@ -139,7 +139,7 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt } public static void sendPrivateChatMessage(EntityPlayer player, UUID owner) { - if(player.worldObj.isRemote && !player.isSneaking()) { + if(!player.isSneaking()) { player.addChatComponentMessage(new ChatComponentText(EnderIO.lang.localize("gui.travelAccessable.privateBlock1") + " " + EnumChatFormatting.RED + UsernameCache.getLastKnownUsername(owner) + EnumChatFormatting.WHITE + " " + EnderIO.lang.localize("gui.travelAccessable.privateBlock2")));