Update for Minecraft 1.21.11

- Entity system: ValueOutput/ValueInput for save data, new dropItem/survives
  signatures, direction field access via getters, synched data builder pattern

- Rendering: EntityRenderer<T,S> with RenderState, submit() replacing render(),
  SubmitNodeCollector replacing MultiBufferSource, RenderType -> RenderTypes

- GUI: renderContents replacing renderWidget, Matrix3x2fStack replacing PoseStack,
  new blit() UV signature, DynamicTexture requires name supplier, Permissions API

- Networking: level().getServer() replacing getServer(), isClientSide() method

- Registration: ResourceKey-based entity building, getValue() on registries,
  Codec-based resource loaders, lambda EntityRendererProviders

- Resources: new item model dispatch JSON files, updated recipe ingredient format,
  accesswidener cleanup

- NeoForge: PacketDistributor -> ClientPacketDistributor,
  AddReloadListenerEvent -> AddServerReloadListenersEvent,
  remove @EventBusSubscriber bus argument,
  remove additionalRuntimeClasspath from Gradle build

- Build: bump Gradle 9.3, Fabric Loom 1.15, Fabric API 0.141.3+1.21.11,
  Fabric Loader 0.18.4, NeoForge 21.11.38-beta, NeoForm 1.21.11-20251209.172050,
  Parchment 2025.12.20, Fzzy Config 0.7.6+1.21.11, ModMenu 17.0.0-beta.2,
  Minecraft 1.21.11

Author: luavixen

build.gradle

@@ -1,8 +1,8 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.10-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.15-SNAPSHOT' apply false
     // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
