Port for 1.21.9

Author: shedaniel

.github/workflows/1.21.6_pr.yml .github/workflows/1.21.9_pr.yml.github/workflows/1.21.6_pr.yml renamed to .github/workflows/1.21.9_pr.yml

@@ -1,4 +1,4 @@
-name: Build PR snapshot (1.21.6)
+name: Build PR snapshot (1.21.9)
 
 on:
   pull_request:
@@ -7,7 +7,7 @@ on:
       - '**.properties'
       - '**/src/**'
     branches:
-      - "1.21.7"
+      - "1.21.9"
     types: [ opened, synchronize, reopened ]
 jobs:
   validate-gradle:

.github/workflows/1.21.6_push.yml .github/workflows/1.21.9_push.yml.github/workflows/1.21.6_push.yml renamed to .github/workflows/1.21.9_push.yml

@@ -1,4 +1,4 @@
-name: Build and Release (1.21.6)
+name: Build and Release (1.21.9)
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
       - '**/src/**'
       - '.github/**'
     branches:
-      - "1.21.7"
+      - "1.21.9"
   workflow_dispatch:
     inputs:
       norelease:

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
     id "org.cadixdev.licenser" version "0.6.1"
     id "me.shedaniel.unified-publishing" version "0.1.+" apply false
     id "maven-publish"

common/src/main/java/dev/architectury/core/item/ArchitecturySpawnEggItem.java

