1.21.11 port (#1989)

* 1.21.11 port progress

* 1.21.11 port progress

* More progress

* More progress

* More progress

* More progress

* Finally, two more things to go.

* Progress

* Progress

* Now its launching.

* Various fixes
- Fixed some text not rendering because of missing alpha value (0xFFFFFF as opposed to 0xFFFFFFFF)
- Fixed some AW and AT entries.
- Got neoforge to actually launch
- Removed @onlyin annotations

* Fixed crucial error where operators werent allowed to grab items and non operators were.

* Made sure that the server is not null, not an issue with only REI but saw someone have an error to do with GameInstance.getServer() being null.

* Prepare for 1.21.11

---------

Co-authored-by: shedaniel <daniel@shedaniel.me>

Author: michiel1106

.github/workflows/curseforge.yml

@@ -25,6 +25,7 @@ on:
       - 19.x-1.21.5
       - 20.x-1.21.6
       - 1.21.9
+      - 1.21.11
 
 jobs:
   build:

api/src/main/java/me/shedaniel/rei/api/client/ClientHelper.java

@@ -34,7 +34,8 @@
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+
+import net.minecraft.resources.*;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
 
@@ -117,7 +118,7 @@ default Component getFormattedModFromItem(Item item) {
      * @param identifier the identifier to find
      * @return the mod name with blue and italic formatting
      */
-    default Component getFormattedModFromIdentifier(ResourceLocation identifier) {
+    default Component getFormattedModFromIdentifier(Identifier identifier) {
         String mod = getModFromIdentifier(identifier);
         if (mod.isEmpty())
             return Component.empty();
@@ -171,7 +172,7 @@ default List<Component> appendModIdToTooltips(List<Component> components, String
      * @param identifier the identifier to find
      * @return the mod name
      */
-    default String getModFromIdentifier(ResourceLocation identifier) {
+    default String getModFromIdentifier(Identifier identifier) {
         if (identifier == null)
             return "";
         return getModFromModId(identifier.getNamespace());

api/src/main/java/me/shedaniel/rei/api/client/REIRuntime.java

@@ -36,7 +36,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -160,15 +160,15 @@ default Optional<ScreenOverlay> getOverlay(boolean reset) {
      *
      * @return the texture location of the default display background
      */
-    ResourceLocation getDefaultDisplayTexture();
+    Identifier getDefaultDisplayTexture();
 
     /**
      * Returns the texture location of the default display background.
      *
      * @param darkTheme whether dark mode is enabled
      * @return the texture location of the default display background
      */
-    ResourceLocation getDefaultDisplayTexture(boolean darkTheme);
+    Identifier getDefaultDisplayTexture(boolean darkTheme);
 
     /**
      * Returns the location of the search field, according to the current screen.

api/src/main/java/me/shedaniel/rei/api/client/config/ConfigObject.java

@@ -31,7 +31,7 @@
 import me.shedaniel.rei.api.common.category.CategoryIdentifier;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -247,7 +247,7 @@ default boolean isLeftHandSidePanel() {
 
     @ApiStatus.Experimental
     @Nullable
-    ResourceLocation getInputMethodId();
+    Identifier getInputMethodId();
 
     boolean doesDisableRecipeBook();
 

api/src/main/java/me/shedaniel/rei/api/client/entry/filtering/FilteringRuleType.java

@@ -28,7 +28,7 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -74,7 +74,7 @@ static CompoundTag save(FilteringRule<?> rule, CompoundTag tag) {
      */
     @Nullable
     static FilteringRule<?> read(CompoundTag tag) {
-        FilteringRuleType<?> type = FilteringRuleTypeRegistry.getInstance().get(ResourceLocation.tryParse(tag.getString("id").orElseThrow()));
+        FilteringRuleType<?> type = FilteringRuleTypeRegistry.getInstance().get(Identifier.tryParse(tag.getString("id").orElseThrow()));
         if (type == null) return null;
         return type.readFrom(tag.getCompoundOrEmpty("rule"));
     }
@@ -127,7 +127,7 @@ default Component getSubtitle(T rule) {
      *
      * @return the id of the filtering rule type
      */
-    default ResourceLocation getId() {
+    default Identifier getId() {
         return Objects.requireNonNull(FilteringRuleTypeRegistry.getInstance().getId(this), "Id of " + this);
     }
 

api/src/main/java/me/shedaniel/rei/api/client/entry/filtering/FilteringRuleTypeRegistry.java

@@ -27,7 +27,7 @@
 import me.shedaniel.rei.impl.ClientInternals;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -47,7 +47,7 @@ static FilteringRuleTypeRegistry getInstance() {
      * @return the filtering rule type with the specified id, or {@code null} if none exists
      */
     @Nullable
-    FilteringRuleType<?> get(ResourceLocation id);
+    FilteringRuleType<?> get(Identifier id);
 
     /**
      * Returns the id of the specified filtering rule type, or {@code null} if none exists.
@@ -56,15 +56,15 @@ static FilteringRuleTypeRegistry getInstance() {
      * @return the id of the specified filtering rule type, or {@code null} if none exists
      */
     @Nullable
-    ResourceLocation getId(FilteringRuleType<?> rule);
+    Identifier getId(FilteringRuleType<?> rule);
 
     /**
      * Registers the specified filtering rule type.
      *
      * @param id   the id of the filtering rule type
      * @param rule the filtering rule type
      */
-    void register(ResourceLocation id, FilteringRuleType<?> rule);
+    void register(Identifier id, FilteringRuleType<?> rule);
 
     /**
      * Returns the basic filtering rule that can be used to filter entries,

api/src/main/java/me/shedaniel/rei/api/client/entry/type/BuiltinClientEntryTypes.java

@@ -27,13 +27,13 @@
 import me.shedaniel.rei.api.common.entry.type.EntryType;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 
 @ApiStatus.NonExtendable
 @Environment(EnvType.CLIENT)
 public interface BuiltinClientEntryTypes {
-    ResourceLocation RENDERING_ID = ResourceLocation.withDefaultNamespace("rendering");
+    Identifier RENDERING_ID = Identifier.withDefaultNamespace("rendering");
 
     EntryType<Renderer> RENDERING = EntryType.deferred(RENDERING_ID);
 }

api/src/main/java/me/shedaniel/rei/api/client/favorites/CompoundFavoriteRenderer.java

@@ -30,8 +30,8 @@
 import me.shedaniel.rei.api.client.gui.Renderer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.Util;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.util.*;
 
 import java.util.List;
 import java.util.function.IntFunction;

api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntry.java

@@ -35,7 +35,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -113,7 +113,7 @@ public Optional<Supplier<Collection<FavoriteMenuEntry>>> getMenuEntries() {
     @Override
     public abstract FavoriteEntry copy();
 
-    public abstract ResourceLocation getType();
+    public abstract Identifier getType();
 
     @Override
     public boolean equals(Object o) {

api/src/main/java/me/shedaniel/rei/api/client/favorites/FavoriteEntryType.java

@@ -33,7 +33,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
@@ -44,12 +44,12 @@ public interface FavoriteEntryType<T extends FavoriteEntry> {
     /**
      * A builtin type of favorites, wrapping a {@link EntryStack}.
      */
-    ResourceLocation ENTRY_STACK = ResourceLocation.fromNamespaceAndPath("roughlyenoughitems", "entry_stack");
+    Identifier ENTRY_STACK = Identifier.fromNamespaceAndPath("roughlyenoughitems", "entry_stack");
     /**
      * A builtin type of favorites, wrapping a {@link Display}.
      */
     @ApiStatus.Experimental
-    ResourceLocation DISPLAY = ResourceLocation.fromNamespaceAndPath("roughlyenoughitems", "display");
+    Identifier DISPLAY = Identifier.fromNamespaceAndPath("roughlyenoughitems", "display");
 
     static Registry registry() {
         return PluginManager.getClientInstance().get(FavoriteEntryType.Registry.class);
@@ -63,12 +63,12 @@ static Registry registry() {
 
     @ApiStatus.NonExtendable
     interface Registry extends Reloadable<REIClientPlugin> {
-        void register(ResourceLocation id, FavoriteEntryType<?> type);
+        void register(Identifier id, FavoriteEntryType<?> type);
 
-        @Nullable <A extends FavoriteEntry> FavoriteEntryType<A> get(ResourceLocation id);
+        @Nullable <A extends FavoriteEntry> FavoriteEntryType<A> get(Identifier id);
 
         @Nullable
-        ResourceLocation getId(FavoriteEntryType<?> type);
+        Identifier getId(FavoriteEntryType<?> type);
 
         Section getOrCrateSection(Component text);