Merge branch '1.18.2t' into 1.19.1

Author: IMS212

brachyurabootstrapconf.txt

@@ -1,22 +1,22 @@
 0
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-0.95.jar	A3FF7412634D7A18EE3A0F59915AEF3B38EC7141	brachyura-0.95.jar	true
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-0.95-sources.jar	5B6FAE353547475B93C22247D20D4538DC9A80DF	brachyura-0.95-sources.jar	false
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/trieharder-0.2.0.jar	FB5F8770BC368C19197C6B910B72B4676450CBD6	trieharder-0.2.0.jar	true
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/trieharder-0.2.0-sources.jar	9ED36D104B9C46912B3149B3BA3A9599FADD4CB8	trieharder-0.2.0-sources.jar	false
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/recombobulator-0.5.jar	9DFD6CB020B47B21A5C6CF87A08AB4FCBC78E8CC	recombobulator-0.5.jar	true
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/recombobulator-0.5-sources.jar	643FD92F5E8E61850C57F94F57A0C12E3FC18E87	recombobulator-0.5-sources.jar	false
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/fernutil-0.2.jar	C076DA44E53AEADFBC8859196501E7147D05947D	fernutil-0.2.jar	true
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/fernutil-0.2-sources.jar	24CDC2628AF10D0ABD04C5BC5533AF7B0A0DB028	fernutil-0.2-sources.jar	false
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/fabricmerge-0.2.jar	8C79C6FF9AC59B60C32E982BC5E9B1A8DD2E9A7B	fabricmerge-0.2.jar	true
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/fabricmerge-0.2-sources.jar	D121EEBE5DC3137511BDCC94B3F2B1B7A3611A33	fabricmerge-0.2-sources.jar	false
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/cfr-0.6.jar	488B145D4778522120867D09DF6DB64A2AB5A730	cfr-0.6.jar	true
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/cfr-0.6-sources.jar	D113E51E5310F69AD04426A2A6DC3340C4CB46A9	cfr-0.6-sources.jar	false
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-mixin-compile-extensions-0.10.jar	8AE63316B2E74D0BC82F262D78810E4AB08150EA	brachyura-mixin-compile-extensions-0.10.jar	true
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-mixin-compile-extensions-0.10-sources.jar	E9C5A1891737FF7E52CC40D44FF14A98DD1575BD	brachyura-mixin-compile-extensions-0.10-sources.jar	false
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/access-widener-0.2.jar	7B1DBF869FCC2D589B4A96141368021394AAF73D	access-widener-0.2.jar	true
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/access-widener-0.2-sources.jar	1F41A4474EC149C29C8FFADFA9D89D9ADFAC3C73	access-widener-0.2-sources.jar	false
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-minecraft-0.4.jar	6C326E710CA7E5A6D5B2F4FF261764E82234659A	brachyura-minecraft-0.4.jar	true
-https://github.com/CoolCrabs/brachyura/releases/download/v_ea8cb5cf49353d86238a6adaedab05ddd60a66d9/brachyura-minecraft-0.4-sources.jar	A3B8AA9A4E54E9D5C79ADCC9C3E1591C6CD414F5	brachyura-minecraft-0.4-sources.jar	false
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/brachyura-0.96.jar	0A47587CEFFEFA104D9446656B03AFD9C824CD2C	brachyura-0.96.jar	true
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/brachyura-0.96-sources.jar	E768B34AAA8273B1F9BD319FAC25886F2CC22F8B	brachyura-0.96-sources.jar	false
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/trieharder-0.2.0.jar	FB5F8770BC368C19197C6B910B72B4676450CBD6	trieharder-0.2.0.jar	true
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/trieharder-0.2.0-sources.jar	9ED36D104B9C46912B3149B3BA3A9599FADD4CB8	trieharder-0.2.0-sources.jar	false
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/recombobulator-0.6.jar	F889826171A60F99CC552D7C74063DC0AB9FF3EC	recombobulator-0.6.jar	true
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/recombobulator-0.6-sources.jar	12F5A944A21150A695A1FB30E546578DC1CD142A	recombobulator-0.6-sources.jar	false
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/fernutil-0.2.jar	C076DA44E53AEADFBC8859196501E7147D05947D	fernutil-0.2.jar	true
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/fernutil-0.2-sources.jar	24CDC2628AF10D0ABD04C5BC5533AF7B0A0DB028	fernutil-0.2-sources.jar	false
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/fabricmerge-0.2.jar	8C79C6FF9AC59B60C32E982BC5E9B1A8DD2E9A7B	fabricmerge-0.2.jar	true
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/fabricmerge-0.2-sources.jar	D121EEBE5DC3137511BDCC94B3F2B1B7A3611A33	fabricmerge-0.2-sources.jar	false
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/cfr-0.6.jar	488B145D4778522120867D09DF6DB64A2AB5A730	cfr-0.6.jar	true
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/cfr-0.6-sources.jar	D113E51E5310F69AD04426A2A6DC3340C4CB46A9	cfr-0.6-sources.jar	false
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/brachyura-mixin-compile-extensions-0.10.jar	8AE63316B2E74D0BC82F262D78810E4AB08150EA	brachyura-mixin-compile-extensions-0.10.jar	true
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/brachyura-mixin-compile-extensions-0.10-sources.jar	E9C5A1891737FF7E52CC40D44FF14A98DD1575BD	brachyura-mixin-compile-extensions-0.10-sources.jar	false
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/access-widener-0.2.jar	7B1DBF869FCC2D589B4A96141368021394AAF73D	access-widener-0.2.jar	true
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/access-widener-0.2-sources.jar	1F41A4474EC149C29C8FFADFA9D89D9ADFAC3C73	access-widener-0.2-sources.jar	false
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/brachyura-minecraft-0.4.jar	6C326E710CA7E5A6D5B2F4FF261764E82234659A	brachyura-minecraft-0.4.jar	true
+https://github.com/CoolCrabs/brachyura/releases/download/v_5f39572ce59b723cb85c1bb14446253c28a1c674/brachyura-minecraft-0.4-sources.jar	A3B8AA9A4E54E9D5C79ADCC9C3E1591C6CD414F5	brachyura-minecraft-0.4-sources.jar	false
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/23.0.0/annotations-23.0.0.jar	8cc20c07506ec18e0834947b84a864bfc094484e	annotations-23.0.0.jar	true
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/23.0.0/annotations-23.0.0-sources.jar	ca5088d615accaabd2aa956b10b236a4e75cfccb	annotations-23.0.0-sources.jar	false
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.9.0/gson-2.9.0.jar	8a1167e089096758b49f9b34066ef98b2f4b37aa	gson-2.9.0.jar	true