@@ -22,8 +22,6 @@
 import dev.architectury.injectables.annotations.ExpectPlatform;
 import dev.architectury.platform.Platform;
 import dev.architectury.utils.Env;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 
 public final class EventHandler {
     private EventHandler() {
@@ -42,7 +40,6 @@ public static void init() {
     }
 
     @ExpectPlatform
-    @Environment(EnvType.CLIENT)
     private static void registerClient() {
         throw new AssertionError();
     }
@@ -53,7 +50,6 @@ private static void registerCommon() {
     }
 
     @ExpectPlatform
-    @Environment(EnvType.SERVER)
     private static void registerServer() {
         throw new AssertionError();
     }

common/src/main/java/dev/architectury/event/EventHandler.java

@@ -23,13 +23,10 @@
 import dev.architectury.event.Event;
 import dev.architectury.event.EventFactory;
 import dev.architectury.event.EventResult;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.Nullable;
 
-@Environment(EnvType.CLIENT)
 public interface ClientChatEvent {
     /**
      * @see Send#send(String, Component)
@@ -40,7 +37,6 @@ public interface ClientChatEvent {
      */
     Event<Received> RECEIVED = EventFactory.createCompoundEventResult();
 
-    @Environment(EnvType.CLIENT)
     interface Send {
         /**
          * Event to cancel clients sending the chat message.
@@ -54,7 +50,6 @@ interface Send {
         EventResult send(String message, @Nullable Component component);
     }
 
-    @Environment(EnvType.CLIENT)
     interface Received {
         /**
          * Event to intercept the receiving of an chat message.

common/src/main/java/dev/architectury/event/events/client/ClientChatEvent.java

@@ -24,16 +24,13 @@
 import dev.architectury.event.EventFactory;
 import dev.architectury.event.EventResult;
 import dev.architectury.hooks.client.screen.ScreenAccess;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 
 import java.util.List;
 
-@Environment(EnvType.CLIENT)
 public interface ClientGuiEvent {
     /**
      * @see RenderHud#renderHud(GuiGraphics, float)
@@ -73,7 +70,6 @@ public interface ClientGuiEvent {
      */
     Event<SetScreen> SET_SCREEN = EventFactory.createCompoundEventResult();
 
-    @Environment(EnvType.CLIENT)
     interface RenderHud {
         /**
          * Invoked after the in-game hud has been rendered.
@@ -85,7 +81,6 @@ interface RenderHud {
         void renderHud(GuiGraphics graphics, DeltaTracker deltaTracker);
     }
 
-    @Environment(EnvType.CLIENT)
     interface DebugText {
         /**
          * Invoked when the debug text is being gathered for rendering.
@@ -97,7 +92,6 @@ interface DebugText {
         void gatherText(List<String> strings);
     }
 
-    @Environment(EnvType.CLIENT)
     interface ScreenInitPre {
         /**
          * Invoked when a screen is being initialized and after the previous widgets have been cleared.
@@ -111,7 +105,6 @@ interface ScreenInitPre {
         EventResult init(Screen screen, ScreenAccess access);
     }
 
-    @Environment(EnvType.CLIENT)
     interface ScreenInitPost {
         /**
          * Invoked after a screen has been initialized and all the vanilla initialization logic has happened.
@@ -123,7 +116,6 @@ interface ScreenInitPost {
         void init(Screen screen, ScreenAccess access);
     }
 
-    @Environment(EnvType.CLIENT)
     interface ScreenRenderPre {
         /**
          * Invoked before any screen is rendered.
@@ -137,10 +129,9 @@ interface ScreenRenderPre {
          * @return A {@link EventResult} determining the outcome of the event,
          * the vanilla render may be cancelled by the result.
          */
-        EventResult render(Screen screen, GuiGraphics graphics, int mouseX, int mouseY, DeltaTracker delta);
+        EventResult render(Screen screen, GuiGraphics graphics, int mouseX, int mouseY, float delta);
     }
 
-    @Environment(EnvType.CLIENT)
     interface ScreenRenderPost {
         /**
          * Invoked after a screen has finished rendering using the vanilla logic.
@@ -152,10 +143,9 @@ interface ScreenRenderPost {
          * @param mouseY   The scaled y-coordinate of the mouse cursor.
          * @param delta    The current tick delta.
          */
-        void render(Screen screen, GuiGraphics graphics, int mouseX, int mouseY, DeltaTracker delta);
+        void render(Screen screen, GuiGraphics graphics, int mouseX, int mouseY, float delta);
     }
 
-    @Environment(EnvType.CLIENT)
     interface ContainerScreenRenderBackground {
         /**
          * Invoked after a container screen's background are rendered.
@@ -170,7 +160,6 @@ interface ContainerScreenRenderBackground {
         void render(AbstractContainerScreen<?> screen, GuiGraphics graphics, int mouseX, int mouseY, float delta);
     }
 
-    @Environment(EnvType.CLIENT)
     interface ContainerScreenRenderForeground {
         /**
          * Invoked after a screen has finished rendering most of the foreground, but before any floating widgets are rendered.
@@ -185,7 +174,6 @@ interface ContainerScreenRenderForeground {
         void render(AbstractContainerScreen<?> screen, GuiGraphics graphics, int mouseX, int mouseY, float delta);
     }
 
-    @Environment(EnvType.CLIENT)
     interface SetScreen {
         /**
          * Invoked before a new screen is set to open.

common/src/main/java/dev/architectury/event/events/client/ClientGuiEvent.java

@@ -22,12 +22,9 @@
 import dev.architectury.event.Event;
 import dev.architectury.event.EventFactory;
 import dev.architectury.event.events.common.LifecycleEvent;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 
-@Environment(EnvType.CLIENT)
 public interface ClientLifecycleEvent {
     /**
      * Invoked when client has been initialised.
@@ -55,11 +52,9 @@ public interface ClientLifecycleEvent {
      */
     Event<ClientState> CLIENT_SETUP = EventFactory.createLoop();
 
-    @Environment(EnvType.CLIENT)
     interface ClientState extends LifecycleEvent.InstanceState<Minecraft> {
     }
 
-    @Environment(EnvType.CLIENT)
     interface ClientLevelState extends LifecycleEvent.LevelState<ClientLevel> {
     }
 }

common/src/main/java/dev/architectury/event/events/client/ClientLifecycleEvent.java

@@ -21,12 +21,9 @@
 
 import dev.architectury.event.Event;
 import dev.architectury.event.EventFactory;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.player.LocalPlayer;
 import org.jetbrains.annotations.Nullable;
 
-@Environment(EnvType.CLIENT)
 public interface ClientPlayerEvent {
     /**
      * @see ClientPlayerJoin#join(LocalPlayer)
@@ -41,7 +38,6 @@ public interface ClientPlayerEvent {
      */
     Event<ClientPlayerRespawn> CLIENT_PLAYER_RESPAWN = EventFactory.createLoop();
 
-    @Environment(EnvType.CLIENT)
     interface ClientPlayerJoin {
         /**
          * Invoked whenever a client player joins a level
@@ -51,7 +47,6 @@ interface ClientPlayerJoin {
         void join(LocalPlayer player);
     }
 
-    @Environment(EnvType.CLIENT)
     interface ClientPlayerQuit {
         /**
          * Invoked whenever a client player leaves a level and is cleared on the client side.
@@ -61,7 +56,6 @@ interface ClientPlayerQuit {
         void quit(@Nullable LocalPlayer player);
     }
 
-    @Environment(EnvType.CLIENT)
     interface ClientPlayerRespawn {
         /**
          * Invoked whenever the player respawn packet is received by the client.