From 8d0a9b770d52255b61cc9ec0400b2c28f2c4b131 Mon Sep 17 00:00:00 2001 From: LexManos Date: Thu, 10 May 2012 01:00:07 -0700 Subject: [PATCH] Fixed up the ModLoader render block hook, RP's blocks now render. --- .../cpw/mods/fml/client/FMLClientHandler.java | 25 +++++++++++++++++++ fml/client/net/minecraft/src/ModLoader.java | 3 +-- fml/common/cpw/mods/fml/common/Loader.java | 6 ++++- .../modloader/ModLoaderModContainer.java | 3 +++ 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java index 4bdb768653..23c8ad6eef 100644 --- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java @@ -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> overrideInfo = new HashMap>(); + private static HashMap blockModelIds = new HashMap(); /** * 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); + } } diff --git a/fml/client/net/minecraft/src/ModLoader.java b/fml/client/net/minecraft/src/ModLoader.java index 98fd34c216..08b75915ba 100644 --- a/fml/client/net/minecraft/src/ModLoader.java +++ b/fml/client/net/minecraft/src/ModLoader.java @@ -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); } /** diff --git a/fml/common/cpw/mods/fml/common/Loader.java b/fml/common/cpw/mods/fml/common/Loader.java index ff47ffff84..bb18b5a1b1 100644 --- a/fml/common/cpw/mods/fml/common/Loader.java +++ b/fml/common/cpw/mods/fml/common/Loader.java @@ -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) { diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java index 88db5b7e97..bd6ad8302c 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java @@ -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;