diff --git a/RebornCore/src/main/java/reborncore/client/gui/builder/GuiBase.java b/RebornCore/src/main/java/reborncore/client/gui/builder/GuiBase.java index 582fca381..761bdd5c8 100644 --- a/RebornCore/src/main/java/reborncore/client/gui/builder/GuiBase.java +++ b/RebornCore/src/main/java/reborncore/client/gui/builder/GuiBase.java @@ -32,7 +32,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.ingame.HandledScreen; -import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ClickableWidget; import net.minecraft.client.resource.language.I18n; import net.minecraft.client.util.math.MatrixStack; @@ -59,7 +58,7 @@ import reborncore.client.screen.builder.slot.PlayerInventorySlot; import reborncore.common.blockentity.MachineBaseBlockEntity; import org.jetbrains.annotations.Nullable; -import reborncore.mixin.client.ScreenAccessor; +import reborncore.mixin.client.AccessorScreen; import java.util.ArrayList; import java.util.Collections; @@ -281,8 +280,8 @@ public class GuiBase extends HandledScreen { offset += 24; } - ScreenAccessor screenAccessor = (ScreenAccessor)this; - for (Selectable selectable : screenAccessor.getSelectables()) { + AccessorScreen accessorScreen = (AccessorScreen)this; + for (Selectable selectable : accessorScreen.getSelectables()) { if (selectable instanceof ClickableWidget clickable) { if (clickable.isHovered()) { clickable.renderToolTip(matrixStack, mouseX, mouseY); diff --git a/RebornCore/src/main/java/reborncore/mixin/client/ScreenAccessor.java b/RebornCore/src/main/java/reborncore/mixin/client/AccessorScreen.java similarity index 90% rename from RebornCore/src/main/java/reborncore/mixin/client/ScreenAccessor.java rename to RebornCore/src/main/java/reborncore/mixin/client/AccessorScreen.java index 7862daa0b..b384096d2 100644 --- a/RebornCore/src/main/java/reborncore/mixin/client/ScreenAccessor.java +++ b/RebornCore/src/main/java/reborncore/mixin/client/AccessorScreen.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.gen.Accessor; import java.util.List; @Mixin(Screen.class) -public interface ScreenAccessor { +public interface AccessorScreen { @Accessor List getSelectables(); } diff --git a/RebornCore/src/main/resources/reborncore.client.mixins.json b/RebornCore/src/main/resources/reborncore.client.mixins.json index 2022b391c..99c802d52 100644 --- a/RebornCore/src/main/resources/reborncore.client.mixins.json +++ b/RebornCore/src/main/resources/reborncore.client.mixins.json @@ -8,7 +8,8 @@ "MixinDebugRenderer", "MixinWorldRenderer", "AccessorModelPredicateProviderRegistry", - "AccessorChatHud" + "AccessorChatHud", + "AccessorScreen" ], "injectors": { "defaultRequire": 1