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

A few tweaks, things are starting to work now..

Browse source
This commit is contained in:
cpw 2015-11-13 02:59:43 -05:00
parent da03639bd7
commit fe7f713b67
8 changed files with 22 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch
View file

@ -30,7 +30,7 @@
- this.drawString(this.fontRendererObj, s, 2, this.height - 10, -1);
+ java.util.List<String> brandings = com.google.common.collect.Lists.reverse(net.minecraftforge.fml.common.FMLCommonHandler.instance().getBrandings(true));
+ for (int brdline = 0; i < brandings.size(); i++)
+ for (int brdline = 0; brdline < brandings.size(); brdline++)
+ {
+ String brd = brandings.get(brdline);
+ if (!com.google.common.base.Strings.isNullOrEmpty(brd))

11
patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
View file

@ -94,18 +94,19 @@
int j1 = Math.min(j, k);
int k1 = MathHelper.calculateLogBaseTwo(j1);
@@ -175,8 +207,10 @@
@@ -175,8 +207,11 @@
this.mipmapLevels = k1;
}
+ bar = net.minecraftforge.fml.common.ProgressManager.push("Mipmap generation", skipFirst ? 0 : this.mapRegisteredSprites.size());
for (final TextureAtlasSprite textureatlassprite1 : this.mapRegisteredSprites.values())
{
+ if (skipFirst) break;
+ bar.step(textureatlassprite1.getIconName());
try
{
textureatlassprite1.generateMipmaps(this.mipmapLevels);
@@ -213,9 +247,13 @@
@@ -213,9 +248,13 @@
this.missingImage.generateMipmaps(this.mipmapLevels);
stitcher.addSprite(this.missingImage);
@ -119,7 +120,7 @@
stitcher.doStitch();
}
catch (StitcherException stitcherexception)
@@ -224,9 +262,11 @@
@@ -224,9 +263,11 @@
}
logger.info("Created: {}x{} {}-atlas", new Object[] {Integer.valueOf(stitcher.getCurrentWidth()), Integer.valueOf(stitcher.getCurrentHeight()), this.basePath});
@ -131,7 +132,7 @@
for (TextureAtlasSprite textureatlassprite2 : stitcher.getStichSlots())
{
String s = textureatlassprite2.getIconName();
@@ -256,6 +296,13 @@
@@ -256,6 +297,13 @@
{
textureatlassprite3.copyFrom(this.missingImage);
}
@ -145,7 +146,7 @@
}
private ResourceLocation completeResourceLocation(ResourceLocation location, int p_147634_2_)
@@ -319,4 +366,37 @@
@@ -319,4 +367,37 @@
{
return this.missingImage;
}

8
src/main/java/net/minecraftforge/common/ForgeModContainer.java
View file

@ -89,14 +89,14 @@ public class ForgeModContainer extends DummyModContainer implements WorldAccessC
ModMetadata meta = getMetadata();
meta.modId = "Forge";
meta.name = "Minecraft Forge";
meta.version = String.format("%d.%d.%d.%d", majorVersion, minorVersion, revisionVersion, buildVersion);
meta.version = ForgeVersion.getVersion();
meta.credits = "Made possible with help from many people";
meta.authorList = Arrays.asList("LexManos", "Cpw");
meta.authorList = Arrays.asList("LexManos", "cpw");
meta.description = "Minecraft Forge is a common open source API allowing a broad range of mods " +
"to work cooperatively together. It allows many mods to be created without " +
"them editing the main Minecraft code.";
meta.url = "http://MinecraftForge.net";
meta.updateUrl = "http://MinecraftForge.net/forum/index.php/topic,5.0.html";
meta.url = "http://minecraftforge.net";
meta.updateUrl = "http://minecraftforge.net/forum/index.php/topic,5.0.html";
meta.screenshots = new String[0];
meta.logoFile = "/forge_logo.png";
try {

4
src/main/java/net/minecraftforge/common/ForgeVersion.java
View file

@ -39,9 +39,9 @@ public class ForgeVersion
//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";
public static final String mcVersion = "1.8.8";
// This is the MCP data version we're using
public static final String mcpVersion = "9.10";
public static final String mcpVersion = "9.18";
private static Status status = PENDING;
private static String target = null;

5
src/main/java/net/minecraftforge/common/MinecraftForge.java
View file

@ -166,9 +166,4 @@ public class MinecraftForge
// Load before all the mods, so MC owns the MC fluids
FluidRegistry.validateFluidRegistry();
}
public static String getBrandingVersion()
{
return "Minecraft Forge "+ ForgeVersion.getVersion();
}
}

