Fix warnings in Forge codebase.

MinecraftForge · Jan 18, 2014 · baf95e7 · baf95e7
1 parent eeeb4d3
commit baf95e7
Show file tree

Hide file tree

Showing 84 changed files with 94 additions and 246 deletions.
diff --git a/src/main/java/ibxm/Channel.java b/src/main/java/ibxm/Channel.java
@@ -1,6 +1,7 @@
 
 package ibxm;
 
+@SuppressWarnings("unused")
 public class Channel {
 	public int pattern_loop_row;
 
@@ -10,7 +11,7 @@ public class Channel {
 	private int[] global_volume, current_note;
 	private boolean linear_periods, fast_volume_slides, key_on, silent;
 	private int sample_idx, sample_frac, step, left_gain, right_gain;
-	private int volume, panning, fine_tune, period, porta_period, key_add;
+    private int volume, panning, fine_tune, period, porta_period, key_add;
 	private int tremolo_speed, tremolo_depth, tremolo_tick, tremolo_wave, tremolo_add;
 	private int vibrato_speed, vibrato_depth, vibrato_tick, vibrato_wave, vibrato_add;
 	private int volume_slide_param, portamento_param, retrig_param;

diff --git a/src/main/java/ibxm/Envelope.java b/src/main/java/ibxm/Envelope.java
@@ -10,7 +10,8 @@ public Envelope() {
 		set_num_points( 1 );
 	}
 
-	public void set_num_points( int num_points ) {
+	@SuppressWarnings("unused")
+    public void set_num_points( int num_points ) {
 		int point;
 		if( num_points <= 0 ) {
 			num_points = 1;

diff --git a/src/main/java/ibxm/FastTracker2.java b/src/main/java/ibxm/FastTracker2.java
@@ -69,7 +69,8 @@ public static Module load_xm( byte[] header_60_bytes, DataInput data_input ) thr
 		return module;
 	}
 
-	private static Pattern read_xm_pattern( DataInput data_input, int num_channels ) throws IOException {
+	@SuppressWarnings("unused")
+    private static Pattern read_xm_pattern( DataInput data_input, int num_channels ) throws IOException {
 		int pattern_header_length, packing_type, num_rows, pattern_data_length;
 		byte[] structure_header, pattern_header, pattern_data;
 		Pattern pattern;

diff --git a/src/main/java/ibxm/IBXM.java b/src/main/java/ibxm/IBXM.java
@@ -85,7 +85,8 @@ public void set_sequence_index( int sequence_index, int row ) {
 		clear_vol_ramp_buffer();
 	}
 
-	public void seek( int sample_position ) {
+	@SuppressWarnings("unused")
+    public void seek( int sample_position ) {
 		int idx;
 		set_sequence_index( 0, 0 );
 		next_tick();

diff --git a/src/main/java/ibxm/Player.java b/src/main/java/ibxm/Player.java
@@ -104,7 +104,8 @@ public void stop() {
 	}
 
 	private class Driver implements Runnable {
-		public void run() {
+		@Override
+        public void run() {
 			if( running ) return;
 			try {
 				output_line.open();

diff --git a/src/main/java/ibxm/ScreamTracker3.java b/src/main/java/ibxm/ScreamTracker3.java
@@ -57,7 +57,8 @@ public static boolean is_s3m( byte[] header_96_bytes ) {
 		return s3m_identifier.equals( "SCRM" );
 	}
 
-	public static Module load_s3m( byte[] header_96_bytes, DataInput data_input ) throws IOException {
+	@SuppressWarnings("unused")
+    public static Module load_s3m( byte[] header_96_bytes, DataInput data_input ) throws IOException {
 		int num_pattern_orders, num_instruments, num_patterns, num_channels;
 		int flags, tracker_version, master_volume, panning, channel_config, sequence_length;
 		int instrument_idx, pattern_idx, channel_idx, order_idx, panning_offset;

diff --git a/src/main/java/net/minecraftforge/client/ClientCommandHandler.java b/src/main/java/net/minecraftforge/client/ClientCommandHandler.java
@@ -113,6 +113,7 @@ public void autoComplete(String leftOfCursor, String full)
             Minecraft mc = FMLClientHandler.instance().getClient();
             if (mc.currentScreen instanceof GuiChat)
             {
+                @SuppressWarnings("unchecked")
                 List<String> commands = getPossibleCommands(mc.thePlayer, leftOfCursor);
                 if (commands != null && !commands.isEmpty())
                 {

diff --git a/src/main/java/net/minecraftforge/client/EnumHelperClient.java b/src/main/java/net/minecraftforge/client/EnumHelperClient.java
@@ -8,7 +8,7 @@
 
 public class EnumHelperClient extends EnumHelper
 {
-
+    @SuppressWarnings("rawtypes")
     private static Class[][] clentTypes =
     {
         {GameType.class, int.class, String.class},

diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java
@@ -1,15 +1,6 @@
 package net.minecraftforge.client;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Random;
-import java.util.TreeSet;
-
 import javax.imageio.ImageIO;
 
 import net.minecraftforge.client.event.MouseEvent;
@@ -24,32 +15,20 @@
 import org.lwjgl.opengl.GL12;
 import org.lwjgl.opengl.PixelFormat;
 
-import com.google.common.io.ByteStreams;
-import com.google.gson.Gson;
-import com.google.gson.JsonParseException;
-
 import cpw.mods.fml.client.FMLClientHandler;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.versioning.ArtifactVersion;
-import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
 import net.minecraft.client.Minecraft;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockLiquid;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.client.model.ModelBiped;
@@ -69,15 +48,13 @@
 import net.minecraftforge.common.ForgeVersion;
 import net.minecraftforge.common.ForgeVersion.Status;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.RenderBlockFluid;
 import static net.minecraftforge.client.IItemRenderer.ItemRenderType.*;
 import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.*;
 import static net.minecraftforge.common.ForgeVersion.Status.*;
 
 public class ForgeHooksClient
 {
-    private static final ResourceLocation ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");
+    //private static final ResourceLocation ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");
 
     static TextureManager engine()
     {

diff --git a/src/main/java/net/minecraftforge/client/GuiIngameForge.java b/src/main/java/net/minecraftforge/client/GuiIngameForge.java
@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
@@ -17,7 +16,6 @@
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -36,7 +34,6 @@
 import net.minecraft.util.FoodStats;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
 import net.minecraft.util.StringUtils;
 import net.minecraft.world.EnumSkyBlock;
 import net.minecraft.world.chunk.Chunk;
@@ -52,9 +49,9 @@
 
 public class GuiIngameForge extends GuiIngame
 {
-    private static final ResourceLocation VIGNETTE     = new ResourceLocation("textures/misc/vignette.png");
+    //private static final ResourceLocation VIGNETTE     = new ResourceLocation("textures/misc/vignette.png");
     private static final ResourceLocation WIDGITS      = new ResourceLocation("textures/gui/widgets.png");
-    private static final ResourceLocation PUMPKIN_BLUR = new ResourceLocation("textures/misc/pumpkinblur.png");
+    //private static final ResourceLocation PUMPKIN_BLUR = new ResourceLocation("textures/misc/pumpkinblur.png");
 
     private static final int WHITE = 0xFFFFFF;
 
@@ -378,7 +375,7 @@ public void renderHealth(int width, int height)
 
         for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i)
         {
-            int b0 = (highlight ? 1 : 0);
+            //int b0 = (highlight ? 1 : 0);
             int row = MathHelper.ceiling_float_int((float)(i + 1) / 10.0F) - 1;
             int x = left + i % 10 * 8;
             int y = top - row * rowHeight;
@@ -758,6 +755,7 @@ protected void renderChat(int width, int height)
         mc.mcProfiler.endSection();
     }
 
+    @SuppressWarnings("unchecked")
     protected void renderPlayerList(int width, int height)
     {
         ScoreObjective scoreobjective = this.mc.theWorld.getScoreboard().func_96539_a(0);
@@ -767,7 +765,7 @@ protected void renderPlayerList(int width, int height)
         {
             if (pre(PLAYER_LIST)) return;
             this.mc.mcProfiler.startSection("playerList");
-            List players = handler.field_147303_b;
+            List<GuiPlayerInfo> players = (List<GuiPlayerInfo>)handler.field_147303_b;
             int maxPlayers = handler.field_147304_c;
             int rows = maxPlayers;
             int columns = 1;

diff --git a/src/main/java/net/minecraftforge/client/IItemRenderer.java b/src/main/java/net/minecraftforge/client/IItemRenderer.java
@@ -1,9 +1,6 @@
 package net.minecraftforge.client;
 
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.EntityLiving;
 import net.minecraft.item.ItemStack;
-import net.minecraft.client.renderer.RenderBlocks;
 
 public interface IItemRenderer
 {

diff --git a/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java b/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java
@@ -8,18 +8,11 @@
 import java.util.BitSet;
 import java.util.IdentityHashMap;
 
-import org.lwjgl.opengl.Display;
-
 import com.google.common.collect.Maps;
 
-import net.minecraft.block.Block;
-import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.world.World;
 import net.minecraftforge.client.IItemRenderer.ItemRenderType;
-import net.minecraftforge.common.MinecraftForge;
 
 public class MinecraftForgeClient
 {

diff --git a/src/main/java/net/minecraftforge/client/event/FOVUpdateEvent.java b/src/main/java/net/minecraftforge/client/event/FOVUpdateEvent.java
@@ -2,7 +2,6 @@
 
 import cpw.mods.fml.common.eventhandler.Event;
 import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.renderer.EntityRenderer;
 
 /**
  * Author: MachineMuse (Claire Semple)

diff --git a/src/main/java/net/minecraftforge/client/event/sound/SoundEvent.java b/src/main/java/net/minecraftforge/client/event/sound/SoundEvent.java
@@ -1,9 +1,6 @@
 package net.minecraftforge.client.event.sound;
 
-import cpw.mods.fml.common.eventhandler.Cancelable;
 import cpw.mods.fml.common.eventhandler.Event;
-import net.minecraft.entity.Entity;
-import net.minecraft.client.audio.SoundManager;
 import net.minecraft.client.audio.SoundPoolEntry;
 import net.minecraftforge.common.MinecraftForge;
 

diff --git a/src/main/java/net/minecraftforge/client/model/AdvancedModelLoader.java b/src/main/java/net/minecraftforge/client/model/AdvancedModelLoader.java
@@ -1,6 +1,5 @@
 package net.minecraftforge.client.model;
 
-import java.net.URL;
 import java.util.Collection;
 import java.util.Map;
 

diff --git a/src/main/java/net/minecraftforge/client/model/IModelCustomLoader.java b/src/main/java/net/minecraftforge/client/model/IModelCustomLoader.java
@@ -1,8 +1,5 @@
 package net.minecraftforge.client.model;
 
-import java.io.InputStream;
-import java.net.URL;
-
 import net.minecraft.util.ResourceLocation;
 
 /**

diff --git a/src/main/java/net/minecraftforge/client/model/ModelFormatException.java b/src/main/java/net/minecraftforge/client/model/ModelFormatException.java
@@ -8,6 +8,8 @@
  */
 public class ModelFormatException extends RuntimeException {
 
+    private static final long serialVersionUID = 2023547503969671835L;
+
     public ModelFormatException()
     {
         super();

diff --git a/src/main/java/net/minecraftforge/client/model/obj/ObjModelLoader.java b/src/main/java/net/minecraftforge/client/model/obj/ObjModelLoader.java
@@ -1,8 +1,5 @@
 package net.minecraftforge.client.model.obj;
 
-import java.io.InputStream;
-import java.net.URL;
-
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModelCustom;
 import net.minecraftforge.client.model.IModelCustomLoader;

diff --git a/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java b/src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -249,6 +248,7 @@ public void tessellatePart(Tessellator tessellator, String partName) {
         }
     }
 
+    @Override
     public void renderAllExcept(String... excludedGroupNames)
     {
         for (GroupObject groupObject : groupObjects)

diff --git a/src/main/java/net/minecraftforge/client/model/techne/TechneModel.java b/src/main/java/net/minecraftforge/client/model/techne/TechneModel.java
@@ -1,28 +1,21 @@
 package net.minecraftforge.client.model.techne;
 
-import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 
-import javax.imageio.ImageIO;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.lwjgl.opengl.GL11;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -39,11 +32,11 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModelCustom;
 import net.minecraftforge.client.model.ModelFormatException;
-import net.minecraftforge.client.model.obj.GroupObject;
 
 /**
  * Techne model importer, based on iChun's Hats importer
  */
+@SuppressWarnings("unused")
 @SideOnly(Side.CLIENT)
 public class TechneModel extends ModelBase implements IModelCustom {
     public static final List<String> cubeTypes = Arrays.asList(

diff --git a/src/main/java/net/minecraftforge/client/model/techne/TechneModelLoader.java b/src/main/java/net/minecraftforge/client/model/techne/TechneModelLoader.java
@@ -1,9 +1,5 @@
 package net.minecraftforge.client.model.techne;
 
-import java.net.URL;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModelCustom;
 import net.minecraftforge.client.model.IModelCustomLoader;

diff --git a/src/main/java/net/minecraftforge/common/BiomeDictionary.java b/src/main/java/net/minecraftforge/common/BiomeDictionary.java
@@ -31,6 +31,7 @@ public enum Type
 
     private static final int BIOME_LIST_SIZE = 256;
     private static BiomeInfo[] biomeList = new BiomeInfo[BIOME_LIST_SIZE];
+    @SuppressWarnings("unchecked")
     private static ArrayList<BiomeGenBase>[] typeInfoList = new ArrayList[Type.values().length];
 
     private static class BiomeInfo