#2609 Travel anchor GUI opening on client, also fix creative tab listing

This commit is contained in:
tterrag1098 committed 2015-07-01 18:00:39 -04:00
1 parent 50877189a2
commit 12e8d6c191
5 files changed
+14 -9

No files matched your search

+5 -2
View File
@@ -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 {
+5 -3
View File
@@ -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,)
@@ -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<? extends TileEntityEio> teClass) {
super(name, teClass);
setCreativeTab(EnderIOTab.tabEnderIO);
}
protected BlockEio(String name, Class<? extends TileEntityEio> teClass, Material mat) {
super(name, teClass, mat);
setCreativeTab(EnderIOTab.tabEnderIO);
}
@Override
@@ -65,7 +65,6 @@ public abstract class AbstractMachineBlock<T extends AbstractMachineEntity> exte
modObject = mo;
setHardness(2.0F);
setStepSound(soundTypeMetal);
setCreativeTab(EnderIOTab.tabEnderIO);
setHarvestLevel("pickaxe", 0);
random = new Random();
}
@@ -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")));