From b544849f7d665aa6ff92c306d0e65bd946ba317e Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 16 Mar 2026 18:38:36 -0700 Subject: [PATCH] Fix wrong color argument for FogColor event Fix incorrect patch for carving pumpinks --- buildSrc/build.gradle | 2 +- .../net/minecraft/client/renderer/fog/FogRenderer.java.patch | 4 ++-- .../net/minecraft/world/level/block/PumpkinBlock.java.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 0f87c9c66b..a2961d395d 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -6,7 +6,7 @@ repositories { dependencies { implementation 'org.ow2.asm:asm:9.8' implementation 'org.ow2.asm:asm-tree:9.8' - implementation 'net.minecraftforge:srgutils:0.5.10' + implementation 'net.minecraftforge:srgutils:0.6.2' implementation 'net.minecraftforge:JarJarMetadata:0.3.27' implementation 'commons-io:commons-io:2.13.0' implementation 'com.google.code.gson:gson:2.10.1' diff --git a/patches/minecraft/net/minecraft/client/renderer/fog/FogRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/fog/FogRenderer.java.patch index 6ffbf9c922..511847fab9 100644 --- a/patches/minecraft/net/minecraft/client/renderer/fog/FogRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/fog/FogRenderer.java.patch @@ -5,9 +5,9 @@ } + -+ var fogColor = net.minecraftforge.client.ForgeHooksClient.getFogColor(p_407993_, p_409359_, p_409862_, p_409400_, p_406105_, f, f1, f2); ++ var fogColor = net.minecraftforge.client.ForgeHooksClient.getFogColor(p_407993_, p_409359_, p_409862_, p_409400_, p_406105_, f5, f1, f2); + -+ f = fogColor.x(); ++ f5 = fogColor.x(); + f1 = fogColor.y(); + f2 = fogColor.z(); + diff --git a/patches/minecraft/net/minecraft/world/level/block/PumpkinBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/PumpkinBlock.java.patch index a0cff8e709..2e9a974903 100644 --- a/patches/minecraft/net/minecraft/world/level/block/PumpkinBlock.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/PumpkinBlock.java.patch @@ -5,7 +5,7 @@ ItemStack p_330568_, BlockState p_330263_, Level p_327756_, BlockPos p_328675_, Player p_334049_, InteractionHand p_331851_, BlockHitResult p_329008_ ) { - if (!p_330568_.is(Items.SHEARS)) { -+ if (p_330568_.canPerformAction(net.minecraftforge.common.ToolActions.SHEARS_CARVE)) { ++ if (!p_330568_.canPerformAction(net.minecraftforge.common.ToolActions.SHEARS_CARVE)) { return super.useItemOn(p_330568_, p_330263_, p_327756_, p_328675_, p_334049_, p_331851_, p_329008_); } else if (p_327756_ instanceof ServerLevel serverlevel) { Direction direction = p_329008_.getDirection();