Skip to content

Commit

Permalink
mantle runs
Browse files Browse the repository at this point in the history
NOTE: rendering engine shouldnt be null but seems to be
  • Loading branch information
progwml6 committed Dec 31, 2013
1 parent f374ca2 commit 81d4605
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/mantle/client/MProxyClient.java
Expand Up @@ -26,7 +26,7 @@ public class MProxyClient extends MProxyCommon
public void registerRenderer ()
{
Minecraft mc = Minecraft.getMinecraft();
smallFontRenderer = new SmallFontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false);
smallFontRenderer = new SmallFontRenderer(mc.gameSettings, new ResourceLocation("minecraft:textures/font/ascii.png"), mc.renderEngine, false);
}

public static Map<String, Class<? extends BookPage>> pageClasses = new HashMap<String, Class<? extends BookPage>>();
Expand Down
9 changes: 6 additions & 3 deletions src/mantle/client/block/SmallFontRenderer.java
Expand Up @@ -8,6 +8,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Random;
import static mantle.lib.CoreRepo.*;

import javax.imageio.ImageIO;

Expand Down Expand Up @@ -105,10 +106,12 @@ public class SmallFontRenderer implements IResourceManagerReloadListener
public SmallFontRenderer(GameSettings par1GameSettings, ResourceLocation par2ResourceLocation, TextureManager par3TextureManager, boolean par4)
{
this.field_111273_g = par2ResourceLocation;
logger.error(this.field_111273_g.toString() + " " + this.field_111273_g.getResourcePath());
this.renderEngine = par3TextureManager;
this.unicodeFlag = true;
par3TextureManager.bindTexture(this.field_111273_g);

if (this.renderEngine != null)
this.renderEngine.bindTexture(par2ResourceLocation);
//Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation("textures/font/ascii.png"));
for (int i = 0; i < 32; ++i)
{
int j = (i >> 3 & 1) * 85;
Expand Down Expand Up @@ -520,7 +523,7 @@ else if (j == 21)
}
else
{
j = ' ';
j = ' ';
for (char c : ChatAllowedCharacters.allowedCharactersArray)
{
if (c == c0)
Expand Down

0 comments on commit 81d4605

Please sign in to comment.