Various Mixin-related Fixes (#890)

* Update deps

* Remove dead code

* Add missing `@Override` annotations

* Fix generics

* Add `serialVersionUID`s

* Address deprecation warnings

* Use `@WrapWithCondition` v2

* Misc cleanup

* Use AccessTransformers if possible

* Fix mixin conflicts

* Add `@Mutable` annotations

* Fix injection targets

* Update deps
This commit is contained in:
glowredman authored and GitHub committed 2025-03-08 20:41:47 -08:00
1 parent 611bbf02c8
commit bb5526598e
158 files changed
+252 -619

No files matched your search

@@ -26,10 +26,10 @@ public class GuiCustomOptionsRowList extends GuiListExtended {
field_148163_i = false;
for(OptionGroup optionGroup : optionPage.getGroups()) {
Iterator settings = optionGroup.getOptions().stream().iterator();
Iterator<Option<?>> settings = optionGroup.getOptions().stream().iterator();
while(settings.hasNext()) {
Option optionOne = (Option)settings.next();
Option optionTwo = settings.hasNext() ? (Option)settings.next() : null;
Option<?> optionOne = settings.next();
Option<?> optionTwo = settings.hasNext() ? settings.next() : null;
GuiButton buttonOne = (GuiButton)optionOne.getControl().createElement(new Dim2i(width / 2 - 155,0,150,20), factory);
GuiButton buttonTwo = optionTwo == null ? null : (GuiButton)optionTwo.getControl().createElement(new Dim2i(width / 2 - 155 + 160,0,150,20), factory);
settingsList.add(new GuiCustomOptionsRowList.Row(buttonOne, buttonTwo));