More work on the multiblock render framework. Still very WIP.

This commit is contained in:
Lizbeth Rika committed 2015-06-28 01:03:10 +01:00
1 parent d2789a2541
commit 1c554fcc12
9 files changed
+201 -19

No files matched your search

@@ -0,0 +1,29 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jun 27, 2015, 7:48:47 PM (GMT)]
*/
package vazkii.botania.api.lexicon.multiblock;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.world.World;
/**
* A hook for rendering blocks in the multiblock display.
*/
public interface IMultiblockRenderHook {
public static Map<Block, IMultiblockRenderHook> renderHooks = new HashMap();
public void renderBlockForMultiblock(World world, Block block, int meta, RenderBlocks renderBlocks);
}
@@ -82,4 +82,12 @@ public class Multiblock {
return blocks;
}
/**
* Makes a MultiblockSet from this Multiblock and its rotations using
* createRotations().
*/
public MultiblockSet makeSet() {
return new MultiblockSet(this);
}
}
@@ -0,0 +1,41 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jun 27, 2015, 7:31:58 PM (GMT)]
*/
package vazkii.botania.api.lexicon.multiblock;
import net.minecraft.entity.Entity;
/**
* A set of Multiblock objects for various rotations.
*/
public class MultiblockSet {
private final Multiblock[] mbs;
public MultiblockSet(Multiblock[] mbs) {
this.mbs = mbs;
}
public MultiblockSet(Multiblock mb) {
this(mb.createRotations());
}
public Multiblock getForEntity(Entity e) {
return getForRotation(e.rotationPitch);
}
public Multiblock getForRotation(double rotation) {
return getForIndex(0);
}
public Multiblock getForIndex(int index) {
return mbs[index];
}
}
@@ -0,0 +1,80 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jun 27, 2015, 7:28:29 PM (GMT)]
*/
package vazkii.botania.client.core.handler;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import org.lwjgl.opengl.GL11;
import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook;
import vazkii.botania.api.lexicon.multiblock.Multiblock;
import vazkii.botania.api.lexicon.multiblock.MultiblockComponent;
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
import vazkii.botania.common.block.ModMultiblocks;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public final class MultiblockRenderHandler {
RenderBlocks blockRender = new RenderBlocks();
MultiblockSet currentMultiblock;
ChunkCoordinates anchor;
int angle;
int blocksPlaced;
@SubscribeEvent
public void onWorldRenderLast(RenderWorldLastEvent event) {
Minecraft mc = Minecraft.getMinecraft();
if(mc.thePlayer != null && mc.objectMouseOver != null) {
ItemStack currentStack = mc.thePlayer.getCurrentEquippedItem();
renderPlayerLook(mc.thePlayer, mc.objectMouseOver);
}
}
private void renderPlayerLook(EntityPlayer player, MovingObjectPosition src) {
if(currentMultiblock == null) // TODO Remove debug
currentMultiblock = ModMultiblocks.enchanter;
if(currentMultiblock != null) {
Multiblock mb = currentMultiblock.getForEntity(player);
for(MultiblockComponent comp : mb.getComponents())
renderComponent(player.worldObj, comp, src);
}
}
private void renderComponent(World world, MultiblockComponent comp, MovingObjectPosition src) {
ChunkCoordinates pos = comp.getRelativePosition();
GL11.glPushMatrix();
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glColor4f(1F, 1F, 1F, 0.6F);
GL11.glTranslated(pos.posX + src.blockX + 0.5 - RenderManager.renderPosX, pos.posY + src.blockY + 0.55 - RenderManager.renderPosY, pos.posZ + src.blockZ + 0.5 - RenderManager.renderPosZ);
Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
blockRender.useInventoryTint = false;
Block block = comp.getBlock();
if(IMultiblockRenderHook.renderHooks.containsKey(block))
IMultiblockRenderHook.renderHooks.get(block).renderBlockForMultiblock(world, block, comp.getMeta(), blockRender);
else blockRender.renderBlockAsItem(comp.getBlock(), comp.getMeta(), 1F);
GL11.glPopMatrix();
}
}
@@ -23,6 +23,7 @@ import net.minecraft.client.network.NetHandlerPlayClient;
import net.minecraft.client.renderer.entity.RenderSnowball;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemRecord;
import net.minecraft.item.ItemStack;
@@ -35,6 +36,7 @@ import net.minecraftforge.common.MinecraftForge;
import vazkii.botania.api.item.IBurstViewerBauble;
import vazkii.botania.api.item.IExtendedPlayerController;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook;
import vazkii.botania.api.wiki.IWikiProvider;
import vazkii.botania.api.wiki.WikiHooks;
import vazkii.botania.client.core.handler.BaubleRenderHandler;
@@ -44,6 +46,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.handler.DebugHandler;
import vazkii.botania.client.core.handler.HUDHandler;
import vazkii.botania.client.core.handler.LightningHandler;
import vazkii.botania.client.core.handler.MultiblockRenderHandler;
import vazkii.botania.client.core.handler.PresistantVariableHelper;
import vazkii.botania.client.core.handler.SubTileRadiusRenderHandler;
import vazkii.botania.client.core.handler.TooltipHandler;
@@ -174,11 +177,11 @@ public class ClientProxy extends CommonProxy {
MinecraftForge.EVENT_BUS.register(new BaubleRenderHandler());
MinecraftForge.EVENT_BUS.register(new DebugHandler());
MinecraftForge.EVENT_BUS.register(new SubTileRadiusRenderHandler());
MinecraftForge.EVENT_BUS.register(new MultiblockRenderHandler());
if(ConfigHandler.versionCheckEnabled)
new VersionChecker().init();
// Jingle bells jingle bells
Calendar calendar = Calendar.getInstance();
if(calendar.get(2) == 11 && calendar.get(5) >= 24 && calendar.get(5) <= 26 || calendar.get(2) == 0 && calendar.get(5) <= 6)
@@ -211,8 +214,9 @@ public class ClientProxy extends CommonProxy {
LibRenderIDs.idIncensePlate = RenderingRegistry.getNextAvailableRenderId();
LibRenderIDs.idHourglass = RenderingRegistry.getNextAvailableRenderId();
RenderSpecialFlower specialFlowerRender = new RenderSpecialFlower(LibRenderIDs.idSpecialFlower);
RenderingRegistry.registerBlockHandler(new RenderAltar());
RenderingRegistry.registerBlockHandler(new RenderSpecialFlower(LibRenderIDs.idSpecialFlower));
RenderingRegistry.registerBlockHandler(specialFlowerRender);
RenderingRegistry.registerBlockHandler(new RenderSpreader());
RenderingRegistry.registerBlockHandler(new RenderPool());
RenderingRegistry.registerBlockHandler(new RenderPylon());
@@ -227,6 +231,9 @@ public class ClientProxy extends CommonProxy {
RenderingRegistry.registerBlockHandler(new RenderIncensePlate());
RenderingRegistry.registerBlockHandler(new RenderHourglass());
IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender);
IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender);
RenderTransparentItem renderTransparentItem = new RenderTransparentItem();
RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem();
RenderBow renderBow = new RenderBow();
@@ -278,7 +285,7 @@ public class ClientProxy extends CommonProxy {
ShaderHelper.initShaders();
}
@Override
@Optional.Method(modid = "NotEnoughItems")
public void registerNEIStuff() {
@@ -14,6 +14,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockDoublePlant;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import vazkii.botania.client.lib.LibRenderIDs;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@@ -49,7 +50,9 @@ public class RenderDoubleFlower implements ISimpleBlockRenderingHandler {
BlockDoublePlant.func_149890_d(i1);
}
RenderSpecialFlower.drawCrossedSquares(world, block, p_147774_2_, p_147774_3_, p_147774_4_, p_147774_2_, p_147774_3_, p_147774_4_, 1F, renderer);
// Only change here, to use xyz rather than side/meta
IIcon icon = renderer.getBlockIcon(block, world, p_147774_2_, p_147774_3_, p_147774_4_, 0);
RenderSpecialFlower.drawCrossedSquares(world, block, icon, p_147774_2_, p_147774_3_, p_147774_4_, p_147774_2_, p_147774_3_, p_147774_4_, 1F, renderer);
return true;
}
@@ -16,9 +16,11 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
public class RenderSpecialFlower implements ISimpleBlockRenderingHandler {
public class RenderSpecialFlower implements ISimpleBlockRenderingHandler, IMultiblockRenderHook {
int id;
@@ -67,18 +69,18 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler {
d2 += (sh >> 32 & 15L) / 15.0F * -0.15D;
d0 += ((sh >> 24 & 15L) / 15.0F - 0.5D) * 0.3D;
drawCrossedSquares(blockAccess, par1Block, par2, par3, par4, d1, d2, d0, 1.0F, render);
// Only change here, to use xyz rather than side/meta
IIcon icon = render.getBlockIcon(par1Block, blockAccess, par2, par3, par4, 0);
drawCrossedSquares(blockAccess, par1Block, icon, par2, par3, par4, d1, d2, d0, 1.0F, render);
return true;
}
// Copied from RenderBlocks
public static void drawCrossedSquares(IBlockAccess blockAccess, Block par1Block, int x, int y, int z, double par3, double par5, double par7, float par9, RenderBlocks render) {
public static void drawCrossedSquares(IBlockAccess blockAccess, Block par1Block, IIcon icon, int x, int y, int z, double par3, double par5, double par7, float par9, RenderBlocks render) {
Tessellator tessellator = Tessellator.instance;
// Only change here, to use xyz rather than side/meta
IIcon icon = render.getBlockIcon(par1Block, blockAccess, x, y, z, 0);
double d3 = icon.getMinU();
double d4 = icon.getMinV();
double d5 = icon.getMaxU();
@@ -116,4 +118,12 @@ public class RenderSpecialFlower implements ISimpleBlockRenderingHandler {
return false;
}
@Override
public void renderBlockForMultiblock(World world, Block block, int meta, RenderBlocks renderBlocks) {
Tessellator tess = Tessellator.instance;
tess.startDrawingQuads();
drawCrossedSquares(world, block, block.getIcon(0, meta), 0, 0, 0, -0.5, 0.5, -0.5, 1F, renderBlocks);
tess.draw();
}
}
@@ -10,16 +10,15 @@
*/
package vazkii.botania.common.block;
import vazkii.botania.api.lexicon.multiblock.Multiblock;
import vazkii.botania.api.lexicon.multiblock.MultiblockComponent;
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
import vazkii.botania.common.block.tile.TileEnchanter;
public final class ModMultiblocks {
public static Multiblock[] enchanter;
public static MultiblockSet enchanter;
public static void init() {
enchanter = TileEnchanter.makeMultiblockInstance();
enchanter = TileEnchanter.makeMultiblockSet();
}
}
@@ -33,6 +33,7 @@ import net.minecraft.world.World;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.lexicon.multiblock.ColorSwitchingComponent;
import vazkii.botania.api.lexicon.multiblock.Multiblock;
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
import vazkii.botania.api.mana.IManaPool;
import vazkii.botania.api.mana.spark.ISparkAttachable;
import vazkii.botania.api.mana.spark.ISparkEntity;
@@ -80,17 +81,21 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
{ -1, 0, -1 }, { 1, 0, -1 }, { -1, 0, 1 }, { 1, 0, 1 }
};
public static Multiblock[] makeMultiblockInstance() {
public static MultiblockSet makeMultiblockSet() {
Multiblock mb = new Multiblock();
for(int[] o : OBSIDIAN_LOCATIONS)
mb.addComponent(o[0], o[1], o[2], Blocks.obsidian, 0);
mb.addComponent(o[0], o[1] + 1, o[2], Blocks.obsidian, 0);
for(int[] p : PYLON_LOCATIONS[0]) {
mb.addComponent(p[0], p[1], p[2], ModBlocks.pylon, 0);
mb.addComponent(new ColorSwitchingComponent(new ChunkCoordinates(p[0], p[1] -1, p[2]), ModBlocks.flower));
mb.addComponent(p[0], p[1] + 1, p[2], ModBlocks.pylon, 0);
mb.addComponent(new ColorSwitchingComponent(new ChunkCoordinates(p[0], p[1] - 1, p[2]), ModBlocks.flower));
}
for(int[] f : FLOWER_LOCATIONS)
mb.addComponent(new ColorSwitchingComponent(new ChunkCoordinates(f[0], f[1], f[2]), ModBlocks.flower));
return mb.createRotations();
mb.addComponent(0, 1, 0, Blocks.lapis_block, 0);
return mb.makeSet();
}
public void onWanded(EntityPlayer player, ItemStack wand) {