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

FML's metabolic processes are now history. FML's off the twig. FML's kicked the bucket, FML's shuffled off this mortal coil, 

run down the curtain and joined the bleedin' choir invisible!! THIS IS AN EX-PROJECT!
This commit is contained in:
cpw 2015-08-02 00:20:19 -04:00
parent dfd62a3bd8
commit c2523c685a
7 changed files with 13 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraftforge/classloading/FMLForgePlugin.java
View File

@ -38,6 +38,6 @@ public class FMLForgePlugin implements IFMLLoadingPlugin
@Override
public String getAccessTransformerClass()
{
return "net.minecraftforge.transformers.ForgeAccessTransformer";
return null;
}
}

5
src/main/java/net/minecraftforge/common/ForgeVersion.java
View File

@ -26,7 +26,10 @@ public class ForgeVersion
public static final int revisionVersion = 3;
//This number is incremented every time Jenkins builds Forge, and never reset. Should always be 0 in the repo code.
public static final int buildVersion = 0;
// This is the minecraft version we're building for - used in various places in Forge/FML code
public static final String mcVersion = "1.8";
// This is the MCP data version we're using
public static final String mcpVersion = "9.10";
private static Status status = PENDING;
private static String target = null;

2
src/main/java/net/minecraftforge/fml/common/asm/transformers/AccessTransformer.java
View File

@ -93,7 +93,7 @@ public class AccessTransformer implements IClassTransformer
public AccessTransformer() throws IOException
{
this("fml_at.cfg");
this("forge_at.cfg");
}
protected AccessTransformer(String rulesFile) throws IOException
{

1
src/main/java/net/minecraftforge/fml/relauncher/FMLCorePlugin.java
View File

@ -21,7 +21,6 @@ public class FMLCorePlugin implements IFMLLoadingPlugin
{
return new String[] {
"net.minecraftforge.fml.common.asm.transformers.BlamingTransformer",
"net.minecraftforge.fml.common.asm.transformers.MarkerTransformer",
"net.minecraftforge.fml.common.asm.transformers.SideTransformer",
"net.minecraftforge.fml.common.asm.transformers.EventSubscriptionTransformer",
"net.minecraftforge.fml.common.asm.transformers.EventSubscriberTransformer",

34
src/main/java/net/minecraftforge/fml/relauncher/FMLInjectionData.java
View File

@ -13,14 +13,11 @@
package net.minecraftforge.fml.relauncher;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import org.apache.logging.log4j.Level;
import net.minecraft.launchwrapper.LaunchClassLoader;
import net.minecraftforge.common.ForgeVersion;
public class FMLInjectionData
{
@ -31,35 +28,18 @@ public class FMLInjectionData
static String build;
static String mccversion;
static String mcpversion;
static String deobfuscationDataHash;
public static List<String> containers = new ArrayList<String>();
static void build(File mcHome, LaunchClassLoader classLoader)
{
minecraftHome = mcHome;
InputStream stream = classLoader.getResourceAsStream("fmlversion.properties");
Properties properties = new Properties();
if (stream != null)
{
try
{
properties.load(stream);
}
catch (IOException ex)
{
FMLRelaunchLog.log(Level.ERROR, ex, "Could not get FML version information - corrupted installation detected!");
}
}
major = properties.getProperty("fmlbuild.major.number", "missing");
minor = properties.getProperty("fmlbuild.minor.number", "missing");
rev = properties.getProperty("fmlbuild.revision.number", "missing");
build = properties.getProperty("fmlbuild.build.number", "missing");
mccversion = properties.getProperty("fmlbuild.mcversion", "missing");
mcpversion = properties.getProperty("fmlbuild.mcpversion", "missing");
deobfuscationDataHash = properties.getProperty("fmlbuild.deobfuscation.hash","deadbeef");
major = String.valueOf(ForgeVersion.majorVersion);
minor = String.valueOf(ForgeVersion.minorVersion);
rev = String.valueOf(ForgeVersion.revisionVersion);
build = String.valueOf(ForgeVersion.buildVersion);
mccversion = ForgeVersion.mcVersion;
mcpversion = ForgeVersion.mcpVersion;
}
static String debfuscationDataName()

13
src/main/java/net/minecraftforge/transformers/ForgeAccessTransformer.java
View File

@ -1,13 +0,0 @@
package net.minecraftforge.transformers;
import java.io.IOException;
import net.minecraftforge.fml.common.asm.transformers.AccessTransformer;
public class ForgeAccessTransformer extends AccessTransformer
{
public ForgeAccessTransformer() throws IOException
{
super("forge_at.cfg");
}
}

6
src/main/resources/fmlversion.properties
View File

@ -1,6 +0,0 @@
fmlbuild.major.number=8
fmlbuild.minor.number=0
fmlbuild.revision.number=76
fmlbuild.build.number=1404
fmlbuild.mcversion=1.8
fmlbuild.mcpversion=9.10