diff --git a/fml/src/main/java/cpw/mods/fml/common/DummyModContainer.java b/fml/src/main/java/cpw/mods/fml/common/DummyModContainer.java index e60318724..95bac54b1 100644 --- a/fml/src/main/java/cpw/mods/fml/common/DummyModContainer.java +++ b/fml/src/main/java/cpw/mods/fml/common/DummyModContainer.java @@ -109,6 +109,7 @@ public class DummyModContainer implements ModContainer return md.version; } + @Override public boolean matches(Object mod) { return false; diff --git a/fml/src/main/java/cpw/mods/fml/common/FMLModContainer.java b/fml/src/main/java/cpw/mods/fml/common/FMLModContainer.java index 50b24aef4..f2c607941 100644 --- a/fml/src/main/java/cpw/mods/fml/common/FMLModContainer.java +++ b/fml/src/main/java/cpw/mods/fml/common/FMLModContainer.java @@ -360,6 +360,7 @@ public class FMLModContainer implements ModContainer parseSimpleFieldAnnotation(annotations, Instance.class.getName(), new Function() { + @Override public Object apply(ModContainer mc) { return mc.getMod(); @@ -367,6 +368,7 @@ public class FMLModContainer implements ModContainer }); parseSimpleFieldAnnotation(annotations, Metadata.class.getName(), new Function() { + @Override public Object apply(ModContainer mc) { return mc.getMetadata(); diff --git a/fml/src/main/java/cpw/mods/fml/common/InjectedModContainer.java b/fml/src/main/java/cpw/mods/fml/common/InjectedModContainer.java index f4acf416f..1907f4363 100644 --- a/fml/src/main/java/cpw/mods/fml/common/InjectedModContainer.java +++ b/fml/src/main/java/cpw/mods/fml/common/InjectedModContainer.java @@ -34,76 +34,91 @@ public class InjectedModContainer implements ModContainer this.wrappedContainer = mc; } + @Override public String getModId() { return wrappedContainer.getModId(); } + @Override public String getName() { return wrappedContainer.getName(); } + @Override public String getVersion() { return wrappedContainer.getVersion(); } + @Override public File getSource() { return source; } + @Override public ModMetadata getMetadata() { return wrappedContainer.getMetadata(); } + @Override public void bindMetadata(MetadataCollection mc) { wrappedContainer.bindMetadata(mc); } + @Override public void setEnabledState(boolean enabled) { wrappedContainer.setEnabledState(enabled); } + @Override public Set getRequirements() { return wrappedContainer.getRequirements(); } + @Override public List getDependencies() { return wrappedContainer.getDependencies(); } + @Override public List getDependants() { return wrappedContainer.getDependants(); } + @Override public String getSortingRules() { return wrappedContainer.getSortingRules(); } + @Override public boolean registerBus(EventBus bus, LoadController controller) { return wrappedContainer.registerBus(bus, controller); } + @Override public boolean matches(Object mod) { return wrappedContainer.matches(mod); } + @Override public Object getMod() { return wrappedContainer.getMod(); } + @Override public ArtifactVersion getProcessedVersion() { return wrappedContainer.getProcessedVersion(); diff --git a/fml/src/main/java/cpw/mods/fml/common/Loader.java b/fml/src/main/java/cpw/mods/fml/common/Loader.java index 9878bab16..6c4de96ea 100644 --- a/fml/src/main/java/cpw/mods/fml/common/Loader.java +++ b/fml/src/main/java/cpw/mods/fml/common/Loader.java @@ -531,6 +531,7 @@ public class Loader Map isEnabled = Maps.transformValues(modStates, new Function() { + @Override public Boolean apply(String input) { return Boolean.parseBoolean(input); diff --git a/fml/src/main/java/cpw/mods/fml/common/LoaderState.java b/fml/src/main/java/cpw/mods/fml/common/LoaderState.java index eec7dcf0f..8fc26635a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/LoaderState.java +++ b/fml/src/main/java/cpw/mods/fml/common/LoaderState.java @@ -112,6 +112,7 @@ public enum LoaderState this.label = label; } + @Override public String toString() { return this.label; diff --git a/fml/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java b/fml/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java index 51ddb25ae..ce180102f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java +++ b/fml/src/main/java/cpw/mods/fml/common/discovery/ASMDataTable.java @@ -87,6 +87,7 @@ public class ASMDataTable { this.container = container; } + @Override public boolean apply(ASMData data) { return container.getSource().equals(data.candidate.getModContainer()); diff --git a/fml/src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java b/fml/src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java index 9056e42bb..f71817748 100644 --- a/fml/src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java +++ b/fml/src/main/java/cpw/mods/fml/common/functions/ArtifactVersionNameFunction.java @@ -5,6 +5,7 @@ import com.google.common.base.Function; import cpw.mods.fml.common.versioning.ArtifactVersion; public class ArtifactVersionNameFunction implements Function { + @Override public String apply(ArtifactVersion v) { return v.getLabel(); diff --git a/fml/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java b/fml/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java index 3a04572a1..0c6349871 100644 --- a/fml/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java +++ b/fml/src/main/java/cpw/mods/fml/common/functions/ModIdFunction.java @@ -18,6 +18,7 @@ import cpw.mods.fml.common.ModContainer; public final class ModIdFunction implements Function { + @Override public String apply(ModContainer container) { return container.getModId(); diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java index 75b4b7aee..1c440fe1e 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java +++ b/fml/src/main/java/cpw/mods/fml/common/network/handshake/FMLHandshakeMessage.java @@ -28,11 +28,13 @@ public abstract class FMLHandshakeMessage { } public static class ServerHello extends FMLHandshakeMessage { private byte serverProtocolVersion; + @Override public void toBytes(ByteBuf buffer) { buffer.writeByte(NetworkRegistry.FML_PROTOCOL); } + @Override public void fromBytes(ByteBuf buffer) { serverProtocolVersion = buffer.readByte(); @@ -45,11 +47,13 @@ public abstract class FMLHandshakeMessage { } public static class ClientHello extends FMLHandshakeMessage { private byte serverProtocolVersion; + @Override public void toBytes(ByteBuf buffer) { buffer.writeByte(NetworkRegistry.FML_PROTOCOL); } + @Override public void fromBytes(ByteBuf buffer) { serverProtocolVersion = buffer.readByte(); @@ -130,6 +134,7 @@ public abstract class FMLHandshakeMessage { } private Map modIds; + @Override public void fromBytes(ByteBuf buffer) { int length = ByteBufUtils.readVarInt(buffer, 3); diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java b/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java index 80878d265..0729ca92a 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java +++ b/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java @@ -229,6 +229,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple final ChatComponentText chatcomponenttext = new ChatComponentText(message); manager.func_150725_a(new S40PacketDisconnect(chatcomponenttext), new GenericFutureListener>() { + @Override public void operationComplete(Future result) { manager.func_150718_a(chatcomponenttext); diff --git a/fml/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java b/fml/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java index 8d3631f2f..d9baffa99 100644 --- a/fml/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java +++ b/fml/src/main/java/cpw/mods/fml/common/toposort/TopologicalSort.java @@ -55,6 +55,7 @@ public class TopologicalSort orderedNodes.add(node); graph.put(node, new TreeSet(new Comparator() { + @Override public int compare(T o1, T o2) { return orderedNodes.indexOf(o1)-orderedNodes.indexOf(o2); } diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java b/fml/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java index e7dcec709..083aec2d5 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java +++ b/fml/src/main/java/cpw/mods/fml/common/versioning/ComparableVersion.java @@ -114,16 +114,19 @@ public class ComparableVersion this.value = new BigInteger( str ); } + @Override public int getType() { return INTEGER_ITEM; } + @Override public boolean isNull() { return BigInteger_ZERO.equals( value ); } + @Override public int compareTo( Item item ) { if ( item == null ) @@ -147,6 +150,7 @@ public class ComparableVersion } } + @Override public String toString() { return value.toString(); @@ -200,11 +204,13 @@ public class ComparableVersion this.value = ALIASES.getProperty( value , value ); } + @Override public int getType() { return STRING_ITEM; } + @Override public boolean isNull() { return ( comparableQualifier( value ).compareTo( RELEASE_VERSION_INDEX ) == 0 ); @@ -229,6 +235,7 @@ public class ComparableVersion return i == -1 ? ( _QUALIFIERS.size() + "-" + qualifier ) : String.valueOf( i ); } + @Override public int compareTo( Item item ) { if ( item == null ) @@ -252,6 +259,7 @@ public class ComparableVersion } } + @Override public String toString() { return value; @@ -271,11 +279,13 @@ public class ComparableVersion */ private static final long serialVersionUID = 1L; + @Override public int getType() { return LIST_ITEM; } + @Override public boolean isNull() { return ( size() == 0 ); @@ -297,6 +307,7 @@ public class ComparableVersion } } + @Override public int compareTo( Item item ) { if ( item == null ) @@ -341,6 +352,7 @@ public class ComparableVersion } } + @Override public String toString() { StringBuilder buffer = new StringBuilder( "(" ); @@ -462,21 +474,25 @@ public class ComparableVersion return isDigit ? new IntegerItem( buf ) : new StringItem( buf, false ); } + @Override public int compareTo( ComparableVersion o ) { return items.compareTo( o.items ); } + @Override public String toString() { return value; } + @Override public boolean equals( Object o ) { return ( o instanceof ComparableVersion ) && canonical.equals( ( (ComparableVersion) o ).canonical ); } + @Override public int hashCode() { return canonical.hashCode(); diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/Restriction.java b/fml/src/main/java/cpw/mods/fml/common/versioning/Restriction.java index 963d51e53..e4b7c6fc3 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/Restriction.java +++ b/fml/src/main/java/cpw/mods/fml/common/versioning/Restriction.java @@ -190,6 +190,7 @@ public class Restriction return true; } + @Override public String toString() { StringBuilder buf = new StringBuilder(); diff --git a/fml/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java b/fml/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java index bd8f0df95..c675d9c4f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java +++ b/fml/src/main/java/cpw/mods/fml/common/versioning/VersionRange.java @@ -473,6 +473,7 @@ public class VersionRange return restrictions; } + @Override public String toString() { if ( recommendedVersion != null ) @@ -521,6 +522,7 @@ public class VersionRange return !restrictions.isEmpty() && recommendedVersion == null; } + @Override public boolean equals( Object obj ) { if ( this == obj ) @@ -542,6 +544,7 @@ public class VersionRange return equals; } + @Override public int hashCode() { int hash = 7; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java index f9ca9979c..fb8776479 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java +++ b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/ByteBufferSeekableSource.java @@ -59,6 +59,7 @@ public class ByteBufferSeekableSource implements SeekableSource { } } + @Override public void seek(long pos) throws IOException { cur = bb.slice(); if (pos > cur.limit()) @@ -66,6 +67,7 @@ public class ByteBufferSeekableSource implements SeekableSource { cur.position((int) pos); } + @Override public int read(ByteBuffer dest) throws IOException { if (!cur.hasRemaining()) return -1; @@ -77,6 +79,7 @@ public class ByteBufferSeekableSource implements SeekableSource { return c; } + @Override public void close() throws IOException { bb = null; cur = null; diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java index 054cb9f4e..7281e40ce 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java +++ b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DebugDiffWriter.java @@ -1,4 +1,4 @@ -/* +/* * * Copyright (c) 2001 Torgeir Veimo * @@ -32,20 +32,22 @@ import java.io.IOException; * For debugging patch generation. */ public class DebugDiffWriter implements DiffWriter { - + private ByteArrayOutputStream os = new ByteArrayOutputStream(); - + /** * Constructs a new DebugDiffWriter. */ public DebugDiffWriter() {} - + + @Override public void addCopy(long offset, int length) throws IOException { if (os.size() > 0) writeBuf(); System.err.println("COPY off: " + offset + ", len: " + length); } - + + @Override public void addData(byte b) throws IOException { os.write(b); writeBuf(); @@ -63,10 +65,12 @@ public class DebugDiffWriter implements DiffWriter { System.err.println(""); os.reset(); } - + + @Override public void flush() throws IOException { System.err.println("FLUSH"); } + @Override public void close() throws IOException { System.err.println("CLOSE"); } diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java index 05b3221e0..1f86e4ec2 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java +++ b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/DiffWriter.java @@ -52,6 +52,7 @@ public interface DiffWriter extends Closeable { * Closes this stream. * Note that {@link DiffWriter} will invoke this method at the end. */ + @Override public void close() throws IOException; } diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java index 33d2956e0..63d8c92fe 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java +++ b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/GDiffWriter.java @@ -83,6 +83,7 @@ public class GDiffWriter implements DiffWriter { this(new DataOutputStream(output)); } + @Override public void addCopy(long offset, int length) throws IOException { writeBuf(); @@ -130,6 +131,7 @@ public class GDiffWriter implements DiffWriter { /** * Adds a data byte. */ + @Override public void addData(byte b) throws IOException { buf.write(b); if (buf.size() >= CHUNK_SIZE) @@ -155,6 +157,7 @@ public class GDiffWriter implements DiffWriter { /** * Flushes accumulated data bytes, if any. */ + @Override public void flush() throws IOException { writeBuf(); @@ -164,6 +167,7 @@ public class GDiffWriter implements DiffWriter { /** * Writes the final EOF byte, closes the underlying stream. */ + @Override public void close() throws IOException { this.flush(); output.write((byte)EOF); diff --git a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java index d7f9dd0dc..dd03ff20e 100644 --- a/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java +++ b/fml/src/main/java/cpw/mods/fml/repackage/com/nothome/delta/RandomAccessFileSeekableSource.java @@ -48,6 +48,7 @@ public class RandomAccessFileSeekableSource implements SeekableSource { this.raf = raf; } + @Override public void seek(long pos) throws IOException { raf.seek(pos); } @@ -60,10 +61,12 @@ public class RandomAccessFileSeekableSource implements SeekableSource { return raf.length(); } + @Override public void close() throws IOException { raf.close(); } + @Override public int read(ByteBuffer bb) throws IOException { int c = raf.read(bb.array(), bb.position(), bb.remaining()); if (c == -1) diff --git a/fml/src/main/java/cpw/mods/fml/server/FMLServerHandler.java b/fml/src/main/java/cpw/mods/fml/server/FMLServerHandler.java index 17bb021ac..cee66ebc9 100644 --- a/fml/src/main/java/cpw/mods/fml/server/FMLServerHandler.java +++ b/fml/src/main/java/cpw/mods/fml/server/FMLServerHandler.java @@ -69,6 +69,7 @@ public class FMLServerHandler implements IFMLSidedHandler * * @param minecraftServer */ + @Override public void beginServerLoading(MinecraftServer minecraftServer) { server = minecraftServer; @@ -78,6 +79,7 @@ public class FMLServerHandler implements IFMLSidedHandler /** * Called a bit later on during server initialization to finish loading mods */ + @Override public void finishServerLoading() { Loader.instance().initializeMods(); @@ -92,6 +94,7 @@ public class FMLServerHandler implements IFMLSidedHandler /** * Get the server instance */ + @Override public MinecraftServer getServer() { return server;