upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-14 01:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check in patches. Add in some network timeout tweaking values so you can debug the network.

Browse Source
This commit is contained in:
Christian committed 2013-12-06 08:07:09 -05:00
1 parent 9f928963f2
commit 58f7487cfa
9 files changed
+114 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/cpw/mods/fml/common/FMLCommonHandler.java
+4 -2
View File
@@ -78,6 +78,7 @@ public class FMLCommonHandler
private Class<?> forge;
private boolean noForge;
private List<String> brandings;
private List<String> brandingsNoMC;
private List<ICrashCallable> crashCallables = Lists.newArrayList(Loader.instance().getCallableCrashInformation());
private Set<SaveHandler> handlerSet = Sets.newSetFromMap(new MapMaker().weakKeys().<SaveHandler,Boolean>makeMap());
@@ -244,15 +245,16 @@ public class FMLCommonHandler
int aModCount = Loader.instance().getActiveModList().size();
brd.add(String.format("%d mod%s loaded, %d mod%s active", tModCount, tModCount!=1 ? "s" :"", aModCount, aModCount!=1 ? "s" :"" ));
brandings = brd.build();
brandingsNoMC = brandings.subList(1, brandings.size());
}
}
public List<String> getBrandings()
public List<String> getBrandings(boolean includeMC)
{
if (brandings == null)
{
computeBranding();
}
return ImmutableList.copyOf(brandings);
return includeMC ? ImmutableList.copyOf(brandings) : ImmutableList.copyOf(brandingsNoMC);
}
public IFMLSidedHandler getSidedDelegate()
src/main/java/cpw/mods/fml/common/network/FMLNetworkHandler.java
+6 -1
View File
@@ -12,6 +12,8 @@
package cpw.mods.fml.common.network;
import org.apache.logging.log4j.core.helpers.Integers;
import cpw.mods.fml.common.network.handshake.NetworkDispatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -25,7 +27,10 @@ import net.minecraft.world.World;
public class FMLNetworkHandler
{
/* private static final int FML_HASH = Hashing.murmur3_32().hashString("FML").asInt();
public static final int READ_TIMEOUT = Integers.parseInt(System.getProperty("fml.readTimeout","30"),30);
public static final int LOGIN_TIMEOUT = Integers.parseInt(System.getProperty("fml.loginTimeout","600"),600);
/* private static final int FML_HASH = Hashing.murmur3_32().hashString("FML").asInt();
private static final int PROTOCOL_VERSION = 0x2;
private static final FMLNetworkHandler INSTANCE = new FMLNetworkHandler();