imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 11:57:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to 22w43a

Browse Source
This commit is contained in:
shedaniel
2022-10-28 16:05:33 +08:00
parent 006b49f792
commit c3f3d9627b
7 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/dev/architectury/hooks/client/screen/ScreenAccess.java
View File

@@ -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<NarratableEntry> getNarratables();
List<Widget> getRenderables();
List<Renderable> getRenderables();
<T extends AbstractWidget & Widget & NarratableEntry> T addRenderableWidget(T widget);
<T extends AbstractWidget & Renderable & NarratableEntry> T addRenderableWidget(T widget);
<T extends Widget> T addRenderableOnly(T listener);
<T extends Renderable> T addRenderableOnly(T listener);
<T extends GuiEventListener & NarratableEntry> T addWidget(T listener);
}

8
common/src/main/java/dev/architectury/hooks/client/screen/ScreenHooks.java
View File

@@ -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<Widget> getRenderables(Screen screen) {
public static List<Renderable> getRenderables(Screen screen) {
throw new AssertionError();
}
@ExpectPlatform
public static <T extends AbstractWidget & Widget & NarratableEntry> T addRenderableWidget(Screen screen, T widget) {
public static <T extends AbstractWidget & Renderable & NarratableEntry> T addRenderableWidget(Screen screen, T widget) {
throw new AssertionError();
}
@ExpectPlatform
public static <T extends Widget> T addRenderableOnly(Screen screen, T listener) {
public static <T extends Renderable> T addRenderableOnly(Screen screen, T listener) {
throw new AssertionError();
}

8
common/src/main/java/dev/architectury/impl/ScreenAccessImpl.java
View File

@@ -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<Widget> getRenderables() {
public List<Renderable> getRenderables() {
return ScreenHooks.getRenderables(screen);
}
@Override
public <T extends AbstractWidget & Widget & NarratableEntry> T addRenderableWidget(T widget) {
public <T extends AbstractWidget & Renderable & NarratableEntry> T addRenderableWidget(T widget) {
return ScreenHooks.addRenderableWidget(screen, widget);
}
@Override
public <T extends Widget> T addRenderableOnly(T listener) {
public <T extends Renderable> T addRenderableOnly(T listener) {
return ScreenHooks.addRenderableOnly(screen, listener);
}

2
common/src/main/resources/architectury.accessWidener
View File

@@ -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;

8
fabric/src/main/java/dev/architectury/hooks/client/screen/fabric/ScreenHooksImpl.java
View File

@@ -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<Widget> getRenderables(Screen screen) {
public static List<Renderable> getRenderables(Screen screen) {
return screen.renderables;
}
public static <T extends AbstractWidget & Widget & NarratableEntry> T addRenderableWidget(Screen screen, T widget) {
public static <T extends AbstractWidget & Renderable & NarratableEntry> T addRenderableWidget(Screen screen, T widget) {
return screen.addRenderableWidget(widget);
}
public static <T extends Widget> T addRenderableOnly(Screen screen, T listener) {
public static <T extends Renderable> T addRenderableOnly(Screen screen, T listener) {
return screen.addRenderableOnly(listener);
}

3
fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java
View File

@@ -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;

6
gradle.properties
View File

@@ -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