From 4aefdd1000af872b7ea39bd8be5b8492ab906621 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 19 May 2021 16:33:26 +0200 Subject: [PATCH 1/3] Remove 1.17 from Java 8 builds --- .github/workflows/push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 530cf998..e66068aa 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -8,7 +8,6 @@ on: - '**/src/**' branches: - "1.16" - - "1.17" workflow_dispatch: inputs: norelease: From cccbaa2f11960be6dcae9c26eb0c64fe9a815ed4 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Wed, 19 May 2021 22:48:51 +0800 Subject: [PATCH 2/3] Update FUNDING.yml Signed-off-by: shedaniel --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index cc9127c3..a735ee16 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,2 +1,2 @@ patreon: shedaniel -github: [ shedaniel, MaxNeedsSnacks ] +github: MaxNeedsSnacks From 3926bf2a91bdbded4cf9c228753d8484e75356dc Mon Sep 17 00:00:00 2001 From: shedaniel Date: Thu, 20 May 2021 22:04:01 +0800 Subject: [PATCH 3/3] Fix Collections$UnmodifiableRandomAccessList Signed-off-by: shedaniel --- .../architectury/event/forge/EventHandlerImplClient.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/forge/src/main/java/me/shedaniel/architectury/event/forge/EventHandlerImplClient.java b/forge/src/main/java/me/shedaniel/architectury/event/forge/EventHandlerImplClient.java index eaaf7d0e..0db7df7e 100644 --- a/forge/src/main/java/me/shedaniel/architectury/event/forge/EventHandlerImplClient.java +++ b/forge/src/main/java/me/shedaniel/architectury/event/forge/EventHandlerImplClient.java @@ -23,6 +23,7 @@ import me.shedaniel.architectury.event.events.TextureStitchEvent; import me.shedaniel.architectury.event.events.*; import me.shedaniel.architectury.event.events.client.ClientChatEvent; import me.shedaniel.architectury.event.events.client.*; +import me.shedaniel.architectury.hooks.ScreenHooks; import me.shedaniel.architectury.impl.TooltipEventColorContextImpl; import me.shedaniel.architectury.impl.TooltipEventPositionContextImpl; import net.minecraft.client.Minecraft; @@ -82,14 +83,14 @@ public class EventHandlerImplClient { @SubscribeEvent(priority = EventPriority.HIGH) public static void event(GuiScreenEvent.InitGuiEvent.Pre event) { - if (GuiEvent.INIT_PRE.invoker().init(event.getGui(), event.getWidgetList(), (List) event.getGui().children()) != InteractionResult.PASS) { + if (GuiEvent.INIT_PRE.invoker().init(event.getGui(), ScreenHooks.getButtons(event.getGui()), (List) event.getGui().children()) != InteractionResult.PASS) { event.setCanceled(true); } } @SubscribeEvent(priority = EventPriority.HIGH) public static void event(GuiScreenEvent.InitGuiEvent.Post event) { - GuiEvent.INIT_POST.invoker().init(event.getGui(), event.getWidgetList(), (List) event.getGui().children()); + GuiEvent.INIT_POST.invoker().init(event.getGui(), ScreenHooks.getButtons(event.getGui()), (List) event.getGui().children()); } @SubscribeEvent(priority = EventPriority.HIGH)