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

Fixed up the ModLoader render block hook, RP's blocks now render.

Browse source
This commit is contained in:
LexManos 2012-05-10 01:00:07 -07:00
parent 2afed48993
commit 8d0a9b770d
4 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fml/client/cpw/mods/fml/client/FMLClientHandler.java
View file

@ -28,11 +28,13 @@ import javax.imageio.ImageIO;
import net.minecraft.client.Minecraft;
import net.minecraft.src.BaseMod;
import net.minecraft.src.BiomeGenBase;
import net.minecraft.src.Block;
import net.minecraft.src.ClientRegistry;
import net.minecraft.src.CommonRegistry;
import net.minecraft.src.EntityItem;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.GuiScreen;
import net.minecraft.src.IBlockAccess;
import net.minecraft.src.IChunkProvider;
import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack;
@ -41,6 +43,7 @@ import net.minecraft.src.NetworkManager;
import net.minecraft.src.Packet1Login;
import net.minecraft.src.Packet250CustomPayload;
import net.minecraft.src.Packet3Chat;
import net.minecraft.src.RenderBlocks;
import net.minecraft.src.RenderEngine;
import net.minecraft.src.RenderPlayer;
import net.minecraft.src.StringTranslate;
@ -94,6 +97,7 @@ public class FMLClientHandler implements IFMLSidedHandler
private int nextRenderId = 30;
private static HashMap<String, ArrayList<OverrideInfo>> overrideInfo = new HashMap<String, ArrayList<OverrideInfo>>();
private static HashMap<Integer, ModLoaderModContainer> blockModelIds = new HashMap<Integer, ModLoaderModContainer>();
/**
* Called to start the whole game off from
@ -583,6 +587,7 @@ public class FMLClientHandler implements IFMLSidedHandler
ModLoaderModContainer mlmc=ModLoaderHelper.registerRenderHelper(mod);
int renderId=nextRenderId++;
mlmc.addRenderHandler(new BlockRenderInfo(renderId, inventoryRenderer));
blockModelIds.put(renderId, mlmc);
return renderId;
}
@ -626,4 +631,24 @@ public class FMLClientHandler implements IFMLSidedHandler
ModLoaderModContainer mlmc=ModLoaderHelper.registerKeyHelper(mod);
mlmc.addKeyHandler(new KeyBindingHandler(keyHandler, allowRepeat));
}
/**
* @param renderer
* @param world
* @param x
* @param y
* @param z
* @param block
* @param modelID
* @return
*/
public boolean onRenderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
{
ModLoaderModContainer mod = blockModelIds.get(modelID);
if (mod == null)
{
return false;
}
return ((BaseMod)mod.getMod()).renderWorldBlock(renderer, world, x, y, z, block, modelID);
}
}

3
fml/client/net/minecraft/src/ModLoader.java
View file

@ -678,8 +678,7 @@ public class ModLoader
public static boolean renderWorldBlock(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, Block block, int modelID)
{
//TODO
return false;
return FMLClientHandler.instance().onRenderWorldBlock(renderer, world, x, y, z, block, modelID);
}
/**

6
fml/common/cpw/mods/fml/common/Loader.java
View file

@ -182,7 +182,11 @@ public class Loader
{
log.fine("Sorting mods into an ordered list");
mods = sorter.sort();
log.fine(String.format("Sorted mod list %s", mods));
log.fine("Sorted mod list:");
for (ModContainer mod : mods)
{
log.fine(String.format(" %s: %s", mod.getName(), mod.getSource().getName()));
}
}
catch (IllegalArgumentException iae)
{

3
fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
View file

@ -31,7 +31,10 @@ import java.util.Properties;
import java.util.StringTokenizer;
import net.minecraft.src.BaseMod;
import net.minecraft.src.Block;
import net.minecraft.src.IBlockAccess;
import net.minecraft.src.MLProp;
import net.minecraft.src.RenderBlocks;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.IConsoleHandler;
import cpw.mods.fml.common.ICraftingHandler;