mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 13:09:59 +00:00
Slight reorganization of texture ticking - accomodate optifine
This commit is contained in:
1 parent
174d6691bd
commit
de8a5cfc8b
5 files changed
+33
-3
No files matched your search
@@ -448,6 +448,7 @@ public class FMLCommonHandler
|
||||
// Ignore- forge isn't loaded
|
||||
}
|
||||
}
|
||||
brandings.addAll(sidedDelegate.getAdditionalBrandingInformation());
|
||||
try {
|
||||
Properties props=new Properties();
|
||||
props.load(FMLCommonHandler.class.getClassLoader().getResourceAsStream("fmlbranding.properties"));
|
||||
|
||||
@@ -3,6 +3,7 @@ package cpw.mods.fml.common;
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.List;
|
||||
import java.util.Properties;
|
||||
import java.util.logging.Logger;
|
||||
|
||||
@@ -24,4 +25,5 @@ public interface IFMLSidedHandler
|
||||
void profileStart(String profileLabel);
|
||||
void profileEnd();
|
||||
ModProperty getModLoaderPropertyFor(Field f);
|
||||
List<String> getAdditionalBrandingInformation();
|
||||
}
|
||||
@@ -174,6 +174,7 @@ public class Loader
|
||||
}
|
||||
|
||||
log.info(String.format("Forge Mod Loader version %s.%s.%s.%s for Minecraft %s loading", major, minor, rev, build, mcversion));
|
||||
modClassLoader = new ModClassLoader();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -366,7 +367,6 @@ public class Loader
|
||||
}
|
||||
|
||||
state = State.LOADING;
|
||||
modClassLoader = new ModClassLoader();
|
||||
log.fine("Attempting to load mods contained in the minecraft jar file and associated classes");
|
||||
File[] minecraftSources=modClassLoader.getParentSources();
|
||||
if (minecraftSources.length==1 && minecraftSources[0].isFile()) {
|
||||
|
||||
Reference in new issue
Block a user