diff --git a/fml/client/cpw/mods/fml/client/FMLTextureFX.java b/fml/client/cpw/mods/fml/client/FMLTextureFX.java index a2091c6a7..8fe9102b2 100644 --- a/fml/client/cpw/mods/fml/client/FMLTextureFX.java +++ b/fml/client/cpw/mods/fml/client/FMLTextureFX.java @@ -20,7 +20,7 @@ import java.util.logging.Logger; import net.minecraft.src.RenderEngine; import net.minecraft.src.TextureFX; -import net.minecraft.src.TexturePackBase; +import net.minecraft.src.ITexturePack; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; @@ -41,7 +41,7 @@ public class FMLTextureFX extends TextureFX implements ITextureFX @Override public void setErrored(boolean err){ errored = err; } @Override public boolean getErrored(){ return errored; } @Override - public void onTexturePackChanged(RenderEngine engine, TexturePackBase texturepack, Dimension dimensions) + public void onTexturePackChanged(RenderEngine engine, ITexturePack texturepack, Dimension dimensions) { onTextureDimensionsUpdate(dimensions.width, dimensions.height); } diff --git a/fml/client/cpw/mods/fml/client/ITextureFX.java b/fml/client/cpw/mods/fml/client/ITextureFX.java index 86d44ba91..6231c63d1 100644 --- a/fml/client/cpw/mods/fml/client/ITextureFX.java +++ b/fml/client/cpw/mods/fml/client/ITextureFX.java @@ -17,11 +17,11 @@ package cpw.mods.fml.client; import java.awt.Dimension; import net.minecraft.src.RenderEngine; -import net.minecraft.src.TexturePackBase; +import net.minecraft.src.ITexturePack; public interface ITextureFX { - public void onTexturePackChanged(RenderEngine engine, TexturePackBase texturepack, Dimension dimensions); + public void onTexturePackChanged(RenderEngine engine, ITexturePack texturepack, Dimension dimensions); public void onTextureDimensionsUpdate(int width, int height); diff --git a/fml/client/cpw/mods/fml/client/TextureFXManager.java b/fml/client/cpw/mods/fml/client/TextureFXManager.java index 9be215101..86bf91f42 100644 --- a/fml/client/cpw/mods/fml/client/TextureFXManager.java +++ b/fml/client/cpw/mods/fml/client/TextureFXManager.java @@ -22,7 +22,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.src.ModTextureStatic; import net.minecraft.src.RenderEngine; import net.minecraft.src.TextureFX; -import net.minecraft.src.TexturePackBase; +import net.minecraft.src.ITexturePack; import org.lwjgl.opengl.GL11; @@ -171,7 +171,7 @@ public class TextureFXManager return id; } - public void onTexturePackChange(RenderEngine engine, TexturePackBase texturepack, List effects) + public void onTexturePackChange(RenderEngine engine, ITexturePack texturepack, List effects) { pruneOldTextureFX(texturepack, effects); @@ -188,7 +188,7 @@ public class TextureFXManager private HashMap textureDims = new HashMap(); private IdentityHashMap effectTextures = new IdentityHashMap(); - private TexturePackBase earlyTexturePack; + private ITexturePack earlyTexturePack; public void setTextureDimensions(int id, int width, int height, List effects) { Dimension dim = new Dimension(width, height); @@ -226,7 +226,7 @@ public class TextureFXManager } - public void loadTextures(TexturePackBase texturePack) + public void loadTextures(ITexturePack texturePack) { registerTextureOverrides(client.field_71446_o); } @@ -261,7 +261,7 @@ public class TextureFXManager { } - public void onEarlyTexturePackLoad(TexturePackBase fallback) + public void onEarlyTexturePackLoad(ITexturePack fallback) { if (client==null) { // We're far too early- let's wait @@ -272,7 +272,7 @@ public class TextureFXManager } - public void pruneOldTextureFX(TexturePackBase var1, List effects) + public void pruneOldTextureFX(ITexturePack var1, List effects) { ListIterator li = addedTextureFX.listIterator(); while (li.hasNext()) diff --git a/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java b/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java index 5c96301e5..ca3357519 100644 --- a/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java +++ b/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java @@ -14,7 +14,7 @@ import net.minecraft.src.EntityPlayer; import net.minecraft.src.KeyBinding; import net.minecraft.src.NetClientHandler; import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.Render; import net.minecraft.src.RenderManager; @@ -155,9 +155,9 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper ((net.minecraft.src.BaseMod)mod).clientCustomPayload(client.field_71439_g.field_71174_a, packet); } - private Map managerLookups = new MapMaker().weakKeys().weakValues().makeMap(); + private Map managerLookups = new MapMaker().weakKeys().weakValues().makeMap(); @Override - public void clientConnectionOpened(NetHandler netClientHandler, NetworkManager manager, BaseModProxy mod) + public void clientConnectionOpened(NetHandler netClientHandler, INetworkManager manager, BaseModProxy mod) { managerLookups.put(manager, netClientHandler); ((BaseMod)mod).clientConnect((NetClientHandler)netClientHandler); @@ -165,7 +165,7 @@ public class ModLoaderClientHelper implements IModLoaderSidedHelper @Override - public boolean clientConnectionClosed(NetworkManager manager, BaseModProxy mod) + public boolean clientConnectionClosed(INetworkManager manager, BaseModProxy mod) { if (managerLookups.containsKey(manager)) { diff --git a/fml/client/net/minecraft/src/BaseMod.java b/fml/client/net/minecraft/src/BaseMod.java index 8f87f7a5a..410de23b4 100644 --- a/fml/client/net/minecraft/src/BaseMod.java +++ b/fml/client/net/minecraft/src/BaseMod.java @@ -422,7 +422,7 @@ public abstract class BaseMod implements cpw.mods.fml.common.modloader.BaseModPr * Called when a client logs out of the server. */ @Override - public void onClientLogout(NetworkManager mgr) + public void onClientLogout(INetworkManager mgr) { } diff --git a/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java b/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java index e3e4daa3d..8e2c09607 100644 --- a/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java +++ b/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java @@ -67,7 +67,7 @@ public class FMLRenderAccessLibrary return TextureFXManager.instance().getTextureDimensions(textureFX); } - public static void onTexturePackChange(RenderEngine engine, TexturePackBase texturePack, List textureFXList) + public static void onTexturePackChange(RenderEngine engine, ITexturePack texturePack, List textureFXList) { TextureFXManager.instance().onTexturePackChange(engine, texturePack, textureFXList); } diff --git a/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java b/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java index 6792e477b..6e1a1dc99 100644 --- a/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java +++ b/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java @@ -24,7 +24,7 @@ import net.minecraft.src.ItemStack; import net.minecraft.src.NetClientHandler; import net.minecraft.src.NetHandler; import net.minecraft.src.NetServerHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.World; import net.minecraft.src.WorldClient; @@ -59,7 +59,7 @@ public interface BaseModProxy void takenFromCrafting(EntityPlayer player, ItemStack item, IInventory craftMatrix); void takenFromFurnace(EntityPlayer player, ItemStack item); - public abstract void onClientLogout(NetworkManager manager); + public abstract void onClientLogout(INetworkManager manager); public abstract void onClientLogin(EntityPlayer player); diff --git a/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java b/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java index 9d908d271..a4dc87a59 100644 --- a/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java +++ b/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java @@ -5,7 +5,7 @@ import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; import net.minecraft.src.Entity; import net.minecraft.src.EntityPlayer; import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet250CustomPayload; public interface IModLoaderSidedHelper @@ -19,8 +19,8 @@ public interface IModLoaderSidedHelper void sendClientPacket(BaseModProxy mod, Packet250CustomPayload packet); - void clientConnectionOpened(NetHandler netClientHandler, NetworkManager manager, BaseModProxy mod); + void clientConnectionOpened(NetHandler netClientHandler, INetworkManager manager, BaseModProxy mod); - boolean clientConnectionClosed(NetworkManager manager, BaseModProxy mod); + boolean clientConnectionClosed(INetworkManager manager, BaseModProxy mod); } diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java index 91b3a5f2a..22df7691d 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java @@ -4,7 +4,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.src.EntityPlayer; import net.minecraft.src.NetHandler; import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet1Login; import cpw.mods.fml.common.network.IConnectionHandler; import cpw.mods.fml.common.network.Player; @@ -19,25 +19,25 @@ public class ModLoaderConnectionHandler implements IConnectionHandler } @Override - public void playerLoggedIn(Player player, NetHandler netHandler, NetworkManager manager) + public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager) { mod.onClientLogin((EntityPlayer)player); } @Override - public String connectionReceived(NetLoginHandler netHandler, NetworkManager manager) + public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) { return null; } @Override - public void connectionOpened(NetHandler netClientHandler, String server, int port, NetworkManager manager) + public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) { ModLoaderHelper.sidedHelper.clientConnectionOpened(netClientHandler, manager, mod); } @Override - public void connectionClosed(NetworkManager manager) + public void connectionClosed(INetworkManager manager) { if (!ModLoaderHelper.sidedHelper.clientConnectionClosed(manager, mod)) { @@ -47,13 +47,13 @@ public class ModLoaderConnectionHandler implements IConnectionHandler } @Override - public void clientLoggedIn(NetHandler nh, NetworkManager manager, Packet1Login login) + public void clientLoggedIn(NetHandler nh, INetworkManager manager, Packet1Login login) { mod.serverConnect(nh); } @Override - public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, NetworkManager manager) + public void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager) { ModLoaderHelper.sidedHelper.clientConnectionOpened(netClientHandler, manager, mod); } diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java index 415512656..9b1c47073 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java @@ -2,7 +2,7 @@ package cpw.mods.fml.common.modloader; import net.minecraft.src.EntityPlayer; import net.minecraft.src.EntityPlayerMP; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet250CustomPayload; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; @@ -17,7 +17,7 @@ public class ModLoaderPacketHandler implements IPacketHandler } @Override - public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player) + public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) { if (player instanceof EntityPlayerMP) { diff --git a/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java b/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java index c936a3753..bbe7db8f2 100644 --- a/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java +++ b/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java @@ -1,7 +1,7 @@ package cpw.mods.fml.common.network; import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; @@ -45,7 +45,7 @@ public class EntitySpawnAdjustmentPacket extends FMLPacket } @Override - public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) + public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) { FMLCommonHandler.instance().adjustEntityLocationOnClient(this); } diff --git a/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java b/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java index 0a2e0f458..dbe0ced59 100644 --- a/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java +++ b/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java @@ -13,7 +13,7 @@ import net.minecraft.src.Entity; import net.minecraft.src.EntityLiving; import net.minecraft.src.MathHelper; import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; @@ -168,7 +168,7 @@ public class EntitySpawnPacket extends FMLPacket } @Override - public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) + public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) { NetworkModHandler nmh = handler.findNetworkModHandler(networkId); ModContainer mc = nmh.getContainer(); diff --git a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java index 8a77a7b3b..29c4e3e61 100644 --- a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java +++ b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java @@ -20,7 +20,7 @@ import net.minecraft.src.Item; import net.minecraft.src.NetHandler; import net.minecraft.src.NetLoginHandler; import net.minecraft.src.NetServerHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet; import net.minecraft.src.Packet131MapData; import net.minecraft.src.Packet1Login; @@ -61,7 +61,7 @@ public class FMLNetworkHandler private Map networkIdLookup = Maps.newHashMap(); - public static void handlePacket250Packet(Packet250CustomPayload packet, NetworkManager network, NetHandler handler) + public static void handlePacket250Packet(Packet250CustomPayload packet, INetworkManager network, NetHandler handler) { String target = packet.field_73630_a; @@ -79,12 +79,12 @@ public class FMLNetworkHandler } } - public static void onConnectionEstablishedToServer(NetHandler clientHandler, NetworkManager manager, Packet1Login login) + public static void onConnectionEstablishedToServer(NetHandler clientHandler, INetworkManager manager, Packet1Login login) { NetworkRegistry.instance().clientLoggedIn(clientHandler, manager, login); } - private void handleFMLPacket(Packet250CustomPayload packet, NetworkManager network, NetHandler netHandler) + private void handleFMLPacket(Packet250CustomPayload packet, INetworkManager network, NetHandler netHandler) { FMLPacket pkt = FMLPacket.readPacket(packet.field_73629_c); String userName = ""; @@ -278,7 +278,7 @@ public class FMLNetworkHandler return networkModHandlers.keySet(); } - public static void handlePlayerLogin(EntityPlayerMP player, NetServerHandler netHandler, NetworkManager manager) + public static void handlePlayerLogin(EntityPlayerMP player, NetServerHandler netHandler, INetworkManager manager) { NetworkRegistry.instance().playerLoggedIn(player, netHandler, manager); GameRegistry.onPlayerLogin(player); @@ -300,17 +300,17 @@ public class FMLNetworkHandler } } - public static void onClientConnectionToRemoteServer(NetHandler netClientHandler, String server, int port, NetworkManager networkManager) + public static void onClientConnectionToRemoteServer(NetHandler netClientHandler, String server, int port, INetworkManager networkManager) { NetworkRegistry.instance().connectionOpened(netClientHandler, server, port, networkManager); } - public static void onClientConnectionToIntegratedServer(NetHandler netClientHandler, MinecraftServer server, NetworkManager networkManager) + public static void onClientConnectionToIntegratedServer(NetHandler netClientHandler, MinecraftServer server, INetworkManager networkManager) { NetworkRegistry.instance().connectionOpened(netClientHandler, server, networkManager); } - public static void onConnectionClosed(NetworkManager manager, EntityPlayer player) + public static void onConnectionClosed(INetworkManager manager, EntityPlayer player) { NetworkRegistry.instance().connectionClosed(manager, player); } diff --git a/fml/common/cpw/mods/fml/common/network/FMLPacket.java b/fml/common/cpw/mods/fml/common/network/FMLPacket.java index e67eae83b..806347452 100644 --- a/fml/common/cpw/mods/fml/common/network/FMLPacket.java +++ b/fml/common/cpw/mods/fml/common/network/FMLPacket.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.logging.Level; import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import com.google.common.base.Throwables; import com.google.common.primitives.Bytes; @@ -91,7 +91,7 @@ public abstract class FMLPacket public abstract FMLPacket consumePacket(byte[] data); - public abstract void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName); + public abstract void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName); { // TODO Auto-generated method stub diff --git a/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java b/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java index ef0be24b5..e0addd437 100644 --- a/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java +++ b/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java @@ -3,7 +3,7 @@ package cpw.mods.fml.common.network; import net.minecraft.server.MinecraftServer; import net.minecraft.src.NetHandler; import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet1Login; public interface IConnectionHandler @@ -16,7 +16,7 @@ public interface IConnectionHandler * @param netHandler * @param manager */ - void playerLoggedIn(Player player, NetHandler netHandler, NetworkManager manager); + void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager); /** * If you don't want the connection to continue, return a non-empty string here @@ -28,7 +28,7 @@ public interface IConnectionHandler * @param netHandler * @param manager */ - String connectionReceived(NetLoginHandler netHandler, NetworkManager manager); + String connectionReceived(NetLoginHandler netHandler, INetworkManager manager); /** * Fired when a remote connection is opened @@ -38,7 +38,7 @@ public interface IConnectionHandler * @param server * @param port */ - void connectionOpened(NetHandler netClientHandler, String server, int port, NetworkManager manager); + void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager); /** * * Fired when a local connection is opened @@ -48,7 +48,7 @@ public interface IConnectionHandler * @param netClientHandler * @param server */ - void connectionOpened(NetHandler netClientHandler, MinecraftServer server, NetworkManager manager); + void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager manager); /** * Fired when a connection closes @@ -57,7 +57,7 @@ public interface IConnectionHandler * * @param manager */ - void connectionClosed(NetworkManager manager); + void connectionClosed(INetworkManager manager); /** * Fired when the client established the connection to the server @@ -67,6 +67,6 @@ public interface IConnectionHandler * @param manager * @param login */ - void clientLoggedIn(NetHandler clientHandler, NetworkManager manager, Packet1Login login); + void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login); } diff --git a/fml/common/cpw/mods/fml/common/network/IPacketHandler.java b/fml/common/cpw/mods/fml/common/network/IPacketHandler.java index a80f12750..aee9fad52 100644 --- a/fml/common/cpw/mods/fml/common/network/IPacketHandler.java +++ b/fml/common/cpw/mods/fml/common/network/IPacketHandler.java @@ -1,6 +1,6 @@ package cpw.mods.fml.common.network; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet250CustomPayload; public interface IPacketHandler @@ -11,5 +11,5 @@ public interface IPacketHandler * @param packet The packet itself * @param player A dummy interface representing the player - it can be cast into a real player instance if needed */ - public void onPacketData(NetworkManager manager, Packet250CustomPayload packet, Player player); + public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player); } diff --git a/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java b/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java index 6cabf8347..6f4eebc37 100644 --- a/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Map.Entry; import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import com.google.common.collect.Maps; import com.google.common.io.ByteArrayDataInput; @@ -56,7 +56,7 @@ public class ModIdentifiersPacket extends FMLPacket } @Override - public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) + public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) { for (Entry idEntry : modIds.entrySet()) { diff --git a/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java b/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java index 6823691ae..3b754904b 100644 --- a/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java @@ -9,7 +9,7 @@ import java.util.Map.Entry; import java.util.Set; import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet250CustomPayload; import com.google.common.collect.Lists; @@ -73,10 +73,10 @@ public class ModListRequestPacket extends FMLPacket * This packet is executed on the client to evaluate the server's mod list against * the client * - * @see cpw.mods.fml.common.network.FMLPacket#execute(NetworkManager, FMLNetworkHandler, NetHandler, String) + * @see cpw.mods.fml.common.network.FMLPacket#execute(INetworkManager, FMLNetworkHandler, NetHandler, String) */ @Override - public void execute(NetworkManager mgr, FMLNetworkHandler handler, NetHandler netHandler, String userName) + public void execute(INetworkManager mgr, FMLNetworkHandler handler, NetHandler netHandler, String userName) { List missingMods = Lists.newArrayList(); Map modVersions = Maps.newHashMap(); diff --git a/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java b/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java index 16e86f9e9..0f51ca26b 100644 --- a/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java @@ -11,7 +11,7 @@ import java.util.logging.Logger; import net.minecraft.src.NetHandler; import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet250CustomPayload; import com.google.common.collect.Lists; @@ -78,7 +78,7 @@ public class ModListResponsePacket extends FMLPacket } @Override - public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) + public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) { Map indexedModList = Maps.newHashMap(Loader.instance().getIndexedModList()); List missingClientMods = Lists.newArrayList(); diff --git a/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java b/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java index d592502d7..045c899d5 100644 --- a/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java @@ -17,7 +17,7 @@ import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.common.versioning.VersionRange; import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; public class ModMissingPacket extends FMLPacket { @@ -86,7 +86,7 @@ public class ModMissingPacket extends FMLPacket } @Override - public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) + public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) { FMLCommonHandler.instance().getSidedDelegate().displayMissingMods(this); } diff --git a/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java b/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java index ac15df78f..e86ea046a 100644 --- a/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java +++ b/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java @@ -13,7 +13,7 @@ import net.minecraft.src.EntityPlayerMP; import net.minecraft.src.NetHandler; import net.minecraft.src.NetLoginHandler; import net.minecraft.src.NetServerHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet131MapData; import net.minecraft.src.Packet1Login; import net.minecraft.src.Packet250CustomPayload; @@ -159,7 +159,7 @@ public class NetworkRegistry chatListeners.add(listener); } - void playerLoggedIn(EntityPlayerMP player, NetServerHandler netHandler, NetworkManager manager) + void playerLoggedIn(EntityPlayerMP player, NetServerHandler netHandler, INetworkManager manager) { generateChannelRegistration(player, netHandler, manager); for (IConnectionHandler handler : connectionHandlers) @@ -168,7 +168,7 @@ public class NetworkRegistry } } - String connectionReceived(NetLoginHandler netHandler, NetworkManager manager) + String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) { for (IConnectionHandler handler : connectionHandlers) { @@ -181,7 +181,7 @@ public class NetworkRegistry return null; } - void connectionOpened(NetHandler netClientHandler, String server, int port, NetworkManager networkManager) + void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager networkManager) { for (IConnectionHandler handler : connectionHandlers) { @@ -189,7 +189,7 @@ public class NetworkRegistry } } - void connectionOpened(NetHandler netClientHandler, MinecraftServer server, NetworkManager networkManager) + void connectionOpened(NetHandler netClientHandler, MinecraftServer server, INetworkManager networkManager) { for (IConnectionHandler handler : connectionHandlers) { @@ -197,7 +197,7 @@ public class NetworkRegistry } } - void clientLoggedIn(NetHandler clientHandler, NetworkManager manager, Packet1Login login) + void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login) { generateChannelRegistration(clientHandler.getPlayer(), clientHandler, manager); for (IConnectionHandler handler : connectionHandlers) @@ -206,7 +206,7 @@ public class NetworkRegistry } } - void connectionClosed(NetworkManager manager, EntityPlayer player) + void connectionClosed(INetworkManager manager, EntityPlayer player) { for (IConnectionHandler handler : connectionHandlers) { @@ -215,7 +215,7 @@ public class NetworkRegistry activeChannels.removeAll(player); } - void generateChannelRegistration(EntityPlayer player, NetHandler netHandler, NetworkManager manager) + void generateChannelRegistration(EntityPlayer player, NetHandler netHandler, INetworkManager manager) { Packet250CustomPayload pkt = new Packet250CustomPayload(); pkt.field_73630_a = "REGISTER"; @@ -224,7 +224,7 @@ public class NetworkRegistry manager.func_74429_a(pkt); } - void handleCustomPacket(Packet250CustomPayload packet, NetworkManager network, NetHandler handler) + void handleCustomPacket(Packet250CustomPayload packet, INetworkManager network, NetHandler handler) { if ("REGISTER".equals(packet.field_73630_a)) { @@ -241,7 +241,7 @@ public class NetworkRegistry } - private void handlePacket(Packet250CustomPayload packet, NetworkManager network, Player player) + private void handlePacket(Packet250CustomPayload packet, INetworkManager network, Player player) { String channel = packet.field_73630_a; for (IPacketHandler handler : Iterables.concat(universalPacketHandlers.get(channel), player instanceof EntityPlayerMP ? serverPacketHandlers.get(channel) : clientPacketHandlers.get(channel))) diff --git a/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java b/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java index cbc8be543..cc1d3b296 100644 --- a/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java +++ b/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java @@ -2,7 +2,7 @@ package cpw.mods.fml.common.network; import net.minecraft.src.EntityPlayer; import net.minecraft.src.NetHandler; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; @@ -49,7 +49,7 @@ public class OpenGuiPacket extends FMLPacket } @Override - public void execute(NetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) + public void execute(INetworkManager network, FMLNetworkHandler handler, NetHandler netHandler, String userName) { EntityPlayer player = netHandler.getPlayer(); player.openGui(networkId, modGuiId, player.field_70170_p, x, y, z); diff --git a/fml/refactorscripts/INetworkManagerRefactoring.xml b/fml/refactorscripts/INetworkManagerRefactoring.xml new file mode 100644 index 000000000..09b468512 --- /dev/null +++ b/fml/refactorscripts/INetworkManagerRefactoring.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/fml/refactorscripts/ITexturePackRefactoring.xml b/fml/refactorscripts/ITexturePackRefactoring.xml new file mode 100644 index 000000000..2305b259b --- /dev/null +++ b/fml/refactorscripts/ITexturePackRefactoring.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/fml/refactorscripts/README.txt b/fml/refactorscripts/README.txt new file mode 100644 index 000000000..877f47236 --- /dev/null +++ b/fml/refactorscripts/README.txt @@ -0,0 +1,4 @@ +These are some hopefully helpful refactor scripts for eclipse. They will refactor the 1.3.2->1.4 INetworkManager and ITexturePack code changes for your codebase. + +To run you should be able to just "Apply script" the appropriate script on your MCP based mod code and it'll fix up the refs for you. +