src/main/java/net/coderbot/iris/mixin/entity_render_context/MixinItemRenderer.java

@@ -24,17 +24,11 @@ public abstract class MixinItemRenderer {
 	@Unique
 	private int previousBeValue;
 
-	@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemBlockRenderTypes;getRenderType(Lnet/minecraft/world/item/ItemStack;Z)Lnet/minecraft/client/renderer/RenderType;"))
+	@Inject(method = "render", at = @At(value = "HEAD"))
 	private void changeId(ItemStack pItemRenderer0, ItemTransforms.TransformType pItemTransforms$TransformType1, boolean pBoolean2, PoseStack pPoseStack3, MultiBufferSource pMultiBufferSource4, int pInt5, int pInt6, BakedModel pBakedModel7, CallbackInfo ci) {
 		iris$setupId(pItemRenderer0);
 	}
 
-	// Attempt Indium support
-	@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/BlockEntityWithoutLevelRenderer;renderByItem(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/renderer/block/model/ItemTransforms$TransformType;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;II)V"))
-	private void changeId2(ItemStack pItemRenderer0, ItemTransforms.TransformType pItemTransforms$TransformType1, boolean pBoolean2, PoseStack pPoseStack3, MultiBufferSource pMultiBufferSource4, int pInt5, int pInt6, BakedModel pBakedModel7, CallbackInfo ci) {
-		iris$setupId(pItemRenderer0);
-	}
-
 	@Unique
 	private void iris$setupId(ItemStack pItemRenderer0) {
 		if (BlockRenderingSettings.INSTANCE.getItemIds() == null) return;

src/main/java/net/coderbot/iris/pipeline/SodiumTerrainPipeline.java

@@ -124,7 +124,7 @@ public SodiumTerrainPipeline(WorldRenderingPipeline parent, ProgramSet programSe
 
 	private static final Supplier<Optional<AlphaTest>> terrainCutoutDefault = () -> Optional.of(AlphaTests.ONE_TENTH_ALPHA);
 	private static final Supplier<Optional<AlphaTest>> translucentDefault = () -> Optional.of(AlphaTest.ALWAYS);
-	private static final Supplier<Optional<AlphaTest>> shadowDefault = () -> Optional.of(AlphaTests.NON_ZERO_ALPHA);
+	private static final Supplier<Optional<AlphaTest>> shadowDefault = () -> Optional.of(AlphaTests.ONE_TENTH_ALPHA);
 
 	public void patchShaders(ChunkVertexType vertexType) {
 		ShaderAttributeInputs inputs = new ShaderAttributeInputs(true, true, false, true, true);

src/main/java/net/coderbot/iris/pipeline/newshader/NewWorldRenderingPipeline.java

@@ -533,11 +533,12 @@ public void process(int target) {
 				}
 			};
 		} else {
-			if (IrisRenderSystem.supportsCompute()) {
-				colorSpaceConverter = new ColorSpaceComputeConverter(main.width, main.height, IrisVideoSettings.colorSpace);
-			} else {
+			// TODO: Fix grid appearing on some devices with compute converter
+			//if (IrisRenderSystem.supportsCompute()) {
+			//	colorSpaceConverter = new ColorSpaceComputeConverter(main.width, main.height, IrisVideoSettings.colorSpace);
+			//} else {
 				colorSpaceConverter = new ColorSpaceFragmentConverter(main.width, main.height, IrisVideoSettings.colorSpace);
-			}
+			//}
 		}
 
 		currentColorSpace = IrisVideoSettings.colorSpace;
@@ -1050,6 +1051,8 @@ public OptionalInt getForcedShadowRenderDistanceChunksForDisplay() {
 
 	@Override
 	public void beginHand() {
+		centerDepthSampler.sampleCenterDepth();
+
 		// We need to copy the current depth texture so that depthtex2 can contain the depth values for
 		// all non-translucent content excluding the hand, as required.
 		renderTargets.copyPreHandDepth();
@@ -1087,7 +1090,6 @@ public void beginTranslucents() {
 	@Override
 	public void finalizeLevelRendering() {
 		isRenderingWorld = false;
-		centerDepthSampler.sampleCenterDepth();
 		compositeRenderer.renderAll();
 		finalPassRenderer.renderFinalPass();
 		colorSpaceConverter.process(Minecraft.getInstance().getMainRenderTarget().getColorTextureId());