-    id 'net.neoforged.moddev' version '2.0.90' apply false
+    id 'net.neoforged.moddev' version '2.0.140' apply false
 }
 
 def getAppVersion = { ->
@@ -24,4 +24,4 @@ def getAppVersion = { ->
 
 subprojects {
     version = getAppVersion()
-}
+}

common/src/main/java/net/conczin/immersive_paintings/ClientPaintingManager.java

@@ -1,51 +1,53 @@
 package net.conczin.immersive_paintings;
 
+import com.mojang.blaze3d.platform.NativeImage;
+import net.conczin.immersive_paintings.Painting.Size;
 import net.conczin.immersive_paintings.client.gui.ImmersivePaintingScreen;
 import net.conczin.immersive_paintings.network.NetworkHandler;
 import net.conczin.immersive_paintings.network.payload.c2s.ImageRequestPayload;
-import net.conczin.immersive_paintings.Painting.Size;
 import net.conczin.immersive_paintings.registration.Configs;
 import net.conczin.immersive_paintings.util.Cache;
 import net.conczin.immersive_paintings.util.ImageManipulations;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.client.renderer.texture.TextureManager;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public class ClientPaintingManager {
-    private static final Map<ResourceLocation, Painting> paintings = Collections.synchronizedMap(new HashMap<>());
+    private static final Map<Identifier, Painting> paintings = Collections.synchronizedMap(new HashMap<>());
 
-    private static final Map<ResourceLocation, Map<Size, ResourceLocation>> textureMap = Collections.synchronizedMap(new HashMap<>());
+    private static final Map<Identifier, Map<Size, Identifier>> textureMap = Collections.synchronizedMap(new HashMap<>());
 
     private static final Map<String, Boolean> requested = Collections.synchronizedMap(new HashMap<>());
 
     private static final ClientCache paintingCache = new ClientCache();
 
     private final static ExecutorService service = Executors.newFixedThreadPool(2);
 
-    public static Map<ResourceLocation, Painting> getPaintings() {
+    public static Map<Identifier, Painting> getPaintings() {
         return paintings;
     }
 
-    public static Optional<Painting> getPainting(ResourceLocation identifier) {
+    public static Optional<Painting> getPainting(Identifier identifier) {
         return Optional.ofNullable(paintings.get(identifier));
     }
 
-    private static String textureIdentifier(ResourceLocation identifier, Size size) {
+    private static String textureIdentifier(Identifier identifier, Size size) {
         if (size == Size.FULL)
             return identifier.getPath();
         return identifier.getPath() + "_" + size.name().toLowerCase();
     }
 
-    private static void setImageRequest(ResourceLocation identifier, boolean thumbnail, boolean delete) {
+    private static void setImageRequest(Identifier identifier, boolean thumbnail, boolean delete) {
         String id = textureIdentifier(identifier, thumbnail ? Size.THUMBNAIL : Size.FULL);
         if (requested.containsKey(id) == delete) {
             if (delete) {
@@ -57,7 +59,7 @@ private static void setImageRequest(ResourceLocation identifier, boolean thumbna
         }
     }
 
-    private static ResourceLocation getOrNSFW(Map<Size, ResourceLocation> mapping, ResourceLocation identifier, Size size) {
+    private static Identifier getOrNSFW(Map<Size, Identifier> mapping, Identifier identifier, Size size) {
         if (Configs.CLIENT.showNSFWPaintings)
             return mapping.get(size);
 
@@ -79,11 +81,11 @@ private static ResourceLocation getOrNSFW(Map<Size, ResourceLocation> mapping, R
         return Painting.DEFAULT_IDENTIFIER;
     }
 
-    public static ResourceLocation getImageIdentifier(ResourceLocation identifier, Size size) {
+    public static Identifier getImageIdentifier(Identifier identifier, Size size) {
         if (!paintings.containsKey(identifier))
             return Painting.DEFAULT_IDENTIFIER;
 
-        Map<Size, ResourceLocation> mapping = textureMap.get(identifier);
+        Map<Size, Identifier> mapping = textureMap.get(identifier);
 
         if (mapping == null) {
             // Attempt to get the thumbnail first so there's at least something displayed
@@ -109,7 +111,7 @@ public static ResourceLocation getImageIdentifier(ResourceLocation identifier, S
         return getOrNSFW(mapping, identifier, size);
     }
 
-    public static void registerPainting(ResourceLocation identifier, Painting painting) {
+    public static void registerPainting(Identifier identifier, Painting painting) {
         String fullId = textureIdentifier(identifier, Size.FULL);
         String thumbId = textureIdentifier(identifier, Size.THUMBNAIL);
 
@@ -134,13 +136,13 @@ public static void registerPainting(ResourceLocation identifier, Painting painti
         );
     }
 
-    public static void deregisterPainting(ResourceLocation identifier) {
+    public static void deregisterPainting(Identifier identifier) {
         if (!paintings.containsKey(identifier))
             return;
 
         paintings.remove(identifier);
 
-        Map<Size, ResourceLocation> map = textureMap.remove(identifier);
+        Map<Size, Identifier> map = textureMap.remove(identifier);
         if (map != null) {
             TextureManager manager = Minecraft.getInstance().getTextureManager();
             map.forEach((size, id) -> {
@@ -150,9 +152,9 @@ public static void deregisterPainting(ResourceLocation identifier) {
         }
     }
 
-    private static void registerImageType(ResourceLocation identifier, BufferedImage fullImage, Size size, Size realSize, final boolean alreadyCached) {
+    private static void registerImageType(Identifier identifier, BufferedImage fullImage, Size size, Size realSize, final boolean alreadyCached) {
         textureMap.putIfAbsent(identifier, new HashMap<>());
-        Map<Size, ResourceLocation> mapping = textureMap.get(identifier);
+        Map<Size, Identifier> mapping = textureMap.get(identifier);
 
         // Handle cases where an image is too small, and realSize == Size.HALF/QUARTER/EIGHTH but size == Size.FULL
         if (mapping.containsKey(size) && size != realSize) {
@@ -178,22 +180,29 @@ private static void registerImageType(ResourceLocation identifier, BufferedImage
                     paintingCache.set(path, target);
             }
 
-            ResourceLocation id = Minecraft.getInstance().getTextureManager().register(Main.MOD_ID + "/" + path, new DynamicTexture(ImageManipulations.bufferedToNative(target)));
-            mapping.put(realSize, id);
+            Identifier id = Main.locate(path);
+            NativeImage nativeImage = ImageManipulations.bufferedToNative(target);
 
-            if (size == Size.THUMBNAIL && Minecraft.getInstance().screen instanceof ImmersivePaintingScreen screen)
-                screen.updateWidget(identifier);
+            // DynamicTexture construction calls RenderSystem GPU methods (createTexture, upload)
+            // which must run on the render/main thread. Schedule it there.
+            Minecraft.getInstance().execute(() -> {
+                Minecraft.getInstance().getTextureManager().register(id, new DynamicTexture(() -> "immersive_paintings_" + path, nativeImage));
+                mapping.put(realSize, id);
+
+                if (size == Size.THUMBNAIL && Minecraft.getInstance().screen instanceof ImmersivePaintingScreen screen)
+                    screen.updateWidget(identifier);
+            });
         });
     }
 
-    public static void registerThumbnail(ResourceLocation identifier, BufferedImage image, boolean alreadyCached) {
+    public static void registerThumbnail(Identifier identifier, BufferedImage image, boolean alreadyCached) {
         registerImageType(identifier, image, Size.THUMBNAIL, Size.THUMBNAIL, alreadyCached);
         setImageRequest(identifier, true, true);
     }
 
     // TODO: for datapacks, use FULL for all sizes that aren't thumbnail
     // registers this textures and make it readable
-    public static void registerImage(ResourceLocation identifier, BufferedImage image, boolean alreadyCached) {
+    public static void registerImage(Identifier identifier, BufferedImage image, boolean alreadyCached) {
         if (!paintings.containsKey(identifier) && !alreadyCached) {
             Main.LOGGER.error("no existing painting record for identifier {}", identifier);
             return;

common/src/main/java/net/conczin/immersive_paintings/Main.java

@@ -3,7 +3,7 @@
 import com.twelvemonkeys.imageio.plugins.webp.WebPImageReaderSpi;
 import net.conczin.immersive_paintings.dev.DatapackPaintingsGenerator;
 import net.conczin.immersive_paintings.registration.Configs;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -15,8 +15,8 @@ public final class Main {
     public static final String MOD_ID = "immersive_paintings";
     public static final Logger LOGGER = LogManager.getLogger();
 
-    public static ResourceLocation locate(String path) {
-        return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
+    public static Identifier locate(String path) {
+        return Identifier.fromNamespaceAndPath(MOD_ID, path);
     }
 
     public static void init() {

common/src/main/java/net/conczin/immersive_paintings/Painting.java

@@ -9,7 +9,7 @@
 import net.minecraft.core.UUIDUtil;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import net.minecraft.util.StringRepresentable;
 import org.jetbrains.annotations.NotNull;
 
@@ -33,13 +33,13 @@ public record Painting(int version, int width, int height, int resolution, Strin
 
     public static final StreamCodec<ByteBuf, Painting> STREAM_CODEC = ByteBufCodecs.fromCodec(CODEC);
 
-    public static final ResourceLocation DEFAULT_IDENTIFIER = Main.locate("textures/block/frame/canvas.png");
+    public static final Identifier DEFAULT_IDENTIFIER = Main.locate("textures/block/frame/canvas.png");
 
     public Painting(int width, int height, int resolution, String name, String author, UUID authorUUID, Type type, EnumSet<Flag> flags, String hash) {
         this(1, width, height, resolution, name, author, authorUUID, type, flags, hash);
     }
 
-    public ResourceLocation location() {
+    public Identifier location() {
         switch (type) {
             case Type.DATAPACK -> {
                 return Main.locate("datapack/" + hash);