keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix for new names INetworkManager and ITexturePack. I also provide refactoring scripts for both, for your use...

This commit is contained in:
Christian 2012-10-20 17:07:59 -04:00
parent c7002207fb
commit 8ce9b05d8b
25 changed files with 88 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fml/client/cpw/mods/fml/client/FMLTextureFX.java
View File

@ -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);
}

4
fml/client/cpw/mods/fml/client/ITextureFX.java
View File

@ -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);

12
fml/client/cpw/mods/fml/client/TextureFXManager.java
View File

@ -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<TextureFX> effects)
public void onTexturePackChange(RenderEngine engine, ITexturePack texturepack, List<TextureFX> effects)
{
pruneOldTextureFX(texturepack, effects);
@ -188,7 +188,7 @@ public class TextureFXManager
private HashMap<Integer, Dimension> textureDims = new HashMap<Integer, Dimension>();
private IdentityHashMap<TextureFX, Integer> effectTextures = new IdentityHashMap<TextureFX, Integer>();
private TexturePackBase earlyTexturePack;
private ITexturePack earlyTexturePack;
public void setTextureDimensions(int id, int width, int height, List<TextureFX> 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<TextureFX> effects)
public void pruneOldTextureFX(ITexturePack var1, List<TextureFX> effects)
{
ListIterator<TextureFX> li = addedTextureFX.listIterator();
while (li.hasNext())

8
fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
View File

@ -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<NetworkManager,NetHandler> managerLookups = new MapMaker().weakKeys().weakValues().makeMap();
private Map<INetworkManager,NetHandler> 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))
{

2
fml/client/net/minecraft/src/BaseMod.java
View File

@ -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)
{
}

2
fml/client/net/minecraft/src/FMLRenderAccessLibrary.java
View File

@ -67,7 +67,7 @@ public class FMLRenderAccessLibrary
return TextureFXManager.instance().getTextureDimensions(textureFX);
}
public static void onTexturePackChange(RenderEngine engine, TexturePackBase texturePack, List<TextureFX> textureFXList)
public static void onTexturePackChange(RenderEngine engine, ITexturePack texturePack, List<TextureFX> textureFXList)
{
TextureFXManager.instance().onTexturePackChange(engine, texturePack, textureFXList);
}

4
fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java
View File

@ -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);

6
fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java
View File

@ -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);
}

14
fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java
View File

@ -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);
}

4
fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java
View File

@ -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)
{

4
fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java
View File

@ -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);
}

4
fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java
View File

@ -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();

16
fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
View File

@ -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<Integer, NetworkModHandler> 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);
}

4
fml/common/cpw/mods/fml/common/network/FMLPacket.java
View File

@ -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

14
fml/common/cpw/mods/fml/common/network/IConnectionHandler.java
View File

@ -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);
}

4
fml/common/cpw/mods/fml/common/network/IPacketHandler.java
View File

@ -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);
}

4
fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java
View File

@ -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<String,Integer> idEntry : modIds.entrySet())
{

6
fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java
View File

@ -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<String> missingMods = Lists.newArrayList();
Map<String,String> modVersions = Maps.newHashMap();

4
fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java
View File

@ -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<String, ModContainer> indexedModList = Maps.newHashMap(Loader.instance().getIndexedModList());
List<String> missingClientMods = Lists.newArrayList();

4
fml/common/cpw/mods/fml/common/network/ModMissingPacket.java
View File

@ -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);
}

20
fml/common/cpw/mods/fml/common/network/NetworkRegistry.java
View File

@ -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)))

4
fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java
View File

@ -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);

5
fml/refactorscripts/INetworkManagerRefactoring.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<session version="1.0">
<refactoring comment="Rename type &apos;net.minecraft.src.INetworkManager&apos; to &apos;NetworkManager&apos;&#x0A;- Original project: &apos;FML&apos;&#x0A;- Original element: &apos;net.minecraft.src.INetworkManager&apos;&#x0A;- Renamed element: &apos;net.minecraft.src.NetworkManager&apos;&#x0A;- Update references to refactored element&#x0A;- Update textual occurrences in comments and strings" description="Rename type &apos;INetworkManager&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/mc-common&lt;net.minecraft.src{INetworkManager.java[INetworkManager" matchStrategy="1" name="NetworkManager" project="FML" qualified="false" references="true" similarDeclarations="false" textual="false" version="1.0"/>
<refactoring comment="Rename type &apos;net.minecraft.src.NetworkManager&apos; to &apos;INetworkManager&apos;&#x0A;- Original project: &apos;FML&apos;&#x0A;- Original element: &apos;net.minecraft.src.NetworkManager&apos;&#x0A;- Renamed element: &apos;net.minecraft.src.INetworkManager&apos;&#x0A;- Update references to refactored element&#x0A;- Update textual occurrences in comments and strings" description="Rename type &apos;NetworkManager&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/mc-common&lt;net.minecraft.src{NetworkManager.java[NetworkManager" matchStrategy="1" name="INetworkManager" project="FML" qualified="false" references="true" similarDeclarations="false" textual="false" version="1.0"/>
</session>

5
fml/refactorscripts/ITexturePackRefactoring.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<session version="1.0">
<refactoring comment="Rename type &apos;net.minecraft.src.ITexturePack&apos; to &apos;TexturePackBase&apos;&#x0A;- Original project: &apos;FML&apos;&#x0A;- Original element: &apos;net.minecraft.src.ITexturePack&apos;&#x0A;- Renamed element: &apos;net.minecraft.src.TexturePackBase&apos;&#x0A;- Update references to refactored element&#x0A;- Update textual occurrences in comments and strings" description="Rename type &apos;ITexturePack&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/mc-client&lt;net.minecraft.src{ITexturePack.java[ITexturePack" matchStrategy="1" name="TexturePackBase" project="FML" qualified="false" references="true" similarDeclarations="false" textual="false" version="1.0"/>
<refactoring comment="Rename type &apos;net.minecraft.src.TexturePackBase&apos; to &apos;ITexturePack&apos;&#x0A;- Original project: &apos;FML&apos;&#x0A;- Original element: &apos;net.minecraft.src.TexturePackBase&apos;&#x0A;- Renamed element: &apos;net.minecraft.src.ITexturePack&apos;&#x0A;- Update references to refactored element&#x0A;- Update textual occurrences in comments and strings" description="Rename type &apos;TexturePackBase&apos;" flags="589830" id="org.eclipse.jdt.ui.rename.type" input="/mc-client&lt;net.minecraft.src{TexturePackBase.java[TexturePackBase" matchStrategy="1" name="ITexturePack" project="FML" qualified="false" references="true" similarDeclarations="false" textual="false" version="1.0"/>
</session>

4
fml/refactorscripts/README.txt Normal file
View File

@ -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.