From baf95e747aaadffefe5dd147953035b4deb797ad Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Fri, 17 Jan 2014 21:55:48 -0800 Subject: [PATCH] Fix warnings in Forge codebase. --- src/main/java/ibxm/Channel.java | 3 +- src/main/java/ibxm/Envelope.java | 3 +- src/main/java/ibxm/FastTracker2.java | 3 +- src/main/java/ibxm/IBXM.java | 3 +- src/main/java/ibxm/Player.java | 3 +- src/main/java/ibxm/ScreamTracker3.java | 3 +- .../client/ClientCommandHandler.java | 1 + .../client/EnumHelperClient.java | 2 +- .../client/ForgeHooksClient.java | 25 +--------------- .../minecraftforge/client/GuiIngameForge.java | 12 ++++---- .../minecraftforge/client/IItemRenderer.java | 3 -- .../client/MinecraftForgeClient.java | 7 ----- .../client/event/FOVUpdateEvent.java | 1 - .../client/event/sound/SoundEvent.java | 3 -- .../client/model/AdvancedModelLoader.java | 1 - .../client/model/IModelCustomLoader.java | 3 -- .../client/model/ModelFormatException.java | 2 ++ .../client/model/obj/ObjModelLoader.java | 3 -- .../client/model/obj/WavefrontObject.java | 2 +- .../client/model/techne/TechneModel.java | 9 +----- .../model/techne/TechneModelLoader.java | 4 --- .../common/BiomeDictionary.java | 1 + .../minecraftforge/common/BiomeManager.java | 10 ++----- .../minecraftforge/common/ChestGenHooks.java | 4 +-- .../common/DimensionManager.java | 9 ------ .../minecraftforge/common/DungeonHooks.java | 8 ----- .../common/ForgeChunkManager.java | 30 +++++-------------- .../net/minecraftforge/common/ForgeHooks.java | 11 ------- .../common/ForgeInternalHandler.java | 3 -- .../common/ForgeModContainer.java | 3 -- .../minecraftforge/common/ForgeVersion.java | 3 +- .../net/minecraftforge/common/IPlantable.java | 1 - .../net/minecraftforge/common/IShearable.java | 2 -- .../minecraftforge/common/ISpecialArmor.java | 2 ++ .../minecraftforge/common/MinecraftForge.java | 14 --------- .../common/WorldSpecificSaveHandler.java | 1 + .../common/config/ConfigCategory.java | 1 + .../common/config/Configuration.java | 6 +--- .../common/config/Property.java | 2 -- .../common/network/ForgeMessage.java | 5 ---- .../common/util/EnumHelper.java | 4 ++- .../common/util/FakePlayer.java | 1 - .../common/util/FakePlayerFactory.java | 3 -- .../event/ForgeEventFactory.java | 4 +-- .../event/entity/EntityEvent.java | 1 - .../event/entity/item/ItemExpireEvent.java | 1 - .../event/entity/item/ItemTossEvent.java | 1 - .../entity/living/EnderTeleportEvent.java | 2 -- .../event/entity/living/LivingSpawnEvent.java | 1 - .../event/entity/living/ZombieEvent.java | 2 -- .../event/entity/minecart/MinecartEvent.java | 1 - .../entity/player/EntityItemPickupEvent.java | 3 -- .../event/entity/player/PlayerEvent.java | 1 - .../entity/player/PlayerFlyableFallEvent.java | 1 - .../entity/player/PlayerInteractEvent.java | 3 -- .../event/entity/player/UseHoeEvent.java | 2 -- .../event/terraingen/BiomeEvent.java | 5 ---- .../event/terraingen/ChunkProviderEvent.java | 1 - .../event/terraingen/DecorateBiomeEvent.java | 1 - .../event/terraingen/InitMapGenEvent.java | 1 - .../event/terraingen/OreGenEvent.java | 1 - .../event/terraingen/PopulateChunkEvent.java | 1 - .../event/terraingen/TerrainGen.java | 1 - .../event/world/ChunkEvent.java | 2 -- .../event/world/ChunkWatchEvent.java | 1 - .../event/world/WorldEvent.java | 5 ++-- .../minecraftforge/fluids/BlockFluidBase.java | 1 + .../fluids/BlockFluidClassic.java | 1 + .../fluids/BlockFluidFinite.java | 1 + .../fluids/FluidContainerRegistry.java | 2 +- .../fluids/FluidIdMapPacket.java | 1 + .../minecraftforge/fluids/FluidRegistry.java | 1 + .../net/minecraftforge/fluids/FluidStack.java | 1 + .../net/minecraftforge/fluids/FluidTank.java | 1 + .../fluids/ItemFluidContainer.java | 1 + .../fluids/RenderBlockFluid.java | 1 + .../fluids/TileFluidHandler.java | 1 + .../minecraftforge/oredict/OreDictionary.java | 4 +-- .../minecraftforge/oredict/RecipeSorter.java | 27 +++++++---------- .../oredict/ShapedOreRecipe.java | 1 + .../oredict/ShapelessOreRecipe.java | 11 +++---- .../server/ForgeTimeTracker.java | 2 ++ .../server/command/ForgeCommand.java | 9 ------ .../paulscode/sound/codecs/CodecIBXM.java | 12 +++++++- 84 files changed, 94 insertions(+), 246 deletions(-) diff --git a/src/main/java/ibxm/Channel.java b/src/main/java/ibxm/Channel.java index e9f735c39..65c1bd46a 100644 --- 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 index 15db481d8..35fe85af3 100644 --- a/src/main/java/ibxm/Envelope.java +++ b/src/main/java/ibxm/Envelope.java @@ -10,7 +10,8 @@ public class 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 index 80fea0fa4..f179cc627 100644 --- a/src/main/java/ibxm/FastTracker2.java +++ b/src/main/java/ibxm/FastTracker2.java @@ -69,7 +69,8 @@ public class FastTracker2 { 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 index 23c063f33..dc9fe1b0b 100644 --- a/src/main/java/ibxm/IBXM.java +++ b/src/main/java/ibxm/IBXM.java @@ -85,7 +85,8 @@ public class IBXM { 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 index 9444948aa..1b4471cc6 100644 --- a/src/main/java/ibxm/Player.java +++ b/src/main/java/ibxm/Player.java @@ -104,7 +104,8 @@ public class Player { } 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 index 94b251cd2..d6fc3241b 100644 --- a/src/main/java/ibxm/ScreamTracker3.java +++ b/src/main/java/ibxm/ScreamTracker3.java @@ -57,7 +57,8 @@ public class ScreamTracker3 { 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 index 547fc2482..6dadff99e 100644 --- a/src/main/java/net/minecraftforge/client/ClientCommandHandler.java +++ b/src/main/java/net/minecraftforge/client/ClientCommandHandler.java @@ -113,6 +113,7 @@ public class ClientCommandHandler extends CommandHandler Minecraft mc = FMLClientHandler.instance().getClient(); if (mc.currentScreen instanceof GuiChat) { + @SuppressWarnings("unchecked") List 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 index b2885b6e0..c3520e0ba 100644 --- a/src/main/java/net/minecraftforge/client/EnumHelperClient.java +++ b/src/main/java/net/minecraftforge/client/EnumHelperClient.java @@ -8,7 +8,7 @@ import net.minecraftforge.common.util.EnumHelper; 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 index 4ec67c766..8884a9183 100644 --- 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.GL11; 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.ForgeModContainer; 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 index 86de438bd..9b6e90061 100644 --- a/src/main/java/net/minecraftforge/client/GuiIngameForge.java +++ b/src/main/java/net/minecraftforge/client/GuiIngameForge.java @@ -6,7 +6,6 @@ import java.awt.Color; 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.gui.ScaledResolution; 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.EnumChatFormatting; 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 @@ import cpw.mods.fml.common.FMLCommonHandler; 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 class GuiIngameForge extends GuiIngame 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 @@ public class GuiIngameForge extends GuiIngame 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 @@ public class GuiIngameForge extends GuiIngame { if (pre(PLAYER_LIST)) return; this.mc.mcProfiler.startSection("playerList"); - List players = handler.field_147303_b; + List players = (List)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 index 833d917a9..e7cba638a 100644 --- 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 index 34bdb2ffc..3fe3905c4 100644 --- a/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java +++ b/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java @@ -8,18 +8,11 @@ package net.minecraftforge.client; 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 index 9754b2fad..80501f508 100644 --- a/src/main/java/net/minecraftforge/client/event/FOVUpdateEvent.java +++ b/src/main/java/net/minecraftforge/client/event/FOVUpdateEvent.java @@ -2,7 +2,6 @@ package net.minecraftforge.client.event; 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 index beee06e96..93493c7d5 100644 --- 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 index c6c9347d0..5eaf3c50f 100644 --- 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 index 6254ce2b4..638498c82 100644 --- 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 index c7e0ce768..08ec9971d 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelFormatException.java +++ b/src/main/java/net/minecraftforge/client/model/ModelFormatException.java @@ -8,6 +8,8 @@ package net.minecraftforge.client.model; */ 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 index 2112c60ff..db101aa05 100644 --- 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 index 1fb0566de..f6f13818c 100644 --- 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.BufferedReader; 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 class WavefrontObject implements IModelCustom } } + @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 index b84b282c8..393d7f0f6 100644 --- a/src/main/java/net/minecraftforge/client/model/techne/TechneModel.java +++ b/src/main/java/net/minecraftforge/client/model/techne/TechneModel.java @@ -1,12 +1,8 @@ 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; @@ -14,15 +10,12 @@ 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.client.resources.IResource; 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 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 index 134183a48..3b7007655 100644 --- 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 index 36f7772ad..2f4e21dd2 100644 --- a/src/main/java/net/minecraftforge/common/BiomeDictionary.java +++ b/src/main/java/net/minecraftforge/common/BiomeDictionary.java @@ -31,6 +31,7 @@ public class BiomeDictionary private static final int BIOME_LIST_SIZE = 256; private static BiomeInfo[] biomeList = new BiomeInfo[BIOME_LIST_SIZE]; + @SuppressWarnings("unchecked") private static ArrayList[] typeInfoList = new ArrayList[Type.values().length]; private static class BiomeInfo diff --git a/src/main/java/net/minecraftforge/common/BiomeManager.java b/src/main/java/net/minecraftforge/common/BiomeManager.java index 0b6ee3413..ecf30c8a5 100644 --- a/src/main/java/net/minecraftforge/common/BiomeManager.java +++ b/src/main/java/net/minecraftforge/common/BiomeManager.java @@ -1,24 +1,17 @@ package net.minecraftforge.common; import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.ChunkProviderGenerate; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.structure.MapGenStronghold; import net.minecraft.world.gen.structure.MapGenVillage; import net.minecraft.world.biome.WorldChunkManager; -import com.google.common.collect.Lists; - public class BiomeManager { public static ArrayList strongHoldBiomes = new ArrayList(); public static ArrayList strongHoldBiomesBlackList = new ArrayList(); + @SuppressWarnings("unchecked") public static void addVillageBiome(BiomeGenBase biome, boolean canSpawn) { if (!MapGenVillage.villageSpawnBiomes.contains(biome)) @@ -29,6 +22,7 @@ public class BiomeManager } } + @SuppressWarnings("unchecked") public static void removeVillageBiome(BiomeGenBase biome) { if (MapGenVillage.villageSpawnBiomes.contains(biome)) diff --git a/src/main/java/net/minecraftforge/common/ChestGenHooks.java b/src/main/java/net/minecraftforge/common/ChestGenHooks.java index 503a76242..9ce74e820 100644 --- a/src/main/java/net/minecraftforge/common/ChestGenHooks.java +++ b/src/main/java/net/minecraftforge/common/ChestGenHooks.java @@ -140,11 +140,11 @@ public class ChestGenHooks public static void removeItem(String category, ItemStack item){ getInfo(category).removeItem(item); } public static ItemStack getOneItem(String category, Random rand){ return getInfo(category).getOneItem(rand); } + @SuppressWarnings("unused") private String category; private int countMin = 0; private int countMax = 0; - //TO-DO: Privatize this once again when we remove the Deprecated stuff in DungeonHooks - ArrayList contents = new ArrayList(); + private ArrayList contents = new ArrayList(); public ChestGenHooks(String category) { diff --git a/src/main/java/net/minecraftforge/common/DimensionManager.java b/src/main/java/net/minecraftforge/common/DimensionManager.java index 116583a62..32134256f 100644 --- a/src/main/java/net/minecraftforge/common/DimensionManager.java +++ b/src/main/java/net/minecraftforge/common/DimensionManager.java @@ -4,32 +4,23 @@ import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; -import java.util.HashSet; import java.util.Hashtable; import java.util.List; import java.util.ListIterator; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import java.util.concurrent.ConcurrentMap; import org.apache.logging.log4j.Level; -import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.HashMultiset; -import com.google.common.collect.ImmutableListMultimap; -import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.MapMaker; -import com.google.common.collect.Maps; import com.google.common.collect.Multiset; -import com.google.common.collect.Sets; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; -import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.MinecraftException; import net.minecraft.world.World; import net.minecraft.world.WorldManager; diff --git a/src/main/java/net/minecraftforge/common/DungeonHooks.java b/src/main/java/net/minecraftforge/common/DungeonHooks.java index 723ffe986..211ff296b 100644 --- a/src/main/java/net/minecraftforge/common/DungeonHooks.java +++ b/src/main/java/net/minecraftforge/common/DungeonHooks.java @@ -3,15 +3,7 @@ package net.minecraftforge.common; import java.util.ArrayList; import java.util.Random; -import cpw.mods.fml.common.FMLLog; - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandom; -import net.minecraft.util.WeightedRandomChestContent; - -import static net.minecraftforge.common.ChestGenHooks.DUNGEON_CHEST; public class DungeonHooks { diff --git a/src/main/java/net/minecraftforge/common/ForgeChunkManager.java b/src/main/java/net/minecraftforge/common/ForgeChunkManager.java index 3aef2d3e3..daf9698ee 100644 --- a/src/main/java/net/minecraftforge/common/ForgeChunkManager.java +++ b/src/main/java/net/minecraftforge/common/ForgeChunkManager.java @@ -1,12 +1,8 @@ package net.minecraftforge.common; -import java.io.DataInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.util.HashSet; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -14,33 +10,23 @@ import java.util.UUID; import org.apache.logging.log4j.Level; -import com.google.common.base.Supplier; -import com.google.common.base.Suppliers; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.BiMap; -import com.google.common.collect.ForwardingSet; import com.google.common.collect.HashBiMap; import com.google.common.collect.HashMultimap; -import com.google.common.collect.HashMultiset; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; -import com.google.common.collect.ImmutableMultiset; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.ListMultimap; -import com.google.common.collect.Lists; import com.google.common.collect.MapMaker; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import com.google.common.collect.Multimaps; -import com.google.common.collect.Multiset; -import com.google.common.collect.Multisets; import com.google.common.collect.SetMultimap; import com.google.common.collect.Sets; -import com.google.common.collect.TreeMultiset; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; @@ -51,14 +37,11 @@ import net.minecraft.world.chunk.Chunk; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.MathHelper; -import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; import net.minecraft.world.WorldServer; -import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; @@ -196,7 +179,7 @@ public class ForgeChunkManager private NBTTagCompound modData; public final World world; private int maxDepth; - private String entityClazz; + //private String entityClazz; private int entityChunkX; private int entityChunkZ; private Entity entity; @@ -339,7 +322,7 @@ public class ForgeChunkManager /** * Gets a list of requested chunks for this ticket. */ - public ImmutableSet getChunkList() + public ImmutableSet getChunkList() { return ImmutableSet.copyOf(requestedChunks); } @@ -451,7 +434,7 @@ public class ForgeChunkManager NBTTagCompound ticket = (NBTTagCompound) tickets.func_150305_b(j); modId = ticket.hasKey("ModId") ? ticket.getString("ModId") : modId; Type type = Type.values()[ticket.getByte("Type")]; - byte ticketChunkDepth = ticket.getByte("ChunkListDepth"); + //byte ticketChunkDepth = ticket.getByte("ChunkListDepth"); Ticket tick = new Ticket(modId, type, world); if (ticket.hasKey("ModData")) { @@ -900,6 +883,7 @@ public class ForgeChunkManager } } + @SuppressWarnings("unchecked") public static Chunk fetchDormantChunk(long coords, World world) { Cache cache = dormantChunkCache.get(world); @@ -910,7 +894,7 @@ public class ForgeChunkManager Chunk chunk = cache.getIfPresent(coords); if (chunk != null) { - for (List eList : chunk.entityLists) + for (List eList : (List[])chunk.entityLists) { for (Entity e: eList) { @@ -979,8 +963,8 @@ public class ForgeChunkManager { continue; } - Property modTC = config.get(mod, "maximumTicketCount", 200); - Property modCPT = config.get(mod, "maximumChunksPerTicket", 25); + config.get(mod, "maximumTicketCount", 200); + config.get(mod, "maximumChunksPerTicket", 25); } } diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 50862bed2..45b6d82ec 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -1,19 +1,12 @@ package net.minecraftforge.common; import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.Random; import java.util.Set; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.block.Block; -import net.minecraft.block.BlockFlower; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -21,10 +14,8 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.inventory.Container; -import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemAxe; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; @@ -42,8 +33,6 @@ import net.minecraft.util.MovingObjectPosition.MovingObjectType; import net.minecraft.util.WeightedRandom; import net.minecraft.world.World; import net.minecraft.world.WorldSettings.GameType; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.ServerChatEvent; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.event.entity.living.LivingAttackEvent; diff --git a/src/main/java/net/minecraftforge/common/ForgeInternalHandler.java b/src/main/java/net/minecraftforge/common/ForgeInternalHandler.java index eb3bad5a5..e84f3bf0d 100644 --- a/src/main/java/net/minecraftforge/common/ForgeInternalHandler.java +++ b/src/main/java/net/minecraftforge/common/ForgeInternalHandler.java @@ -1,7 +1,5 @@ package net.minecraftforge.common; -import java.util.UUID; - import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -10,7 +8,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraftforge.event.*; import net.minecraftforge.event.entity.*; import net.minecraftforge.event.world.WorldEvent; diff --git a/src/main/java/net/minecraftforge/common/ForgeModContainer.java b/src/main/java/net/minecraftforge/common/ForgeModContainer.java index 962e21cb2..b27f07241 100644 --- a/src/main/java/net/minecraftforge/common/ForgeModContainer.java +++ b/src/main/java/net/minecraftforge/common/ForgeModContainer.java @@ -9,8 +9,6 @@ import static net.minecraftforge.common.config.Configuration.CATEGORY_GENERAL; import java.io.File; import java.util.Arrays; import java.util.Map; -import java.util.logging.Level; - import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -41,7 +39,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.internal.FMLNetworkHandler; public class ForgeModContainer extends DummyModContainer implements WorldAccessContainer { diff --git a/src/main/java/net/minecraftforge/common/ForgeVersion.java b/src/main/java/net/minecraftforge/common/ForgeVersion.java index 0d4d751f2..eb7dc52fa 100644 --- a/src/main/java/net/minecraftforge/common/ForgeVersion.java +++ b/src/main/java/net/minecraftforge/common/ForgeVersion.java @@ -80,6 +80,7 @@ public class ForgeVersion { new Thread("Forge Version Check") { + @SuppressWarnings("unchecked") @Override public void run() { @@ -91,7 +92,7 @@ public class ForgeVersion con.close(); Map json = new Gson().fromJson(data, Map.class); - String homepage = (String)json.get("homepage"); + //String homepage = (String)json.get("homepage"); Map promos = (Map)json.get("promos"); String rec = promos.get(MinecraftForge.MC_VERSION + "-recommended"); diff --git a/src/main/java/net/minecraftforge/common/IPlantable.java b/src/main/java/net/minecraftforge/common/IPlantable.java index 9c3b0c4eb..d316bf7dc 100644 --- a/src/main/java/net/minecraftforge/common/IPlantable.java +++ b/src/main/java/net/minecraftforge/common/IPlantable.java @@ -2,7 +2,6 @@ package net.minecraftforge.common; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; public interface IPlantable { diff --git a/src/main/java/net/minecraftforge/common/IShearable.java b/src/main/java/net/minecraftforge/common/IShearable.java index 0a8ecccf5..887db86f7 100644 --- a/src/main/java/net/minecraftforge/common/IShearable.java +++ b/src/main/java/net/minecraftforge/common/IShearable.java @@ -2,9 +2,7 @@ package net.minecraftforge.common; import java.util.ArrayList; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; /** diff --git a/src/main/java/net/minecraftforge/common/ISpecialArmor.java b/src/main/java/net/minecraftforge/common/ISpecialArmor.java index dc3c9aa36..cb672d67b 100644 --- a/src/main/java/net/minecraftforge/common/ISpecialArmor.java +++ b/src/main/java/net/minecraftforge/common/ISpecialArmor.java @@ -293,6 +293,7 @@ public interface ISpecialArmor } } + @Override public int compareTo(ArmorProperties o) { if (o.Priority != Priority) @@ -304,6 +305,7 @@ public interface ISpecialArmor return (int)(left - right); } + @Override public String toString() { return String.format("%d, %d, %f, %d", Priority, AbsorbMax, AbsorbRatio, (AbsorbRatio == 0 ? 0 : (int)(AbsorbMax * 100.0D / AbsorbRatio))); diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java index 3a98b16b8..93cc65f6c 100644 --- a/src/main/java/net/minecraftforge/common/MinecraftForge.java +++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java @@ -1,24 +1,10 @@ package net.minecraftforge.common; -import java.lang.reflect.Constructor; -import java.util.*; - -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.eventhandler.EventBus; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.crash.CrashReport; -import net.minecraft.entity.monster.EntityEnderman; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeHooks.SeedEntry; -import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.oredict.OreDictionary; public class MinecraftForge diff --git a/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java b/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java index aaf2256c7..da9a72507 100644 --- a/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java +++ b/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java @@ -15,6 +15,7 @@ import net.minecraft.world.WorldServer; public class WorldSpecificSaveHandler implements ISaveHandler { + @SuppressWarnings("unused") private WorldServer world; private ISaveHandler parent; private File dataDir; diff --git a/src/main/java/net/minecraftforge/common/config/ConfigCategory.java b/src/main/java/net/minecraftforge/common/config/ConfigCategory.java index 8ce1dd36d..4ccaed5ac 100644 --- a/src/main/java/net/minecraftforge/common/config/ConfigCategory.java +++ b/src/main/java/net/minecraftforge/common/config/ConfigCategory.java @@ -39,6 +39,7 @@ public class ConfigCategory implements Map } } + @Override public boolean equals(Object obj) { if (obj instanceof ConfigCategory) diff --git a/src/main/java/net/minecraftforge/common/config/Configuration.java b/src/main/java/net/minecraftforge/common/config/Configuration.java index e9e1c16bd..5e3abe48a 100644 --- a/src/main/java/net/minecraftforge/common/config/Configuration.java +++ b/src/main/java/net/minecraftforge/common/config/Configuration.java @@ -22,7 +22,6 @@ import java.io.OutputStreamWriter; import java.io.PushbackInputStream; import java.io.Reader; import java.util.ArrayList; -import java.util.Arrays; import java.util.Locale; import java.util.Map; import java.util.Set; @@ -30,13 +29,9 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import net.minecraft.block.Block; -import net.minecraft.item.Item; - import com.google.common.base.CharMatcher; import com.google.common.collect.ImmutableSet; -import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.FMLInjectionData; @@ -693,6 +688,7 @@ public class Configuration public static class UnicodeInputStreamReader extends Reader { private final InputStreamReader input; + @SuppressWarnings("unused") private final String defaultEnc; public UnicodeInputStreamReader(InputStream source, String encoding) throws IOException diff --git a/src/main/java/net/minecraftforge/common/config/Property.java b/src/main/java/net/minecraftforge/common/config/Property.java index 301d9691c..eb5f6deaa 100644 --- a/src/main/java/net/minecraftforge/common/config/Property.java +++ b/src/main/java/net/minecraftforge/common/config/Property.java @@ -7,8 +7,6 @@ package net.minecraftforge.common.config; import java.util.ArrayList; -import net.minecraftforge.common.config.Property.Type; - public class Property { public enum Type diff --git a/src/main/java/net/minecraftforge/common/network/ForgeMessage.java b/src/main/java/net/minecraftforge/common/network/ForgeMessage.java index 3c52e040a..2842a4ef6 100644 --- a/src/main/java/net/minecraftforge/common/network/ForgeMessage.java +++ b/src/main/java/net/minecraftforge/common/network/ForgeMessage.java @@ -1,13 +1,8 @@ package net.minecraftforge.common.network; -import java.util.Map; - import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import cpw.mods.fml.common.network.ByteBufUtils; - -import net.minecraftforge.fluids.FluidRegistry; import io.netty.buffer.ByteBuf; public abstract class ForgeMessage { diff --git a/src/main/java/net/minecraftforge/common/util/EnumHelper.java b/src/main/java/net/minecraftforge/common/util/EnumHelper.java index 0bdb8f4b2..5cc5e7198 100644 --- a/src/main/java/net/minecraftforge/common/util/EnumHelper.java +++ b/src/main/java/net/minecraftforge/common/util/EnumHelper.java @@ -3,7 +3,6 @@ package net.minecraftforge.common.util; import java.lang.reflect.*; import java.util.*; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; import net.minecraft.block.BlockPressurePlate.Sensitivity; import net.minecraft.block.material.Material; @@ -31,6 +30,7 @@ public class EnumHelper private static boolean isSetup = false; //Some enums are decompiled with extra arguments, so lets check for that + @SuppressWarnings("rawtypes") private static Class[][] commonTypes = { {EnumAction.class}, @@ -64,6 +64,7 @@ public class EnumHelper { return addEnum(EnumCreatureAttribute.class, name); } + @SuppressWarnings("rawtypes") public static EnumCreatureType addCreatureType(String name, Class typeClass, int maxNumber, Material material, boolean peaceful) { return addEnum(EnumCreatureType.class, name, typeClass, maxNumber, material, peaceful); @@ -183,6 +184,7 @@ public class EnumHelper return addEnum(commonTypes, enumType, enumName, paramValues); } + @SuppressWarnings("rawtypes") public static > T addEnum(Class[][] map, Class enumType, String enumName, Object... paramValues) { for (Class[] lookup : map) diff --git a/src/main/java/net/minecraftforge/common/util/FakePlayer.java b/src/main/java/net/minecraftforge/common/util/FakePlayer.java index 5c4cd46a9..38add8ec7 100644 --- a/src/main/java/net/minecraftforge/common/util/FakePlayer.java +++ b/src/main/java/net/minecraftforge/common/util/FakePlayer.java @@ -6,7 +6,6 @@ import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.network.play.client.C15PacketClientSettings; -import net.minecraft.server.MinecraftServer; import net.minecraft.server.management.ItemInWorldManager; import net.minecraft.stats.StatBase; import net.minecraft.util.ChunkCoordinates; diff --git a/src/main/java/net/minecraftforge/common/util/FakePlayerFactory.java b/src/main/java/net/minecraftforge/common/util/FakePlayerFactory.java index fec4eb0f7..fa78cb552 100644 --- a/src/main/java/net/minecraftforge/common/util/FakePlayerFactory.java +++ b/src/main/java/net/minecraftforge/common/util/FakePlayerFactory.java @@ -1,12 +1,9 @@ package net.minecraftforge.common.util; import java.util.Map; -import java.util.UUID; - import com.google.common.collect.Maps; import com.mojang.authlib.GameProfile; -import net.minecraft.world.World; import net.minecraft.world.WorldServer; //To be expanded for generic Mod fake players? diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index 773a2c0ca..56877b6dd 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -15,6 +15,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.EntityStruckByLightningEvent; import net.minecraftforge.event.entity.living.LivingPackSizeEvent; @@ -29,7 +30,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.WorldEvent; -@SuppressWarnings("deprecation") public class ForgeEventFactory { public static boolean doPlayerHarvestCheck(EntityPlayer player, Block block, boolean success) @@ -76,7 +76,7 @@ public class ForgeEventFactory return event.getResult(); } - public static List getPotentialSpawns(WorldServer world, EnumCreatureType type, int x, int y, int z, List oldList) + public static List getPotentialSpawns(WorldServer world, EnumCreatureType type, int x, int y, int z, List oldList) { WorldEvent.PotentialSpawns event = new WorldEvent.PotentialSpawns(world, type, x, y, z, oldList); if (MinecraftForge.EVENT_BUS.post(event)) diff --git a/src/main/java/net/minecraftforge/event/entity/EntityEvent.java b/src/main/java/net/minecraftforge/event/entity/EntityEvent.java index c859f01bf..3a6ac4335 100644 --- a/src/main/java/net/minecraftforge/event/entity/EntityEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/EntityEvent.java @@ -2,7 +2,6 @@ package net.minecraftforge.event.entity; import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.entity.Entity; -import net.minecraft.world.World; public class EntityEvent extends Event { diff --git a/src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java b/src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java index f52ffd1bf..affe2510c 100644 --- a/src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java @@ -2,7 +2,6 @@ package net.minecraftforge.event.entity.item; import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.entity.item.EntityItem; -import net.minecraftforge.event.entity.EntityEvent; /** * Event that is fired when an EntityItem's age has reached its maximum diff --git a/src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java b/src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java index dd8dc3446..f61cd5477 100644 --- a/src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java @@ -3,7 +3,6 @@ package net.minecraftforge.event.entity.item; import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.event.entity.EntityEvent; /** * Event that is fired whenever a player tosses (Q) an item or drag-n-drops a diff --git a/src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java b/src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java index 9e907ca82..10e342f1e 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/EnderTeleportEvent.java @@ -1,8 +1,6 @@ package net.minecraftforge.event.entity.living; import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; /** diff --git a/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java index d864a174a..818a14173 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java @@ -1,7 +1,6 @@ package net.minecraftforge.event.entity.living; import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event.HasResult; import net.minecraft.entity.EntityLiving; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java b/src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java index 69f721f55..bc9238615 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java @@ -1,7 +1,5 @@ package net.minecraftforge.event.entity.living; -import cpw.mods.fml.common.eventhandler.Cancelable; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.world.World; diff --git a/src/main/java/net/minecraftforge/event/entity/minecart/MinecartEvent.java b/src/main/java/net/minecraftforge/event/entity/minecart/MinecartEvent.java index 4aec2efd4..bf0af6b79 100644 --- a/src/main/java/net/minecraftforge/event/entity/minecart/MinecartEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/minecart/MinecartEvent.java @@ -1,6 +1,5 @@ package net.minecraftforge.event.entity.minecart; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityMinecart; import net.minecraftforge.event.entity.EntityEvent; diff --git a/src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java b/src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java index a14e7a0be..9ce4254c5 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java @@ -2,7 +2,6 @@ package net.minecraftforge.event.entity.player; import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Event; -import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -20,9 +19,7 @@ public class EntityItemPickupEvent extends PlayerEvent * * setResult(ALLOW) is the same as the old setHandled() */ - public final EntityItem item; - private boolean handled = false; public EntityItemPickupEvent(EntityPlayer player, EntityItem item) { diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java index 8a06fdb69..0c0b0288d 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerEvent.java @@ -2,7 +2,6 @@ package net.minecraftforge.event.entity.player; import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.entity.living.LivingEvent; diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java index 517471bc4..8436175a1 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerFlyableFallEvent.java @@ -1,6 +1,5 @@ package net.minecraftforge.event.entity.player; -import cpw.mods.fml.common.eventhandler.Cancelable; import net.minecraft.entity.player.EntityPlayer; /** diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java index 465ae4637..4269edc6b 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java @@ -1,10 +1,7 @@ package net.minecraftforge.event.entity.player; import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import static cpw.mods.fml.common.eventhandler.Event.Result; import static cpw.mods.fml.common.eventhandler.Event.Result.*; @Cancelable diff --git a/src/main/java/net/minecraftforge/event/entity/player/UseHoeEvent.java b/src/main/java/net/minecraftforge/event/entity/player/UseHoeEvent.java index 79a6f47c1..2d93d2193 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/UseHoeEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/UseHoeEvent.java @@ -26,8 +26,6 @@ public class UseHoeEvent extends PlayerEvent public final int y; public final int z; - private boolean handeled = false; - public UseHoeEvent(EntityPlayer player, ItemStack current, World world, int x, int y, int z) { super(player); diff --git a/src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java b/src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java index f87e66e53..6b8d5cc7e 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java @@ -1,14 +1,9 @@ package net.minecraftforge.event.terraingen; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeDecorator; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraftforge.event.*; public class BiomeEvent extends Event { diff --git a/src/main/java/net/minecraftforge/event/terraingen/ChunkProviderEvent.java b/src/main/java/net/minecraftforge/event/terraingen/ChunkProviderEvent.java index 62f86b5d1..e61a00964 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/ChunkProviderEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/ChunkProviderEvent.java @@ -4,7 +4,6 @@ import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.block.Block; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.IChunkProvider; -import net.minecraftforge.event.*; public class ChunkProviderEvent extends Event { diff --git a/src/main/java/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java b/src/main/java/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java index 5e0c4a864..9d9e2894c 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/DecorateBiomeEvent.java @@ -5,7 +5,6 @@ import java.util.Random; import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.world.World; -import net.minecraftforge.event.*; public class DecorateBiomeEvent extends Event { diff --git a/src/main/java/net/minecraftforge/event/terraingen/InitMapGenEvent.java b/src/main/java/net/minecraftforge/event/terraingen/InitMapGenEvent.java index 30c350f70..61fa5344a 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/InitMapGenEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/InitMapGenEvent.java @@ -2,7 +2,6 @@ package net.minecraftforge.event.terraingen; import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.world.gen.MapGenBase; -import net.minecraftforge.event.*; public class InitMapGenEvent extends Event { diff --git a/src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java b/src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java index ecde62871..422bbc4a0 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java @@ -6,7 +6,6 @@ import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; -import net.minecraftforge.event.*; public class OreGenEvent extends Event { diff --git a/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java b/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java index f0faf89ca..05283214a 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java @@ -4,7 +4,6 @@ import java.util.Random; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import net.minecraftforge.event.world.*; public class PopulateChunkEvent extends ChunkProviderEvent { diff --git a/src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java b/src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java index 57de56d31..a1f23a72d 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java +++ b/src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java @@ -12,7 +12,6 @@ import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.*; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.*; import net.minecraftforge.event.terraingen.OreGenEvent.*; -import net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.*; import net.minecraftforge.event.terraingen.PopulateChunkEvent.*; public abstract class TerrainGen diff --git a/src/main/java/net/minecraftforge/event/world/ChunkEvent.java b/src/main/java/net/minecraftforge/event/world/ChunkEvent.java index 42540316d..64251830f 100644 --- a/src/main/java/net/minecraftforge/event/world/ChunkEvent.java +++ b/src/main/java/net/minecraftforge/event/world/ChunkEvent.java @@ -1,8 +1,6 @@ package net.minecraftforge.event.world; import net.minecraft.world.chunk.Chunk; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; public class ChunkEvent extends WorldEvent { diff --git a/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java b/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java index f2ab9d022..6f156bdac 100644 --- a/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java +++ b/src/main/java/net/minecraftforge/event/world/ChunkWatchEvent.java @@ -3,7 +3,6 @@ package net.minecraftforge.event.world; import cpw.mods.fml.common.eventhandler.Event; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.world.WorldServer; public class ChunkWatchEvent extends Event { diff --git a/src/main/java/net/minecraftforge/event/world/WorldEvent.java b/src/main/java/net/minecraftforge/event/world/WorldEvent.java index ea18bcfbc..9e9dae136 100644 --- a/src/main/java/net/minecraftforge/event/world/WorldEvent.java +++ b/src/main/java/net/minecraftforge/event/world/WorldEvent.java @@ -5,7 +5,6 @@ import java.util.List; import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Event; - import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; @@ -47,7 +46,7 @@ public class WorldEvent extends Event public final int z; public final List list; - public PotentialSpawns(World world, EnumCreatureType type, int x, int y, int z, List oldList) + public PotentialSpawns(World world, EnumCreatureType type, int x, int y, int z, List oldList) { super(world); this.x = x; @@ -56,7 +55,7 @@ public class WorldEvent extends Event this.type = type; if (oldList != null) { - this.list = (List)oldList; + this.list = oldList; } else { diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java index 706f60850..885921e20 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidBase.java @@ -20,6 +20,7 @@ import net.minecraft.world.World; * @author King Lemming, OvermindDL1 * */ +@SuppressWarnings("unused") public abstract class BlockFluidBase extends Block implements IFluidBlock { /* diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java b/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java index dd323bbfd..663d93a70 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java @@ -15,6 +15,7 @@ import net.minecraft.world.World; * @author King Lemming * */ +@SuppressWarnings("unused") public class BlockFluidClassic extends BlockFluidBase { /* diff --git a/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java b/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java index 64128b65e..4bbbe8fa9 100644 --- a/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java +++ b/src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java @@ -16,6 +16,7 @@ import net.minecraft.world.World; * @author OvermindDL1, KingLemming * */ +@SuppressWarnings("unused") public class BlockFluidFinite extends BlockFluidBase { public BlockFluidFinite(int id, Fluid fluid, Material material) diff --git a/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java index 99ed07456..80c24cafc 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java +++ b/src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java @@ -9,7 +9,6 @@ import java.util.Map; import java.util.Set; import cpw.mods.fml.common.eventhandler.Event; - import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -24,6 +23,7 @@ import net.minecraftforge.common.MinecraftForge; * @author King Lemming * */ +@SuppressWarnings("unused") public abstract class FluidContainerRegistry { /* diff --git a/src/main/java/net/minecraftforge/fluids/FluidIdMapPacket.java b/src/main/java/net/minecraftforge/fluids/FluidIdMapPacket.java index 2b9ab696f..9ee287daf 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidIdMapPacket.java +++ b/src/main/java/net/minecraftforge/fluids/FluidIdMapPacket.java @@ -11,6 +11,7 @@ import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; +@SuppressWarnings("unused") public class FluidIdMapPacket// extends ForgePacket { /* diff --git a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java index 26fe20b47..78d49a959 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidRegistry.java +++ b/src/main/java/net/minecraftforge/fluids/FluidRegistry.java @@ -19,6 +19,7 @@ import cpw.mods.fml.common.eventhandler.Event; * @author King Lemming, CovertJaguar (LiquidDictionary) * */ +@SuppressWarnings("unused") public abstract class FluidRegistry { /* diff --git a/src/main/java/net/minecraftforge/fluids/FluidStack.java b/src/main/java/net/minecraftforge/fluids/FluidStack.java index 2a7fffa35..76e796ba8 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidStack.java +++ b/src/main/java/net/minecraftforge/fluids/FluidStack.java @@ -16,6 +16,7 @@ import net.minecraft.nbt.NBTTagCompound; * @author King Lemming, SirSengir (LiquidStack) * */ +@SuppressWarnings("unused") public class FluidStack { /* diff --git a/src/main/java/net/minecraftforge/fluids/FluidTank.java b/src/main/java/net/minecraftforge/fluids/FluidTank.java index 5132313dd..44398b7c1 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidTank.java +++ b/src/main/java/net/minecraftforge/fluids/FluidTank.java @@ -10,6 +10,7 @@ import net.minecraft.tileentity.TileEntity; * @author King Lemming, cpw (LiquidTank) * */ +@SuppressWarnings("unused") public class FluidTank implements IFluidTank { @Override public FluidStack getFluid() { return null; } diff --git a/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java b/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java index d7af42581..f63f4f1c3 100644 --- a/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java +++ b/src/main/java/net/minecraftforge/fluids/ItemFluidContainer.java @@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagCompound; * @author King Lemming * */ +@SuppressWarnings("unused") public class ItemFluidContainer extends Item implements IFluidContainerItem { @Override public FluidStack getFluid(ItemStack container){ return null; } diff --git a/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java b/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java index e5bcab40f..3ac78ef1b 100644 --- a/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java +++ b/src/main/java/net/minecraftforge/fluids/RenderBlockFluid.java @@ -14,6 +14,7 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; * @author King Lemming * */ +@SuppressWarnings("unused") public class RenderBlockFluid implements ISimpleBlockRenderingHandler { @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) {} diff --git a/src/main/java/net/minecraftforge/fluids/TileFluidHandler.java b/src/main/java/net/minecraftforge/fluids/TileFluidHandler.java index e69a5c8fb..62e5b64ed 100644 --- a/src/main/java/net/minecraftforge/fluids/TileFluidHandler.java +++ b/src/main/java/net/minecraftforge/fluids/TileFluidHandler.java @@ -11,6 +11,7 @@ import net.minecraftforge.common.util.ForgeDirection; * @author King Lemming * */ +@SuppressWarnings("unused") public class TileFluidHandler extends TileEntity implements IFluidHandler { @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { return 0; } diff --git a/src/main/java/net/minecraftforge/oredict/OreDictionary.java b/src/main/java/net/minecraftforge/oredict/OreDictionary.java index aaf3a4f6f..3f0e66a84 100644 --- a/src/main/java/net/minecraftforge/oredict/OreDictionary.java +++ b/src/main/java/net/minecraftforge/oredict/OreDictionary.java @@ -2,7 +2,6 @@ package net.minecraftforge.oredict; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -37,6 +36,7 @@ public class OreDictionary initVanillaEntries(); } + @SuppressWarnings("unchecked") public static void initVanillaEntries() { if (!hasInit) @@ -140,7 +140,7 @@ public class OreDictionary new ItemStack(Blocks.dark_oak_stairs) }; - List recipes = CraftingManager.getInstance().getRecipeList(); + List recipes = CraftingManager.getInstance().getRecipeList(); List recipesToRemove = new ArrayList(); List recipesToAdd = new ArrayList(); diff --git a/src/main/java/net/minecraftforge/oredict/RecipeSorter.java b/src/main/java/net/minecraftforge/oredict/RecipeSorter.java index e112fb5c3..ffcb4d3dd 100644 --- a/src/main/java/net/minecraftforge/oredict/RecipeSorter.java +++ b/src/main/java/net/minecraftforge/oredict/RecipeSorter.java @@ -1,10 +1,7 @@ package net.minecraftforge.oredict; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -14,13 +11,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import cpw.mods.fml.common.DummyModContainer; import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.toposort.TopologicalSort; import cpw.mods.fml.common.toposort.TopologicalSort.DirectedGraph; -import cpw.mods.fml.common.versioning.ArtifactVersion; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.RecipeFireworks; @@ -31,6 +24,7 @@ import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; import static net.minecraftforge.oredict.RecipeSorter.Category.*; +@SuppressWarnings("rawtypes") public class RecipeSorter implements Comparator { public enum Category @@ -43,12 +37,12 @@ public class RecipeSorter implements Comparator private static class SortEntry { private String name; - private Class cls; + private Class cls; private Category cat; List before = Lists.newArrayList(); List after = Lists.newArrayList(); - private SortEntry(String name, Class cls, Category cat, String deps) + private SortEntry(String name, Class cls, Category cat, String deps) { this.name = name; this.cls = cls; @@ -105,7 +99,7 @@ public class RecipeSorter implements Comparator }; private static Map categories = Maps.newHashMap(); - private static Map types = Maps.newHashMap(); + //private static Map types = Maps.newHashMap(); private static Map entries = Maps.newHashMap(); private static Map priorities = Maps.newHashMap(); @@ -141,6 +135,7 @@ public class RecipeSorter implements Comparator } private static Set warned = Sets.newHashSet(); + @SuppressWarnings("unchecked") public static void sortCraftManager() { bake(); @@ -149,7 +144,7 @@ public class RecipeSorter implements Comparator Collections.sort(CraftingManager.getInstance().getRecipeList(), INSTANCE); } - public static void register(String name, Class recipe, Category category, String dependancies) + public static void register(String name, Class recipe, Category category, String dependancies) { assert(category != UNKNOWN) : "Category must not be unknown!"; isDirty = true; @@ -159,7 +154,7 @@ public class RecipeSorter implements Comparator setCategory(recipe, category); } - public static void setCategory(Class recipe, Category category) + public static void setCategory(Class recipe, Category category) { assert(category != UNKNOWN) : "Category must not be unknown!"; categories.put(recipe, category); @@ -170,9 +165,9 @@ public class RecipeSorter implements Comparator return getCategory(recipe.getClass()); } - public static Category getCategory(Class recipe) + public static Category getCategory(Class recipe) { - Class cls = recipe; + Class cls = recipe; Category ret = categories.get(cls); if (ret == null) @@ -194,12 +189,12 @@ public class RecipeSorter implements Comparator private static int getPriority(IRecipe recipe) { - Class cls = recipe.getClass(); + Class cls = recipe.getClass(); Integer ret = priorities.get(cls); if (ret == null) { - if (!INSTANCE.warned.contains(cls)) + if (!warned.contains(cls)) { FMLLog.fine(" Unknown recipe class! %s Modder please refer to %s", cls.getName(), RecipeSorter.class.getName()); warned.add(cls); diff --git a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java index 6d39d10f1..a9f3d6171 100644 --- a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java +++ b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java @@ -182,6 +182,7 @@ public class ShapedOreRecipe implements IRecipe return false; } + @SuppressWarnings("unchecked") private boolean checkMatch(InventoryCrafting inv, int startX, int startY, boolean mirror) { for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++) diff --git a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java index 2b695fbad..36bfbc96a 100644 --- a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java +++ b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java @@ -7,7 +7,6 @@ import java.util.Map.Entry; import java.util.List; import net.minecraft.block.Block; -import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -18,7 +17,7 @@ import net.minecraft.world.World; public class ShapelessOreRecipe implements IRecipe { private ItemStack output = null; - private ArrayList input = new ArrayList(); + private ArrayList input = new ArrayList(); public ShapelessOreRecipe(Block result, Object... recipe){ this(new ItemStack(result), recipe); } public ShapelessOreRecipe(Item result, Object... recipe){ this(new ItemStack(result), recipe); } @@ -57,6 +56,7 @@ public class ShapelessOreRecipe implements IRecipe } } + @SuppressWarnings("unchecked") ShapelessOreRecipe(ShapelessRecipes recipe, Map replacements) { output = recipe.getRecipeOutput(); @@ -85,10 +85,11 @@ public class ShapelessOreRecipe implements IRecipe @Override public ItemStack getCraftingResult(InventoryCrafting var1){ return output.copy(); } + @SuppressWarnings("unchecked") @Override public boolean matches(InventoryCrafting var1, World world) { - ArrayList required = new ArrayList(input); + ArrayList required = new ArrayList(input); for (int x = 0; x < var1.getSizeInventory(); x++) { @@ -97,7 +98,7 @@ public class ShapelessOreRecipe implements IRecipe if (slot != null) { boolean inRecipe = false; - Iterator req = required.iterator(); + Iterator req = required.iterator(); while (req.hasNext()) { @@ -145,7 +146,7 @@ public class ShapelessOreRecipe implements IRecipe * manipulate the values in this array as it will effect the recipe itself. * @return The recipes input vales. */ - public ArrayList getInput() + public ArrayList getInput() { return this.input; } diff --git a/src/main/java/net/minecraftforge/server/ForgeTimeTracker.java b/src/main/java/net/minecraftforge/server/ForgeTimeTracker.java index e6357b0a7..ed698b6e5 100644 --- a/src/main/java/net/minecraftforge/server/ForgeTimeTracker.java +++ b/src/main/java/net/minecraftforge/server/ForgeTimeTracker.java @@ -18,11 +18,13 @@ public class ForgeTimeTracker { public static long tileEntityTrackingTime; private Map tileEntityTimings; + @SuppressWarnings("unused") private Map entityTimings; private static final ForgeTimeTracker INSTANCE = new ForgeTimeTracker(); private WeakReference tile; + @SuppressWarnings("unused") private WeakReference entity; private long timing; diff --git a/src/main/java/net/minecraftforge/server/command/ForgeCommand.java b/src/main/java/net/minecraftforge/server/command/ForgeCommand.java index 9daed4f9f..29af302d4 100644 --- a/src/main/java/net/minecraftforge/server/command/ForgeCommand.java +++ b/src/main/java/net/minecraftforge/server/command/ForgeCommand.java @@ -1,21 +1,12 @@ package net.minecraftforge.server.command; import java.text.DecimalFormat; -import java.util.List; - -import com.google.common.collect.Multiset; - import net.minecraft.command.CommandBase; -import net.minecraft.command.ICommand; import net.minecraft.command.ICommandSender; import net.minecraft.command.WrongUsageException; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentTranslation; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.server.ForgeTimeTracker; public class ForgeCommand extends CommandBase { diff --git a/src/main/java/paulscode/sound/codecs/CodecIBXM.java b/src/main/java/paulscode/sound/codecs/CodecIBXM.java index 4bb032d8d..95e076888 100644 --- a/src/main/java/paulscode/sound/codecs/CodecIBXM.java +++ b/src/main/java/paulscode/sound/codecs/CodecIBXM.java @@ -7,13 +7,13 @@ import java.net.URL; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.ShortBuffer; + import javax.sound.sampled.AudioFormat; import paulscode.sound.ICodec; import paulscode.sound.SoundBuffer; import paulscode.sound.SoundSystemConfig; import paulscode.sound.SoundSystemLogger; - import ibxm.FastTracker2; import ibxm.IBXM; import ibxm.Module; @@ -170,6 +170,7 @@ public class CodecIBXM implements ICodec * will call the reverseByteOrder() method. * @param b True if the calling audio library requires byte-reversal. */ + @Override public void reverseByteOrder( boolean b ) { reverseBytes = b; @@ -181,6 +182,7 @@ public class CodecIBXM implements ICodec * @param url URL to an audio file to stream from. * @return False if an error occurred or if end of stream was reached. */ + @Override public boolean initialize( URL url ) { initialized( SET, false ); @@ -265,6 +267,7 @@ public class CodecIBXM implements ICodec * Returns false if the stream is busy initializing. * @return True if steam is initialized. */ + @Override public boolean initialized() { return initialized( GET, XXX ); @@ -276,6 +279,7 @@ public class CodecIBXM implements ICodec * information about accessing and changing default settings. * @return The audio data wrapped into a SoundBuffer context. */ + @Override public SoundBuffer read() { if( endOfStream( GET, XXX ) ) @@ -333,6 +337,7 @@ public class CodecIBXM implements ICodec * information about accessing and changing default settings. * @return the audio data wrapped into a SoundBuffer context. */ + @Override public SoundBuffer readAll() { if( module == null ) @@ -393,6 +398,7 @@ public class CodecIBXM implements ICodec * Returns false if there is still more data available to be read in. * @return True if end of stream was reached. */ + @Override public boolean endOfStream() { return endOfStream( GET, XXX ); @@ -401,6 +407,7 @@ public class CodecIBXM implements ICodec /** * Closes the audio stream and remove references to all instantiated objects. */ + @Override public void cleanup() { // if( ibxm != null ) @@ -413,6 +420,7 @@ public class CodecIBXM implements ICodec * readAll() methods. * @return Information wrapped into an AudioFormat context. */ + @Override public AudioFormat getAudioFormat() { return myAudioFormat; @@ -493,6 +501,7 @@ public class CodecIBXM implements ICodec * @param maxLength Maximum size this array may be. * @return New array. */ + @SuppressWarnings("unused") private static byte[] trimArray( byte[] array, int maxLength ) { byte[] trimmedArray = null; @@ -537,6 +546,7 @@ public class CodecIBXM implements ICodec * @param two_bytes_data For stereo sounds. * @return byte array containing the converted data. */ + @SuppressWarnings("unused") private static byte[] convertAudioBytes( byte[] audio_bytes, boolean two_bytes_data ) {