From c3f3d9627beb2b4be0755c0b1bdfbcaadf9a1afc Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 28 Oct 2022 16:05:33 +0800 Subject: [PATCH] Update to 22w43a --- .../architectury/hooks/client/screen/ScreenAccess.java | 8 ++++---- .../dev/architectury/hooks/client/screen/ScreenHooks.java | 8 ++++---- .../main/java/dev/architectury/impl/ScreenAccessImpl.java | 8 ++++---- common/src/main/resources/architectury.accessWidener | 2 +- .../hooks/client/screen/fabric/ScreenHooksImpl.java | 8 ++++---- .../mixin/fabric/client/MixinGameRenderer.java | 3 +-- gradle.properties | 6 +++--- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/common/src/main/java/dev/architectury/hooks/client/screen/ScreenAccess.java b/common/src/main/java/dev/architectury/hooks/client/screen/ScreenAccess.java index e99cb68d..2efe42c6 100644 --- a/common/src/main/java/dev/architectury/hooks/client/screen/ScreenAccess.java +++ b/common/src/main/java/dev/architectury/hooks/client/screen/ScreenAccess.java @@ -20,7 +20,7 @@ package dev.architectury.hooks.client.screen; import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.Screen; @@ -32,11 +32,11 @@ public interface ScreenAccess { List getNarratables(); - List getRenderables(); + List getRenderables(); - T addRenderableWidget(T widget); + T addRenderableWidget(T widget); - T addRenderableOnly(T listener); + T addRenderableOnly(T listener); T addWidget(T listener); } diff --git a/common/src/main/java/dev/architectury/hooks/client/screen/ScreenHooks.java b/common/src/main/java/dev/architectury/hooks/client/screen/ScreenHooks.java index db417522..5911d45a 100644 --- a/common/src/main/java/dev/architectury/hooks/client/screen/ScreenHooks.java +++ b/common/src/main/java/dev/architectury/hooks/client/screen/ScreenHooks.java @@ -23,7 +23,7 @@ import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.Screen; @@ -41,17 +41,17 @@ public final class ScreenHooks { } @ExpectPlatform - public static List getRenderables(Screen screen) { + public static List getRenderables(Screen screen) { throw new AssertionError(); } @ExpectPlatform - public static T addRenderableWidget(Screen screen, T widget) { + public static T addRenderableWidget(Screen screen, T widget) { throw new AssertionError(); } @ExpectPlatform - public static T addRenderableOnly(Screen screen, T listener) { + public static T addRenderableOnly(Screen screen, T listener) { throw new AssertionError(); } diff --git a/common/src/main/java/dev/architectury/impl/ScreenAccessImpl.java b/common/src/main/java/dev/architectury/impl/ScreenAccessImpl.java index 4b98ea5d..811426cb 100644 --- a/common/src/main/java/dev/architectury/impl/ScreenAccessImpl.java +++ b/common/src/main/java/dev/architectury/impl/ScreenAccessImpl.java @@ -22,7 +22,7 @@ package dev.architectury.impl; import dev.architectury.hooks.client.screen.ScreenAccess; import dev.architectury.hooks.client.screen.ScreenHooks; import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.Screen; @@ -51,17 +51,17 @@ public class ScreenAccessImpl implements ScreenAccess { } @Override - public List getRenderables() { + public List getRenderables() { return ScreenHooks.getRenderables(screen); } @Override - public T addRenderableWidget(T widget) { + public T addRenderableWidget(T widget) { return ScreenHooks.addRenderableWidget(screen, widget); } @Override - public T addRenderableOnly(T listener) { + public T addRenderableOnly(T listener) { return ScreenHooks.addRenderableOnly(screen, listener); } diff --git a/common/src/main/resources/architectury.accessWidener b/common/src/main/resources/architectury.accessWidener index ad1281de..636e6bcc 100644 --- a/common/src/main/resources/architectury.accessWidener +++ b/common/src/main/resources/architectury.accessWidener @@ -1,6 +1,6 @@ accessWidener v2 named accessible method net/minecraft/client/gui/screens/Screen addRenderableWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; -accessible method net/minecraft/client/gui/screens/Screen addRenderableOnly (Lnet/minecraft/client/gui/components/Widget;)Lnet/minecraft/client/gui/components/Widget; +accessible method net/minecraft/client/gui/screens/Screen addRenderableOnly (Lnet/minecraft/client/gui/components/Renderable;)Lnet/minecraft/client/gui/components/Renderable; accessible method net/minecraft/client/gui/screens/Screen addWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; accessible field net/minecraft/client/gui/screens/Screen narratables Ljava/util/List; accessible field net/minecraft/client/gui/screens/Screen renderables Ljava/util/List; diff --git a/fabric/src/main/java/dev/architectury/hooks/client/screen/fabric/ScreenHooksImpl.java b/fabric/src/main/java/dev/architectury/hooks/client/screen/fabric/ScreenHooksImpl.java index 8700f7e7..365596ca 100644 --- a/fabric/src/main/java/dev/architectury/hooks/client/screen/fabric/ScreenHooksImpl.java +++ b/fabric/src/main/java/dev/architectury/hooks/client/screen/fabric/ScreenHooksImpl.java @@ -22,7 +22,7 @@ package dev.architectury.hooks.client.screen.fabric; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.AbstractWidget; -import net.minecraft.client.gui.components.Widget; +import net.minecraft.client.gui.components.Renderable; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.Screen; @@ -35,15 +35,15 @@ public class ScreenHooksImpl { return screen.narratables; } - public static List getRenderables(Screen screen) { + public static List getRenderables(Screen screen) { return screen.renderables; } - public static T addRenderableWidget(Screen screen, T widget) { + public static T addRenderableWidget(Screen screen, T widget) { return screen.addRenderableWidget(widget); } - public static T addRenderableOnly(Screen screen, T listener) { + public static T addRenderableOnly(Screen screen, T listener) { return screen.addRenderableOnly(listener); } diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java index 28285bfb..13cea79a 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java @@ -23,14 +23,13 @@ import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.shaders.Program; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.datafixers.util.Pair; -import com.mojang.math.Matrix4f; import dev.architectury.event.events.client.ClientGuiEvent; import dev.architectury.event.events.client.ClientReloadShadersEvent; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.ShaderInstance; -import net.minecraft.server.packs.resources.ResourceManager; import net.minecraft.server.packs.resources.ResourceProvider; +import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/gradle.properties b/gradle.properties index 6cac98ce..82297155 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.daemon=false platforms=fabric -minecraft_version=22w42a -supported_version=1.19.3 (22w42a) +minecraft_version=22w43a +supported_version=1.19.3 (22w43a) required_version=1.19.3 artifact_type=beta @@ -15,7 +15,7 @@ base_version=7.0 maven_group=dev.architectury fabric_loader_version=0.14.10 -fabric_api_version=0.65.0+1.19.3 +fabric_api_version=0.65.1+1.19.3 mod_menu_version=3.1.0 forge_version=43.0.0