search

IrisShaders / Iris

A modern shaders mod for Minecraft compatible with existing OptiFine shader packs
https://irisshaders.dev
GNU Lesser General Public License v3.0
3.22k stars 610 forks source link

Rename MixinBufferBuilder#vertexCount to avoid yarn mappings conflict #2389

Closed Qendolin closed 1 week ago

Qendolin commented 1 week ago

In yarn mappings BufferBuilder#vertices is also called vertexCount which causes an issue when having Iris as a dependency.

duplicate field net/irisshaders/iris/mixin/vertices/MixinBufferBuilder/vertexCount;;I in inputs is the error that is generated when remapping Iris because both the @Unique field private int vertexCount; and the @Shadow field private int vertices; will have the same name under yarn mappings.

The two fields in question:

https://github.com/IrisShaders/Iris/blob/a3540b83886bb6c4bae83bb4f7b2656dbc39a867/src/main/java/net/irisshaders/iris/mixin/vertices/MixinBufferBuilder.java#L76-L77

https://github.com/IrisShaders/Iris/blob/a3540b83886bb6c4bae83bb4f7b2656dbc39a867/src/main/java/net/irisshaders/iris/mixin/vertices/MixinBufferBuilder.java#L64-L65

I suggest to rename vertexCount to something else to avoid the conflict.

IMS212 commented 1 week ago

Fixed in Iris 1.7.2.