From c3dce97e0d3379a644c7a0fde2c4ed273d5cf371 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 8 Jan 2016 23:03:30 -0600 Subject: [PATCH] Fix pylon and pool rendering in multiblock. Closes #25 --- .../component/MultiblockComponent.java | 2 +- .../component/StateInsensitiveComponent.java | 26 +++++++++++++++++++ .../client/core/handler/HUDHandler.java | 2 +- .../core/handler/MultiblockRenderHandler.java | 25 ++++++++++++++++-- .../common/block/tile/TileAlfPortal.java | 3 ++- 5 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index a8281c46e..4ca2ae01e 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -58,7 +58,7 @@ public class MultiblockComponent { } public boolean matches(World world, BlockPos pos) { - return world.getBlockState(pos) == state; // todo 1.8? + return world.getBlockState(pos) == state; } public ItemStack[] getMaterials() { diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java new file mode 100644 index 000000000..4e1ec47f3 --- /dev/null +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java @@ -0,0 +1,26 @@ +package vazkii.botania.api.lexicon.multiblock.component; + +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.BlockPos; +import net.minecraft.world.World; + +// Multiblock component that only compares blocks, not blockstates +public class StateInsensitiveComponent extends MultiblockComponent { + + public StateInsensitiveComponent(BlockPos relPos, Block block) { + super(relPos, block.getDefaultState(), false, null); + } + + @Override + public boolean matches(World world, BlockPos pos) { + return world.getBlockState(pos).getBlock() == this.getBlockState().getBlock(); + } + + @Override + public MultiblockComponent copy() { + return new StateInsensitiveComponent(getRelativePosition(), getBlockState().getBlock()); + } + +} diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 5c2ddc827..805ac287b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -115,7 +115,7 @@ public final class HUDHandler { ((IWandHUD) block).renderHUD(mc, event.resolution, mc.theWorld, pos.getBlockPos()); profiler.endSection(); } - } else if(pos != null && equippedStack.getItem() instanceof ILexicon) + } else if(block != null && equippedStack.getItem() instanceof ILexicon) drawLexiconHUD(mc.thePlayer.getCurrentEquippedItem(), block, pos, event.resolution); if(tile != null && tile instanceof TilePool) renderPoolRecipeHUD(event.resolution, (TilePool) tile, equippedStack); diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index 25376ea50..28923adcb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -21,6 +21,7 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -36,6 +37,7 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.lib.LibObfuscation; @@ -51,11 +53,15 @@ public final class MultiblockRenderHandler { public static int dimension; static { - //todo 1.8 remove when fixed by forge + // todo 1.8.8 temporary shim, because cannot renderBlockBrightness directly, see MinecraftForge issue 2353 IMultiblockRenderHook.renderHooks.put(ModBlocks.pylon, new IMultiblockRenderHook() { @Override public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { - IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(state); + // Steal itemstack model since it has the proper group visibilities configured + ItemStack stack = new ItemStack(ModBlocks.pylon, 1, state.getBlock().getMetaFromState(state)); + IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(stack); + GlStateManager.scale(0.65F, 0.65, 0.65F); + GlStateManager.translate(0.5F, -0.75F, 0.5F); Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, state, 1.0F, false); } @@ -64,6 +70,21 @@ public final class MultiblockRenderHandler { return true; } }); + + // TODO also a temporary shim for same reason as above + IMultiblockRenderHook.renderHooks.put(ModBlocks.pool, new IMultiblockRenderHook() { + @Override + public void renderBlockForMultiblock(IBlockAccess world, Multiblock mb, IBlockState state, MultiblockComponent comp, float alpha) { + GlStateManager.translate(-0.5F, -0.5F, 0.5F); + IBakedModel model = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelForState(ModBlocks.pool.getDefaultState()); + Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightness(model, ModBlocks.pool.getDefaultState(), 1.0F, false); + } + + @Override + public boolean needsTranslate(IBlockState state) { + return true; + } + }); } public static void setMultiblock(MultiblockSet set) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 29d647063..c2ca42eb1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -28,6 +28,7 @@ import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.ILexicon; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; +import vazkii.botania.api.lexicon.multiblock.component.StateInsensitiveComponent; import vazkii.botania.api.recipe.ElvenPortalUpdateEvent; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.RecipeElvenTrade; @@ -114,7 +115,7 @@ public class TileAlfPortal extends TileMod implements ITickable { for(BlockPos p : PYLON_POSITIONS) mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pylon.getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.NATURA)); for(BlockPos p : POOL_POSITIONS) - mb.addComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pool.getDefaultState()); + mb.addComponent(new StateInsensitiveComponent(new BlockPos(-p.getX(), p.getY() + 1, -p.getZ()), ModBlocks.pool)); mb.addComponent(new BlockPos(0, 1, 0), ModBlocks.alfPortal.getDefaultState()); mb.setRenderOffset(new BlockPos(0, -1, 0));