Cleanups, made remote item tooltips localized

Joe12o · Aug 2, 2014 · 259abc3 · 259abc3
1 parent 416be1e
commit 259abc3
Show file tree

Hide file tree

Showing 21 changed files with 86 additions and 96 deletions.
diff --git a/src/main/java/com/sk89q/forge/AbstractBehavior.java b/src/main/java/com/sk89q/forge/AbstractBehavior.java
@@ -1,13 +1,12 @@
 package com.sk89q.forge;
 
-import java.io.DataInputStream;
+import io.netty.buffer.ByteBufInputStream;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import io.netty.buffer.ByteBufInputStream;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 
 /**

diff --git a/src/main/java/com/sk89q/forge/Behavior.java b/src/main/java/com/sk89q/forge/Behavior.java
@@ -1,12 +1,11 @@
 package com.sk89q.forge;
 
-import java.io.DataInputStream;
+import io.netty.buffer.ByteBufInputStream;
+
 import java.io.EOFException;
 import java.io.IOException;
 
-import io.netty.buffer.ByteBufInputStream;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 
 /**

diff --git a/src/main/java/com/sk89q/forge/BehaviorList.java b/src/main/java/com/sk89q/forge/BehaviorList.java
@@ -1,15 +1,14 @@
 package com.sk89q.forge;
 
-import java.io.DataInputStream;
+import io.netty.buffer.ByteBufInputStream;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import io.netty.buffer.ByteBufInputStream;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 
 /**

diff --git a/src/main/java/com/sk89q/forge/BehaviorListener.java b/src/main/java/com/sk89q/forge/BehaviorListener.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 
 /**

diff --git a/src/main/java/com/sk89q/forge/BehaviorPayload.java b/src/main/java/com/sk89q/forge/BehaviorPayload.java
@@ -3,8 +3,6 @@
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.ByteBufOutputStream;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**

diff --git a/src/main/java/com/sk89q/forge/Payload.java b/src/main/java/com/sk89q/forge/Payload.java
@@ -3,8 +3,6 @@
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.ByteBufOutputStream;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
 
 /**

diff --git a/src/main/java/com/sk89q/forge/PayloadReceiver.java b/src/main/java/com/sk89q/forge/PayloadReceiver.java
@@ -1,11 +1,10 @@
 package com.sk89q.forge;
 
-import java.io.DataInputStream;
+import io.netty.buffer.ByteBufInputStream;
+
 import java.io.IOException;
 
-import io.netty.buffer.ByteBufInputStream;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 
 /**
  * Indicates an object that will receive a payload targeted for it.

diff --git a/src/main/java/com/sk89q/forge/TileEntityPayload.java b/src/main/java/com/sk89q/forge/TileEntityPayload.java
@@ -1,10 +1,11 @@
 package com.sk89q.forge;
 
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+
 import java.io.IOException;
 
 import com.skcraft.playblock.projector.TileEntityProjector;
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.buffer.ByteBufOutputStream;
 
 /**
  * A payload that is targeted specifically to a tile entity.

diff --git a/src/main/java/com/skcraft/playblock/PacketHandler.java b/src/main/java/com/skcraft/playblock/PacketHandler.java
@@ -1,17 +1,13 @@
 package com.skcraft.playblock;
 
-import java.io.*;
-import java.util.List;
-
-import com.skcraft.playblock.projector.TileEntityProjector;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.network.ByteBufUtils;
-import cpw.mods.fml.common.network.FMLNetworkEvent;
-import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufInputStream;
 import io.netty.buffer.ByteBufOutputStream;
 import io.netty.buffer.Unpooled;
+
+import java.io.IOException;
+import java.util.List;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -20,11 +16,17 @@
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
+import org.apache.logging.log4j.Level;
+
 import com.sk89q.forge.PayloadReceiver;
 import com.sk89q.forge.TileEntityPayload;
 import com.skcraft.playblock.network.PlayBlockPayload;
+import com.skcraft.playblock.projector.TileEntityProjector;
 
-import org.apache.logging.log4j.Level;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.network.ByteBufUtils;
+import cpw.mods.fml.common.network.FMLNetworkEvent;
+import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 
 /**
  * Handles packets for PlayBlock.
@@ -44,15 +46,14 @@ public void onReceiveClient(FMLNetworkEvent.ClientCustomPacketEvent evt) {
 
             // Figure out what we are containing
             switch (container.getType()) {
-                case TILE_ENTITY:
-                    handleTilePayload(world, entityPlayer, in);
-                    break;
-                case TILE_ENTITY_NBT:
-                    handleNetworkedNBT(world, evt.packet.payload());
+            case TILE_ENTITY:
+                handleTilePayload(world, entityPlayer, in);
+                break;
+            case TILE_ENTITY_NBT:
+                handleNetworkedNBT(world, evt.packet.payload());
             }
         } catch (IOException e) {
-            PlayBlock.log(Level.WARN, "Failed to read packet data from " +
-                    entityPlayer.getDisplayName(), e);
+            PlayBlock.log(Level.WARN, "Failed to read packet data from " + entityPlayer.getDisplayName(), e);
         }
     }
 
@@ -78,15 +79,14 @@ public void onReceiveServer(FMLNetworkEvent.ServerCustomPacketEvent evt) {
 
             // Figure out what we are containing
             switch (container.getType()) {
-                case TILE_ENTITY:
-                    handleTilePayload(world, entityPlayer, in);
-                    break;
-                case TILE_ENTITY_NBT:
-                    handleNetworkedNBT(world, evt.packet.payload());
+            case TILE_ENTITY:
+                handleTilePayload(world, entityPlayer, in);
+                break;
+            case TILE_ENTITY_NBT:
+                handleNetworkedNBT(world, evt.packet.payload());
             }
         } catch (IOException e) {
-            PlayBlock.log(Level.WARN, "Failed to read packet data from " +
-                    entityPlayer.getDisplayName(), e);
+            PlayBlock.log(Level.WARN, "Failed to read packet data from " + entityPlayer.getDisplayName(), e);
         }
     }
 
@@ -108,9 +108,7 @@ public void handleTilePayload(World world, EntityPlayer player, ByteBufInputStre
                 ((PayloadReceiver) tile).readPayload(player, in);
             }
         } else {
-            PlayBlock.log(Level.WARN,
-                    "Got update packet for non-existent chunk/block from " +
-                            player.getDisplayName());
+            PlayBlock.log(Level.WARN, "Got update packet for non-existent chunk/block from " + player.getDisplayName());
         }
     }
 
@@ -120,23 +118,23 @@ public void handleNetworkedNBT(World world, ByteBuf bytes) {
         int y = tag.getInteger("y");
         int z = tag.getInteger("z");
 
-        if(world.blockExists(x, y, z)) {
+        if (world.blockExists(x, y, z)) {
             TileEntity tile = world.getTileEntity(x, y, z);
 
-            if(tile instanceof TileEntityProjector) {
+            if (tile instanceof TileEntityProjector) {
                 TileEntityProjector projector = (TileEntityProjector) tile;
                 projector.getBehaviors().readNetworkedNBT(tag);
             }
         } else {
-            PlayBlock.log(Level.WARN,
-                    "Got update packet for non-existent chunk/block!");
+            PlayBlock.log(Level.WARN, "Got update packet for non-existent chunk/block!");
         }
     }
 
     /**
      * Send a payload to the server.
-     *
-     * @param payload the payload
+     * 
+     * @param payload
+     *            the payload
      */
     public static void sendToServer(PlayBlockPayload payload) {
         ByteBufOutputStream out = new ByteBufOutputStream(Unpooled.buffer());
@@ -170,8 +168,8 @@ public static void sendToClient(PlayBlockPayload payload, List<EntityPlayer> pla
             SharedRuntime.networkWrapper.sendToAll(packet);
         } else {
             for (EntityPlayer player : players) {
-                if(player instanceof EntityPlayerMP) {
-                    SharedRuntime.networkWrapper.sendTo(packet, (EntityPlayerMP)player);
+                if (player instanceof EntityPlayerMP) {
+                    SharedRuntime.networkWrapper.sendTo(packet, (EntityPlayerMP) player);
                 }
             }
         }

diff --git a/src/main/java/com/skcraft/playblock/SharedRuntime.java b/src/main/java/com/skcraft/playblock/SharedRuntime.java
@@ -1,6 +1,5 @@
 package com.skcraft.playblock;
 
-import cpw.mods.fml.common.network.FMLEventChannel;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
@@ -19,6 +18,7 @@
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
+import cpw.mods.fml.common.network.FMLEventChannel;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
 

diff --git a/src/main/java/com/skcraft/playblock/network/Enqueue.java b/src/main/java/com/skcraft/playblock/network/Enqueue.java
@@ -1,13 +1,12 @@
 package com.skcraft.playblock.network;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+
 import java.io.IOException;
 
 import com.sk89q.forge.Payload;
 import com.sk89q.forge.RequestResponse;
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.buffer.ByteBufOutputStream;
 
 /**
  * A client -> server request to add a media clip to a queue.

diff --git a/src/main/java/com/skcraft/playblock/network/EnqueueResponse.java b/src/main/java/com/skcraft/playblock/network/EnqueueResponse.java
@@ -1,15 +1,14 @@
 package com.skcraft.playblock.network;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+
 import java.io.IOException;
 
 import com.sk89q.forge.Payload;
 import com.sk89q.forge.RequestResponse;
 import com.skcraft.playblock.media.Media;
 import com.skcraft.playblock.util.IOUtils;
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.buffer.ByteBufOutputStream;
 
 /**
  * A server -> client response to an {@link Enqueue}.

diff --git a/src/main/java/com/skcraft/playblock/network/PlayBlockPayload.java b/src/main/java/com/skcraft/playblock/network/PlayBlockPayload.java
@@ -1,17 +1,17 @@
 package com.skcraft.playblock.network;
 
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+
 import java.io.IOException;
 
 import com.sk89q.forge.Payload;
 import com.sk89q.forge.TileEntityPayload;
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.buffer.ByteBufOutputStream;
 
 public class PlayBlockPayload implements Payload {
 
     public enum Type {
-        TILE_ENTITY,
-        TILE_ENTITY_NBT
+        TILE_ENTITY, TILE_ENTITY_NBT
     }
 
     private Type type;

diff --git a/src/main/java/com/skcraft/playblock/network/ProjectorUpdate.java b/src/main/java/com/skcraft/playblock/network/ProjectorUpdate.java
@@ -1,12 +1,11 @@
 package com.skcraft.playblock.network;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
+import io.netty.buffer.ByteBufInputStream;
+import io.netty.buffer.ByteBufOutputStream;
+
 import java.io.IOException;
 
 import com.sk89q.forge.Payload;
-import io.netty.buffer.ByteBufInputStream;
-import io.netty.buffer.ByteBufOutputStream;
 
 public class ProjectorUpdate implements Payload {
 

diff --git a/src/main/java/com/skcraft/playblock/projector/BlockProjector.java b/src/main/java/com/skcraft/playblock/projector/BlockProjector.java
@@ -52,7 +52,7 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p
         // Show the GUI if it's the client
         player.openGui(PlayBlock.instance, GuiHandler.PROJECTOR, world, x, y, z);
 
-        if(!world.isRemote) {
+        if (!world.isRemote) {
             projector.getAccessList().allow(player);
         }
 

diff --git a/src/main/java/com/skcraft/playblock/projector/ItemRemote.java b/src/main/java/com/skcraft/playblock/projector/ItemRemote.java
@@ -13,6 +13,7 @@
 import com.skcraft.playblock.PlayBlock;
 import com.skcraft.playblock.PlayBlockCreativeTab;
 import com.skcraft.playblock.queue.ExposedQueue;
+import com.skcraft.playblock.util.StringUtils;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -82,9 +83,9 @@ public void addInformation(ItemStack item, EntityPlayer player, List items, bool
             int y = item.getTagCompound().getInteger("y");
             int z = item.getTagCompound().getInteger("z");
 
-            items.add("Linked to " + x + ", " + y + ", " + z);
+            items.add(StringUtils.translate("remote.linkedTo") + " " + x + ", " + y + ", " + z);
         } else {
-            items.add("Right click a projector to link.");
+            items.add(StringUtils.translate("remote.instruction"));
         }
     }
 

diff --git a/src/main/java/com/skcraft/playblock/projector/ProjectorOptions.java b/src/main/java/com/skcraft/playblock/projector/ProjectorOptions.java
@@ -1,11 +1,10 @@
 package com.skcraft.playblock.projector;
 
-import java.io.DataInputStream;
+import io.netty.buffer.ByteBufInputStream;
+
 import java.io.IOException;
 
-import io.netty.buffer.ByteBufInputStream;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatComponentText;