xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Normalize patches

Browse Source
This commit is contained in:
Prototik
2015-06-01 21:32:10 +07:00
parent 86f83acb7e
commit c427f60e15
16 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/cpw/mods/fml/common/discovery/ModDiscoverer.java.patch
View File

@ -15,14 +15,14 @@
}
+ if (!"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) {
+ java.util.Iterator<ModContainer> iterator = modList.iterator();
+ while(iterator.hasNext()) {
+ ModContainer container = iterator.next();
+ if ("FastCraft".equals(container.getModId())) {
+ FMLLog.log(Level.WARN, "Found FastCraft mod, removing it...");
+ iterator.remove();
+ }
+ }
+ java.util.Iterator<ModContainer> iterator = modList.iterator();
+ while(iterator.hasNext()) {
+ ModContainer container = iterator.next();
+ if ("FastCraft".equals(container.getModId())) {
+ FMLLog.log(Level.WARN, "Found FastCraft mod, removing it...");
+ iterator.remove();
+ }
+ }
+ }
+
return modList;

4
patches/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java.patch
View File

@ -10,8 +10,8 @@
+ io.netty.util.Attribute<NetworkDispatcher> attr = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER);
+ if (attr != null)
+ {
+ NetworkDispatcher dispatcher = attr.getAndRemove();
+ if (dispatcher != null) dispatcher.completeHandshake(msg.target);
+ NetworkDispatcher dispatcher = attr.getAndRemove();
+ if (dispatcher != null) dispatcher.completeHandshake(msg.target);
+ }
+ // Cauldron end
}

12
patches/cpw/mods/fml/relauncher/CoreModManager.java.patch
View File

@ -36,7 +36,7 @@
@Override
public void injectIntoClassLoader(LaunchClassLoader classLoader)
{
+ // Cauldron end
+ // Cauldron end
FMLRelaunchLog.fine("Injecting coremod %s {%s} class transformers", name, coreModInstance.getClass().getName());
if (coreModInstance.getASMTransformerClass() != null) for (String transformer : coreModInstance.getASMTransformerClass())
{
@ -74,10 +74,10 @@
String cascadedTweaker = mfAttributes.getValue("TweakClass");
if (cascadedTweaker != null)
{
+ if ("fastcraft.Tweaker".equals(cascadedTweaker) && !"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) {
+ FMLRelaunchLog.info("Found FastCraft tweaker, skipping...");
+ continue;
+ }
+ if ("fastcraft.Tweaker".equals(cascadedTweaker) && !"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) {
+ FMLRelaunchLog.info("Found FastCraft tweaker, skipping...");
+ continue;
+ }
FMLRelaunchLog.info("Loading tweaker %s from %s", cascadedTweaker, coreMod.getName());
Integer sortOrder = Ints.tryParse(Strings.nullToEmpty(mfAttributes.getValue("TweakOrder")));
sortOrder = (sortOrder == null ? Integer.valueOf(0) : sortOrder);
@ -87,7 +87,7 @@
}
+ if ("fastcraft.LoadingPlugin".equals(fmlCorePlugin) && !"false".equals(System.getProperty("kcauldron.fastcraft.disable", "true"))) {
+ FMLRelaunchLog.warning("Found FastCraft coremod, skipping...");
+ continue;
+ continue;
+ }
// Support things that are mod jars, but not FML mod jars
try