43
src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
View file

@ -49,6 +49,8 @@ import net.minecraft.util.IThreadListener;
import net.minecraft.world.World;
import net.minecraft.world.storage.SaveHandler;
import net.minecraft.world.storage.WorldInfo;
import net.minecraftforge.common.ForgeVersion;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.eventhandler.EventBus;
import net.minecraftforge.fml.common.gameevent.InputEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
@ -143,10 +145,8 @@ public class FMLCommonHandler
public void beginLoading(IFMLSidedHandler handler)
{
sidedDelegate = handler;
FMLLog.log("MinecraftForge", Level.INFO, "Attempting early MinecraftForge initialization");
callForgeMethod("initialize");
callForgeMethod("registerCrashCallable");
FMLLog.log("MinecraftForge", Level.INFO, "Completed early MinecraftForge initialization");
MinecraftForge.initialize();
// MinecraftForge.registerCrashCallable();
}
/**
@ -213,34 +213,6 @@ public class FMLCommonHandler
}
private Class<?> findMinecraftForge()
{
if (forge==null && !noForge)
{
try {
forge = Class.forName("net.minecraftforge.common.MinecraftForge");
} catch (Exception ex) {
noForge = true;
}
}
return forge;
}
private Object callForgeMethod(String method)
{
if (noForge)
return null;
try
{
return findMinecraftForge().getMethod(method).invoke(null);
}
catch (Exception e)
{
// No Forge installation
return null;
}
}
public void computeBranding()
{
if (brandings == null)
@ -248,12 +220,7 @@ public class FMLCommonHandler
Builder<String> brd = ImmutableList.<String>builder();
brd.add(Loader.instance().getMCVersionString());
brd.add(Loader.instance().getMCPVersionString());
brd.add("FML v"+Loader.instance().getFMLVersionString());
String forgeBranding = (String) callForgeMethod("getBrandingVersion");
if (!Strings.isNullOrEmpty(forgeBranding))
{
brd.add(forgeBranding);
}
brd.add("Powered by Forge " + ForgeVersion.getVersion());
if (sidedDelegate!=null)
{
brd.addAll(sidedDelegate.getAdditionalBrandingInformation());

4
src/main/java/net/minecraftforge/fml/common/Loader.java
View file

@ -114,7 +114,7 @@ import com.google.gson.JsonParser;
*/
public class Loader
{
public static final String MC_VERSION = "1.8";
public static final String MC_VERSION = "1.8.8";
private static final Splitter DEPENDENCYPARTSPLITTER = Splitter.on(":").omitEmptyStrings().trimResults();
private static final Splitter DEPENDENCYSPLITTER = Splitter.on(";").omitEmptyStrings().trimResults();
/**
@ -833,7 +833,7 @@ public class Loader
public String getMCPVersionString()
{
return String.format("MCP v%s", mcpversion);
return String.format("MCP %s", mcpversion);
}
public void serverStopped()

4
src/main/resources/mcpmod.info
View file

@ -3,8 +3,8 @@
"modid": "mcp",
"name": "Minecraft Coder Pack",
"description": "Modding toolkit to decompile and deobfuscate the Minecraft client and server files.",
"version": "9.05",
"mcversion": "1.8.0",
"version": "9.18",
"mcversion": "1.8.8",
"logoFile": "/mcplogo.png",
"url": "http://www.modcoderpack.com/website/",
"updateUrl": "",