From 1f2060242094c795c631c36cee36eb92f956bbf5 Mon Sep 17 00:00:00 2001 From: Katrina Swales Date: Tue, 10 Feb 2015 13:51:31 +0100 Subject: [PATCH 1/4] Fixed UUID showing up in denied message --- src/main/java/crazypants/enderio/enderface/BlockEnderIO.java | 3 ++- .../enderio/machine/transceiver/ClientChannelRegister.java | 4 ---- .../java/crazypants/enderio/teleport/BlockTravelAnchor.java | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index 6efb8968..9a032049 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -23,6 +23,7 @@ import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.ITravelAccessable; import crazypants.util.Lang; +import net.minecraftforge.common.UsernameCache; public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { @@ -95,7 +96,7 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); } else { if(world.isRemote && !entityPlayer.isSneaking()) { - entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + ta.getPlacedBy() + " " + entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + UsernameCache.getLastKnownUsername(ta.getPlacedBy()) + " " + Lang.localize("gui.travelAccessable.privateBlock2"))); } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java index 81f328d1..7a91f809 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ClientChannelRegister.java @@ -1,12 +1,8 @@ package crazypants.enderio.machine.transceiver; import crazypants.enderio.EnderIO; -import crazypants.enderio.Log; import crazypants.util.PlayerUtil; -import java.util.UUID; - - public class ClientChannelRegister extends ChannelRegister { public static final ChannelRegister instance = new ClientChannelRegister(); diff --git a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java index 95bc2559..be105320 100644 --- a/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/BlockTravelAnchor.java @@ -38,6 +38,7 @@ import crazypants.enderio.teleport.packet.PacketOpenAuthGui; import crazypants.enderio.teleport.packet.PacketTravelEvent; import crazypants.util.IFacade; import crazypants.util.Lang; +import net.minecraftforge.common.UsernameCache; public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEntityProvider, IResourceTooltipProvider, IFacade { @@ -126,7 +127,7 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); } else { if(world.isRemote && !entityPlayer.isSneaking()) { - entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + ta.getPlacedBy() + " " + entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + UsernameCache.getLastKnownUsername(ta.getPlacedBy()) + " " + Lang.localize("gui.travelAccessable.privateBlock2"))); } } From c439269cc5121f00f99f0bf10dc82bcf6c3af2f2 Mon Sep 17 00:00:00 2001 From: HenryLoenwind Date: Tue, 10 Feb 2015 19:46:12 +0100 Subject: [PATCH 2/4] Fix for SideOnly-Error in DarkSteelAxe Fixes #1893 --- .../crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index bfb104ef..3ea18744 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -175,7 +175,10 @@ public class ItemDarkSteelAxe extends ItemAxe implements IEnergyContainerItem, I @Override public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, float par8, float par9, float par10) { - return ItemDarkSteelPickaxe.doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); + if (world.isRemote) { + return ItemDarkSteelPickaxe.doRightClickItemPlace(player, world, x, y, z, side, par8, par9, par10); + } + return false; } private void applyDamage(EntityLivingBase entity, ItemStack stack, int damage, boolean isMultiharvest) { From 1631aa4c20afa848a8d75ae3f5e42f306a693486 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Tue, 10 Feb 2015 21:21:09 +0100 Subject: [PATCH 3/4] #1843 another isRemote check --- .../enderio/conduit/AbstractItemConduit.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index e17af5ac..4346e7c7 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -87,13 +87,13 @@ public abstract class AbstractItemConduit extends Item implements IConduitItem { System.out.println("AbstractItemConduit.onItemUse: Bundle null"); return false; } - IConduit con = createConduit(stack, player); - if(con == null) { - System.out.println("AbstractItemConduit.onItemUse: Conduit null."); - return false; - } - if(bundle.getConduit(con.getBaseConduitType()) == null) { + if(!bundle.hasType(getBaseConduitType())) { if(!world.isRemote) { + IConduit con = createConduit(stack, player); + if(con == null) { + System.out.println("AbstractItemConduit.onItemUse: Conduit null."); + return false; + } bundle.addConduit(con); if(!player.capabilities.isCreativeMode) { stack.stackSize--; From e894d6760de58dc5b451ca974040f82245365270 Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Thu, 12 Feb 2015 00:36:35 +0100 Subject: [PATCH 4/4] ignore NBT size limits for parsing packet data --- src/main/java/crazypants/enderio/network/NetworkUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/crazypants/enderio/network/NetworkUtil.java b/src/main/java/crazypants/enderio/network/NetworkUtil.java index 202b7512..7e153a5c 100644 --- a/src/main/java/crazypants/enderio/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/network/NetworkUtil.java @@ -22,8 +22,7 @@ public class NetworkUtil { } else { byte[] buffer = new byte[size]; dataIn.readBytes(buffer); - // TODO I have no idea what I'm doing (byte = 8 bits = buffer.length * 8 ???) - return CompressedStreamTools.func_152457_a(buffer, new NBTSizeTracker(buffer.length * 8)); + return CompressedStreamTools.func_152457_a(buffer, NBTSizeTracker.field_152451_a); } } catch (IOException e) { FMLCommonHandler.instance().raiseException(e, "Custom Packet", true);