diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 1beeeaf05..13366eca2 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -293,8 +293,12 @@ public enum Mixins implements IMixins { , "shaders.MixinLocale" , "shaders.MixinRender" , "shaders.MixinRenderBiped" + , "shaders.MixinRenderBlocks_FaceNormals" + , "shaders.MixinRenderBlocks_FallingShading" + , "shaders.MixinRenderBlocks_ItemId" , "shaders.MixinRenderDragon" , "shaders.MixinRenderEntityFlame" + , "shaders.MixinRenderFallingBlock" , "shaders.MixinRendererLivingEntity" , "shaders.MixinRenderGlobal" , "shaders.AccessorEntityHorse" diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/FallingBlockMetaAccess.java b/src/main/java/com/gtnewhorizons/angelica/rendering/FallingBlockMetaAccess.java new file mode 100644 index 000000000..3eb172dcb --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/FallingBlockMetaAccess.java @@ -0,0 +1,83 @@ +package com.gtnewhorizons.angelica.rendering; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraftforge.common.util.ForgeDirection; + + +public final class FallingBlockMetaAccess implements IBlockAccess { + + private IBlockAccess delegate; + private int x; + private int y; + private int z; + private int metadata; + + public FallingBlockMetaAccess set(IBlockAccess delegate, int x, int y, int z, int metadata) { + this.delegate = delegate; + this.x = x; + this.y = y; + this.z = z; + this.metadata = metadata; + return this; + } + + public void clear() { + this.delegate = null; + } + + @Override + public int getBlockMetadata(int x, int y, int z) { + if (x == this.x && y == this.y && z == this.z) { + return this.metadata; + } + return delegate.getBlockMetadata(x, y, z); + } + + @Override + public Block getBlock(int x, int y, int z) { + return delegate.getBlock(x, y, z); + } + + @Override + public TileEntity getTileEntity(int x, int y, int z) { + return delegate.getTileEntity(x, y, z); + } + + @Override + public int getLightBrightnessForSkyBlocks(int x, int y, int z, int lightValue) { + return delegate.getLightBrightnessForSkyBlocks(x, y, z, lightValue); + } + + @Override + public int isBlockProvidingPowerTo(int x, int y, int z, int direction) { + return delegate.isBlockProvidingPowerTo(x, y, z, direction); + } + + @Override + public boolean isAirBlock(int x, int y, int z) { + return delegate.isAirBlock(x, y, z); + } + + @Override + public BiomeGenBase getBiomeGenForCoords(int x, int z) { + return delegate.getBiomeGenForCoords(x, z); + } + + @Override + public int getHeight() { + return delegate.getHeight(); + } + + @Override + public boolean extendedLevelsInChunkCache() { + return delegate.extendedLevelsInChunkCache(); + } + + @Override + public boolean isSideSolid(int x, int y, int z, ForgeDirection side, boolean _default) { + return delegate.isSideSolid(x, y, z, side, _default); + } +} diff --git a/src/main/java/com/gtnewhorizons/angelica/rendering/FallingBlockRendering.java b/src/main/java/com/gtnewhorizons/angelica/rendering/FallingBlockRendering.java new file mode 100644 index 000000000..bdcc904e3 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/rendering/FallingBlockRendering.java @@ -0,0 +1,56 @@ +package com.gtnewhorizons.angelica.rendering; + +import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager; +import com.gtnewhorizons.angelica.glsm.GLStateManager; +import it.unimi.dsi.fastutil.ints.Int2IntMap; +import it.unimi.dsi.fastutil.objects.Reference2ObjectMap; +import net.coderbot.iris.block_rendering.BlockMaterialMapping; +import net.coderbot.iris.block_rendering.BlockRenderingSettings; +import net.coderbot.iris.gl.shader.ProgramCreator; +import net.irisshaders.iris.api.v0.IrisApi; +import net.minecraft.block.Block; +import net.minecraft.world.IBlockAccess; + +public final class FallingBlockRendering { + + public static boolean active; + + private static final FallingBlockMetaAccess META_ACCESS = new FallingBlockMetaAccess(); + + private FallingBlockRendering() { + } + + public static FallingBlockMetaAccess metaAccess(IBlockAccess world, int x, int y, int z, int metadata) { + return META_ACCESS.set(world, x, y, z, metadata); + } + + public static void setEntityAttribute(Block block, int metadata) { + if (!shadersActive()) return; + GLStateManager.glVertexAttrib2s(ProgramCreator.MC_ENTITY, (short) blockMaterialId(block, metadata), (short) 0); + } + + public static void resetEntityAttribute() { + if (!shadersActive()) return; + GLStateManager.glVertexAttrib2s(ProgramCreator.MC_ENTITY, (short) -1, (short) -1); + } + + private static int blockMaterialId(Block block, int metadata) { + final Reference2ObjectMap blockMetaMatches = BlockRenderingSettings.INSTANCE.getBlockMetaMatches(); + if (blockMetaMatches == null) return -1; + + final Int2IntMap metaMap = blockMetaMatches.get(block); + return metaMap != null ? BlockMaterialMapping.resolveId(metaMap, metadata) : -1; + } + + public static boolean isActive() { + return active && shadersActive(); + } + + private static boolean shadersActive() { + return TessellatorManager.isOnMainThread() && IrisApi.getInstance().isShaderPackInUse(); + } + + public static boolean skipDirectionalShading() { + return isActive() && BlockRenderingSettings.INSTANCE.shouldDisableDirectionalShading(); + } +} diff --git a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java index d1ddd03e4..61d264970 100644 --- a/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java +++ b/src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java @@ -781,7 +781,11 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R } public boolean shouldOverrideShaders() { - return isRenderingWorld && !isRenderingFullScreenPass && !isPostChain && isMainBound; + return isRenderingLevelGeometry() && isMainBound; + } + + public boolean isRenderingLevelGeometry() { + return isRenderingWorld && !isRenderingFullScreenPass && !isPostChain; } public Pass getActivePassProgram() { diff --git a/src/main/java/net/coderbot/iris/uniforms/ItemIdManager.java b/src/main/java/net/coderbot/iris/uniforms/ItemIdManager.java index cada13426..ad5b1769a 100644 --- a/src/main/java/net/coderbot/iris/uniforms/ItemIdManager.java +++ b/src/main/java/net/coderbot/iris/uniforms/ItemIdManager.java @@ -1,5 +1,9 @@ package net.coderbot.iris.uniforms; +import net.coderbot.iris.Iris; +import net.coderbot.iris.pipeline.DeferredWorldRenderingPipeline; +import net.coderbot.iris.pipeline.WorldRenderingPipeline; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; /** @@ -23,6 +27,13 @@ public class ItemIdManager { CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); } + /** + * Set the item ID for a Block rendered outside of terrain. + */ + public static void setBlockId(Block block, int metadata) { + CapturedRenderingState.INSTANCE.setCurrentRenderedItem(Math.max(0, ItemMaterialHelper.getMaterialId(block, metadata))); + } + /** * Reset the item ID to 0. * Used when entering/exiting render sections or before glint rendering. @@ -30,4 +41,28 @@ public class ItemIdManager { public static void resetItemId() { CapturedRenderingState.INSTANCE.setCurrentRenderedItem(0); } + + /** + * The currently bound item ID. + */ + public static int getItemId() { + return CapturedRenderingState.INSTANCE.getCurrentRenderedItem(); + } + + /** + * Set an already-resolved item ID without performing a lookup. + */ + public static void setItemIdRaw(int id) { + CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id); + } + + /** + * Honestly I don't know why there's comments on a lot of these. + * Guess I thought documentation is good but man if you can't figure this out + * you're in trouble. + */ + public static boolean isWorldRenderActive() { + final WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable(); + return pipeline instanceof DeferredWorldRenderingPipeline drp && drp.isRenderingLevelGeometry(); + } } diff --git a/src/main/java/net/coderbot/iris/uniforms/ItemMaterialHelper.java b/src/main/java/net/coderbot/iris/uniforms/ItemMaterialHelper.java index 28b5e78af..38d0c393d 100644 --- a/src/main/java/net/coderbot/iris/uniforms/ItemMaterialHelper.java +++ b/src/main/java/net/coderbot/iris/uniforms/ItemMaterialHelper.java @@ -23,6 +23,8 @@ public class ItemMaterialHelper { private static final Reference2ObjectMap MATERIAL_CACHE = new Reference2ObjectOpenHashMap<>(); private static final int CACHE_MISS_SENTINEL = Integer.MIN_VALUE; private static final Reference2ObjectMap ITEM_NAME_CACHE = new Reference2ObjectOpenHashMap<>(); + private static final Reference2ObjectMap BLOCK_MATERIAL_CACHE = new Reference2ObjectOpenHashMap<>(); + /** * Get the material ID for an ItemStack. * For ItemBlock: checks block.properties first, then item.properties. @@ -79,6 +81,52 @@ public class ItemMaterialHelper { return materialId; } + /** + * Get the material ID for a Block rendered outside of terrain. + * + * @return The material ID, or -1 if not found + */ + public static int getMaterialId(Block block, int metadata) { + if (block == null) { + return -1; + } + + Int2IntMap metadataCache = BLOCK_MATERIAL_CACHE.get(block); + if (metadataCache != null) { + int cached = metadataCache.getOrDefault(metadata, CACHE_MISS_SENTINEL); + if (cached != CACHE_MISS_SENTINEL) { + return cached; + } + } + + int materialId = lookupBlockMaterialId(block, metadata); + + if (metadataCache == null) { + metadataCache = new Int2IntOpenHashMap(); + metadataCache.defaultReturnValue(CACHE_MISS_SENTINEL); + BLOCK_MATERIAL_CACHE.put(block, metadataCache); + } + metadataCache.put(metadata, materialId); + + return materialId; + } + + private static int lookupBlockMaterialId(Block block, int metadata) { + Reference2ObjectMap blockMetaMatches = BlockRenderingSettings.INSTANCE.getBlockMetaMatches(); + if (blockMetaMatches != null) { + Int2IntMap metaMap = blockMetaMatches.get(block); + if (metaMap != null) { + int id = BlockMaterialMapping.resolveId(metaMap, metadata); + if (id != -1) { + return id; + } + } + } + + final Item item = Item.getItemFromBlock(block); + return item != null ? lookupItemPropertiesId(item) : -1; + } + /** * Perform the actual material ID lookup without caching. * @@ -107,16 +155,17 @@ public class ItemMaterialHelper { } // Fall back to item.properties - Object2IntFunction itemIds = BlockRenderingSettings.INSTANCE.getItemIds(); - if (itemIds != null) { - String itemIdString = Item.itemRegistry.getNameForObject(item); - if (itemIdString != null) { - ResourceLocation itemId = new ResourceLocation(itemIdString); - return itemIds.applyAsInt(new NamespacedId(itemId.getResourceDomain(), itemId.getResourcePath())); - } + return lookupItemPropertiesId(item); + } + + private static int lookupItemPropertiesId(Item item) { + final Object2IntFunction itemIds = BlockRenderingSettings.INSTANCE.getItemIds(); + if (itemIds == null) { + return -1; } - return -1; + final NamespacedId name = getCachedItemName(item); + return name == null ? -1 : itemIds.applyAsInt(name); } /** @@ -126,6 +175,7 @@ public class ItemMaterialHelper { public static void clearCache() { MATERIAL_CACHE.clear(); ITEM_NAME_CACHE.clear(); + BLOCK_MATERIAL_CACHE.clear(); } private static NamespacedId getCachedItemName(Item item) { diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRenderer.java index d6c4c88ed..9c81ad318 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinItemRenderer.java @@ -8,7 +8,9 @@ import net.coderbot.iris.pipeline.HandRenderer; import net.coderbot.iris.uniforms.ItemIdManager; import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.IItemRenderer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -16,7 +18,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; /** - * Mixin to handle item rendering in first-person. + * Mixin to handle item rendering in first-person, and to set the currentRenderedItem for every + * item rendered on an entity. */ @Mixin(ItemRenderer.class) public class MixinItemRenderer { @@ -53,6 +56,30 @@ public class MixinItemRenderer { ItemIdManager.resetItemId(); } + /** + * Set the item ID for any item rendered on an entity. + */ + @Inject( + method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V", + at = @At("HEAD"), + remap = false + ) + private void iris$setEntityItemId(EntityLivingBase entity, ItemStack itemStack, int renderPass, IItemRenderer.ItemRenderType type, CallbackInfo ci) { + ItemIdManager.setItemId(itemStack); + } + + /** + * Clear the ID once the item is drawn. + */ + @Inject( + method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V", + at = @At("RETURN"), + remap = false + ) + private void iris$clearEntityItemId(EntityLivingBase entity, ItemStack itemStack, int renderPass, IItemRenderer.ItemRenderType type, CallbackInfo ci) { + ItemIdManager.resetItemId(); + } + /** * Activate GLINT shader before rendering enchantment glint on held items (third person). */ diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBiped.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBiped.java index d19399040..db6193dcb 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBiped.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBiped.java @@ -4,10 +4,8 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.coderbot.iris.uniforms.ItemIdManager; import net.minecraft.client.model.ModelBase; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -39,17 +37,4 @@ public class MixinRenderBiped { original.call(instance, model); } - - /** - * Set item ID when rendering held items on entities (third person). - */ - @WrapOperation( - method = "renderEquippedItems(Lnet/minecraft/entity/EntityLiving;F)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;I)V") - ) - private void iris$setHeldItemId(ItemRenderer itemRenderer, EntityLivingBase entity, ItemStack itemStack, int renderPass, Operation original) { - ItemIdManager.setItemId(itemStack); - - original.call(itemRenderer, entity, itemStack, renderPass); - } } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBlocks_FaceNormals.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBlocks_FaceNormals.java new file mode 100644 index 000000000..5a082475c --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBlocks_FaceNormals.java @@ -0,0 +1,77 @@ +package com.gtnewhorizons.angelica.mixins.early.shaders; + +import com.gtnewhorizons.angelica.rendering.FallingBlockRendering; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +/** + * Emits a per-face normal while a falling block is rendering, so shader packs can light it. + */ +@Mixin(RenderBlocks.class) +public class MixinRenderBlocks_FaceNormals { + + @Redirect( + method = {"renderBlockSandFalling", "renderStandardBlockWithColorMultiplier", + "renderStandardBlockWithAmbientOcclusion", "renderStandardBlockWithAmbientOcclusionPartial"}, + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderBlocks;renderFaceYNeg(Lnet/minecraft/block/Block;DDDLnet/minecraft/util/IIcon;)V") + ) + private void angelica$normalYNeg(RenderBlocks instance, Block block, double x, double y, double z, IIcon icon) { + if (FallingBlockRendering.isActive()) Tessellator.instance.setNormal(0.0F, -1.0F, 0.0F); + instance.renderFaceYNeg(block, x, y, z, icon); + } + + @Redirect( + method = {"renderBlockSandFalling", "renderStandardBlockWithColorMultiplier", + "renderStandardBlockWithAmbientOcclusion", "renderStandardBlockWithAmbientOcclusionPartial"}, + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderBlocks;renderFaceYPos(Lnet/minecraft/block/Block;DDDLnet/minecraft/util/IIcon;)V") + ) + private void angelica$normalYPos(RenderBlocks instance, Block block, double x, double y, double z, IIcon icon) { + if (FallingBlockRendering.isActive()) Tessellator.instance.setNormal(0.0F, 1.0F, 0.0F); + instance.renderFaceYPos(block, x, y, z, icon); + } + + @Redirect( + method = {"renderBlockSandFalling", "renderStandardBlockWithColorMultiplier", + "renderStandardBlockWithAmbientOcclusion", "renderStandardBlockWithAmbientOcclusionPartial"}, + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderBlocks;renderFaceZNeg(Lnet/minecraft/block/Block;DDDLnet/minecraft/util/IIcon;)V") + ) + private void angelica$normalZNeg(RenderBlocks instance, Block block, double x, double y, double z, IIcon icon) { + if (FallingBlockRendering.isActive()) Tessellator.instance.setNormal(0.0F, 0.0F, -1.0F); + instance.renderFaceZNeg(block, x, y, z, icon); + } + + @Redirect( + method = {"renderBlockSandFalling", "renderStandardBlockWithColorMultiplier", + "renderStandardBlockWithAmbientOcclusion", "renderStandardBlockWithAmbientOcclusionPartial"}, + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderBlocks;renderFaceZPos(Lnet/minecraft/block/Block;DDDLnet/minecraft/util/IIcon;)V") + ) + private void angelica$normalZPos(RenderBlocks instance, Block block, double x, double y, double z, IIcon icon) { + if (FallingBlockRendering.isActive()) Tessellator.instance.setNormal(0.0F, 0.0F, 1.0F); + instance.renderFaceZPos(block, x, y, z, icon); + } + + @Redirect( + method = {"renderBlockSandFalling", "renderStandardBlockWithColorMultiplier", + "renderStandardBlockWithAmbientOcclusion", "renderStandardBlockWithAmbientOcclusionPartial"}, + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderBlocks;renderFaceXNeg(Lnet/minecraft/block/Block;DDDLnet/minecraft/util/IIcon;)V") + ) + private void angelica$normalXNeg(RenderBlocks instance, Block block, double x, double y, double z, IIcon icon) { + if (FallingBlockRendering.isActive()) Tessellator.instance.setNormal(-1.0F, 0.0F, 0.0F); + instance.renderFaceXNeg(block, x, y, z, icon); + } + + @Redirect( + method = {"renderBlockSandFalling", "renderStandardBlockWithColorMultiplier", + "renderStandardBlockWithAmbientOcclusion", "renderStandardBlockWithAmbientOcclusionPartial"}, + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderBlocks;renderFaceXPos(Lnet/minecraft/block/Block;DDDLnet/minecraft/util/IIcon;)V") + ) + private void angelica$normalXPos(RenderBlocks instance, Block block, double x, double y, double z, IIcon icon) { + if (FallingBlockRendering.isActive()) Tessellator.instance.setNormal(1.0F, 0.0F, 0.0F); + instance.renderFaceXPos(block, x, y, z, icon); + } +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBlocks_FallingShading.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBlocks_FallingShading.java new file mode 100644 index 000000000..26c2dee45 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBlocks_FallingShading.java @@ -0,0 +1,50 @@ +package com.gtnewhorizons.angelica.mixins.early.shaders; + +import com.gtnewhorizons.angelica.rendering.FallingBlockRendering; +import net.minecraft.client.renderer.RenderBlocks; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +/** + * Replace vanilla's baked per-face directional shading while a falling block is rendering. + */ +@Mixin(RenderBlocks.class) +public class MixinRenderBlocks_FallingShading { + + @ModifyConstant( + method = { + "renderStandardBlockWithColorMultiplier", + "renderStandardBlockWithAmbientOcclusion", + "renderStandardBlockWithAmbientOcclusionPartial", + "renderBlockSandFalling" + }, + constant = @Constant(floatValue = 0.5F)) + private float angelica$flattenBottomShading(float original) { + return FallingBlockRendering.skipDirectionalShading() ? 1.0F : original; + } + + @ModifyConstant( + method = { + "renderStandardBlockWithColorMultiplier", + "renderStandardBlockWithAmbientOcclusion", + "renderStandardBlockWithAmbientOcclusionPartial", + "renderBlockSandFalling" + }, + constant = @Constant(floatValue = 0.8F)) + private float angelica$flattenNorthSouthShading(float original) { + return FallingBlockRendering.skipDirectionalShading() ? 1.0F : original; + } + + @ModifyConstant( + method = { + "renderStandardBlockWithColorMultiplier", + "renderStandardBlockWithAmbientOcclusion", + "renderStandardBlockWithAmbientOcclusionPartial", + "renderBlockSandFalling" + }, + constant = @Constant(floatValue = 0.6F)) + private float angelica$flattenEastWestShading(float original) { + return FallingBlockRendering.skipDirectionalShading() ? 1.0F : original; + } +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBlocks_ItemId.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBlocks_ItemId.java new file mode 100644 index 000000000..62b98e230 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderBlocks_ItemId.java @@ -0,0 +1,42 @@ +package com.gtnewhorizons.angelica.mixins.early.shaders; + +import com.gtnewhorizon.gtnhlib.client.renderer.TessellatorManager; +import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.coderbot.iris.uniforms.ItemIdManager; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import org.spongepowered.asm.mixin.Mixin; + +/** + * Sets the currentRenderedItem ID for blocks drawn outside of terrain. + */ +@Mixin(value = RenderBlocks.class, priority = 1500) +public class MixinRenderBlocks_ItemId { + + @WrapMethod(method = "renderBlockAsItem") + private void iris$blockItemId(Block block, int metadata, float brightness, Operation original) { + // renderBlockAsItem is shared with GUI and HUD item rendering + if (!ItemIdManager.isWorldRenderActive() || !TessellatorManager.isOnMainThread()) { + original.call(block, metadata, brightness); + return; + } + + final int prevItemId = ItemIdManager.getItemId(); + final int prevBlockEntityId = CapturedRenderingState.INSTANCE.getCurrentRenderedBlockEntity(); + + CapturedRenderingState.INSTANCE.setCurrentBlockEntity(1); + + if (prevItemId <= 0) { + ItemIdManager.setBlockId(block, metadata); + } + + try { + original.call(block, metadata, brightness); + } finally { + ItemIdManager.setItemIdRaw(prevItemId); + CapturedRenderingState.INSTANCE.setCurrentBlockEntity(prevBlockEntityId); + } + } +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderFallingBlock.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderFallingBlock.java new file mode 100644 index 000000000..a8da46308 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderFallingBlock.java @@ -0,0 +1,76 @@ +package com.gtnewhorizons.angelica.mixins.early.shaders; + +import com.gtnewhorizons.angelica.rendering.FallingBlockMetaAccess; +import com.gtnewhorizons.angelica.rendering.FallingBlockRendering; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; +import net.coderbot.iris.layer.GbufferPrograms; +import net.coderbot.iris.pipeline.WorldRenderingPhase; +import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderFallingBlock; +import net.minecraft.entity.item.EntityFallingBlock; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +/** + * Renders falling blocks through terrain. + */ +@Mixin(RenderFallingBlock.class) +public class MixinRenderFallingBlock { + + @Inject(method = "doRender(Lnet/minecraft/entity/item/EntityFallingBlock;DDDFF)V", at = @At("HEAD")) + private void angelica$beginFallingBlock(EntityFallingBlock entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + FallingBlockRendering.active = true; + + CapturedRenderingState.INSTANCE.setCurrentBlockEntity(0); + GbufferPrograms.setOverridePhase(WorldRenderingPhase.TERRAIN_SOLID); + FallingBlockRendering.setEntityAttribute(entity.func_145805_f(), entity.field_145814_a); + } + + @Inject(method = "doRender(Lnet/minecraft/entity/item/EntityFallingBlock;DDDFF)V", at = @At("RETURN")) + private void angelica$endFallingBlock(EntityFallingBlock entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + FallingBlockRendering.active = false; + + FallingBlockRendering.resetEntityAttribute(); + GbufferPrograms.setOverridePhase(null); + CapturedRenderingState.INSTANCE.setCurrentBlockEntity(0); + } + + @WrapOperation( + method = "doRender(Lnet/minecraft/entity/item/EntityFallingBlock;DDDFF)V", + at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderBlocks;renderBlockSandFalling(Lnet/minecraft/block/Block;Lnet/minecraft/world/World;IIII)V") + ) + private void angelica$aoFallingBlock(RenderBlocks renderBlocks, Block block, World world, int x, int y, int z, int metadata, Operation original) { + if (!FallingBlockRendering.isActive()) { + original.call(renderBlocks, block, world, x, y, z, metadata); + return; + } + + final IBlockAccess prevAccess = renderBlocks.blockAccess; + final boolean prevRenderAllFaces = renderBlocks.renderAllFaces; + final FallingBlockMetaAccess access = FallingBlockRendering.metaAccess(world, x, y, z, metadata); + renderBlocks.blockAccess = access; + renderBlocks.renderAllFaces = true; + + final Tessellator tessellator = Tessellator.instance; + tessellator.startDrawingQuads(); + tessellator.setTranslation(-x - 0.5D, -y - 0.5D, -z - 0.5D); + + try { + renderBlocks.renderStandardBlock(block, x, y, z); + } finally { + tessellator.setTranslation(0.0D, 0.0D, 0.0D); + tessellator.draw(); + renderBlocks.renderAllFaces = prevRenderAllFaces; + renderBlocks.blockAccess = prevAccess; + access.clear(); + } + } +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderPlayerArmor.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderPlayerArmor.java index fd8ae15e5..2b059f04b 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderPlayerArmor.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/shaders/MixinRenderPlayerArmor.java @@ -9,9 +9,7 @@ import net.coderbot.iris.uniforms.ItemIdManager; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.entity.RenderPlayer; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @@ -67,17 +65,4 @@ public class MixinRenderPlayerArmor { original.call(modelBiped, scale); ItemIdManager.resetItemId(); } - - /** - * Set item ID when rendering held items in third person. - */ - @WrapOperation( - method = "renderEquippedItems(Lnet/minecraft/client/entity/AbstractClientPlayer;F)V", - at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;I)V") - ) - private void iris$setHeldItemId(ItemRenderer itemRenderer, EntityLivingBase entity, ItemStack itemStack, int renderPass, Operation original) { - ItemIdManager.setItemId(itemStack); - - original.call(itemRenderer, entity, itemStack, renderPass); - } }