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

Tidy up some more todos

Browse source
This commit is contained in:
cpw 2016-07-27 10:52:48 -04:00
parent 056ff67a81
commit 543156a008
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/minecraftforge/fml/client/IModGuiFactory.java
View file

@ -109,7 +109,9 @@ public interface IModGuiFactory {
* *
* @author cpw * @author cpw
* *
* TODO remove in 1.11 - this was never fully implemented and will be removed
*/ */
@Deprecated
public interface RuntimeOptionGuiHandler { public interface RuntimeOptionGuiHandler {
/** /**
* Called to add widgets to the screen, such as buttons. * Called to add widgets to the screen, such as buttons.

1
src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
View file

@ -69,6 +69,7 @@ import net.minecraftforge.fml.relauncher.Side;
import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Level;
// TODO build test suites to validate the behaviour of this stuff and make it less annoyingly magical
public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet<?>> implements ChannelOutboundHandler { public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet<?>> implements ChannelOutboundHandler {
private static boolean DEBUG_HANDSHAKE = Boolean.parseBoolean(System.getProperty("fml.debugNetworkHandshake", "false")); private static boolean DEBUG_HANDSHAKE = Boolean.parseBoolean(System.getProperty("fml.debugNetworkHandshake", "false"));
private static enum ConnectionState { private static enum ConnectionState {

2
src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
View file

@ -364,7 +364,7 @@ public class PersistentRegistryManager
newRegistry.loadIds(frozenRegistry.getEntriesNotIn(newRegistry), Maps.<ResourceLocation, Integer>newLinkedHashMap(), remaps.get(registryName), frozenRegistry, registryName); newRegistry.loadIds(frozenRegistry.getEntriesNotIn(newRegistry), Maps.<ResourceLocation, Integer>newLinkedHashMap(), remaps.get(registryName), frozenRegistry, registryName);
} }
// TODO: Remove when we don't care about loading 1.7.10(?) worlds? // TODO: Remove in 1.11 when we don't care about loading 1.8 worlds and below
private static ResourceLocation getFixedName(ResourceLocation registryName) private static ResourceLocation getFixedName(ResourceLocation registryName)
{ {
//Translate old names //Translate old names

3
src/main/java/net/minecraftforge/fml/relauncher/IFMLLoadingPlugin.java
View file

@ -57,7 +57,8 @@ public interface IFMLLoadingPlugin
* main thread, to perform any additional setup this coremod may require. It will be * main thread, to perform any additional setup this coremod may require. It will be
* run <strong>prior</strong> to Minecraft starting, so it CANNOT operate on minecraft * run <strong>prior</strong> to Minecraft starting, so it CANNOT operate on minecraft
* itself. The game will deliberately crash if this code is detected to trigger a * itself. The game will deliberately crash if this code is detected to trigger a
* minecraft class loading (TODO: implement crash ;) ) * minecraft class loading
* TODO: implement crash ;)
*/ */
String getSetupClass(); String getSetupClass();