Update to 1.21.2 and make gradle not process access wideners

Signed-off-by: Username404-59 <w.iron.zombie@gmail.com>
This commit is contained in:
Username404-59 2025-04-15 14:43:51 +02:00
parent 9b0620943d
commit 431c7fa3f7
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
5 changed files with 21 additions and 18 deletions

View File

@ -242,7 +242,7 @@ allprojects {
"forge_version" to rootProject.property("forge_version") "forge_version" to rootProject.property("forge_version")
) )
inputs.properties(modProperties) inputs.properties(modProperties)
filesNotMatching(listOf("*.png")) { filesNotMatching(listOf("*.png", "*.accessWidener")) {
expand(modProperties) expand(modProperties)
} }
} }

View File

@ -120,9 +120,9 @@ class ClickBox(
} }
guiGraphics?.run { guiGraphics?.run {
with(Minecraft.getInstance().font) { with(Minecraft.getInstance().font) {
drawInBatch(name.string, drawInBatch(Component.nullToEmpty(name.string),
(x + 5), (y + 2), Colors.TRANSPARENT.hexValue, false, (x + 5), (y + 2), Colors.TRANSPARENT.hexValue, false,
pose().last().pose(), bufferSource(), Font.DisplayMode.NORMAL, 0, 15728880, isBidirectional pose().last().pose(), bufferSource, Font.DisplayMode.NORMAL, 0, 15728880, isBidirectional
) )
} }
} }

View File

@ -8,7 +8,7 @@ import com.mojang.blaze3d.vertex.VertexConsumer
import com.mojang.blaze3d.vertex.VertexFormat import com.mojang.blaze3d.vertex.VertexFormat
import fr.username404.snowygui.gui.feature.Colors import fr.username404.snowygui.gui.feature.Colors
import fr.username404.snowygui.gui.hextoRGB import fr.username404.snowygui.gui.hextoRGB
import net.minecraft.client.renderer.GameRenderer import net.minecraft.client.renderer.CoreShaders
object RenderingUtil { object RenderingUtil {
@JvmField val tessellator: Tesselator = Tesselator.getInstance() @JvmField val tessellator: Tesselator = Tesselator.getInstance()
@ -17,7 +17,7 @@ object RenderingUtil {
setColor(get(0), get(1), get(2), opacity) setColor(get(0), get(1), get(2), opacity)
} }
fun colorShader() { fun colorShader() {
RenderSystem.setShader(GameRenderer::getPositionColorShader) RenderSystem.setShader(CoreShaders.POSITION_COLOR)
RenderSystem.setShaderColor(1F, 1F, 1F, 1F) RenderSystem.setShaderColor(1F, 1F, 1F, 1F)
} }
fun prepareDraw() { fun prepareDraw() {

View File

@ -1,3 +1,6 @@
accessWidener v2 named accessWidener v2 named
accessible field net/minecraft/client/OptionInstance value Ljava/lang/Object; accessible field net/minecraft/client/OptionInstance value Ljava/lang/Object;
mutable field net/minecraft/client/OptionInstance value Ljava/lang/Object; mutable field net/minecraft/client/OptionInstance value Ljava/lang/Object;
accessible field net/minecraft/client/gui/GuiGraphics bufferSource Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;

View File

@ -7,16 +7,16 @@ org.gradle.parallel=true
org.gradle.unsafe.configuration-cache=on org.gradle.unsafe.configuration-cache=on
org.gradle.vfs.watch=true org.gradle.vfs.watch=true
minecraft=1.21 minecraft=1.21.2
forge_version=21.0.143 forge_version=21.2.1-beta
kotlinforforge=5.4.0 kotlinforforge=5.7.0
kotlinVer=2.0.0 kotlinVer=2.1.0
kotlin_coroutines_version=1.7.1 kotlin_coroutines_version=1.9.0
serializationVer=1.7.0 serializationVer=1.7.3
fabric_loader_version=0.14.20 fabric_loader_version=0.14.20
fabric_language_kotlin=1.11.0+kotlin.2.0.0 fabric_language_kotlin=1.13.0+kotlin.2.1.0
fabric_resource_loader_version=1.1.3+b559734490 fabric_resource_loader_version=3.0.5+c47b9d4373
fabric_rendering_api_version=5.0.3+d132107690 fabric_rendering_api_version=8.0.5+c47b9d4373
fabric_api_base_version=0.4.42+6573ed8c90 fabric_api_base_version=0.4.48+c47b9d4373
clothconfig_version=15.0.127 clothconfig_version=16.0.143
modmenu_version=11.0.0 modmenu_version=12.0.0