Some fixes

Author: eclipseisoffline

client/src/main/java/org/geysermc/rainbow/client/MinecraftAssetResolver.java

@@ -1,5 +1,6 @@
 package org.geysermc.rainbow.client;
 
+import com.mojang.blaze3d.platform.NativeImage;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.item.ClientItem;
 import net.minecraft.client.renderer.texture.SpriteContents;
@@ -8,26 +9,31 @@
 import net.minecraft.client.resources.model.EquipmentClientInfo;
 import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.client.resources.model.ResolvedModel;
-import net.minecraft.data.AtlasIds;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.item.equipment.EquipmentAsset;
+import org.geysermc.rainbow.Rainbow;
+import org.geysermc.rainbow.RainbowIO;
 import org.geysermc.rainbow.client.accessor.ResolvedModelAccessor;
 import org.geysermc.rainbow.client.mixin.EntityRenderDispatcherAccessor;
 import org.geysermc.rainbow.mapping.AssetResolver;
 import org.geysermc.rainbow.mapping.texture.TextureResource;
 import org.geysermc.rainbow.mixin.SpriteContentsAccessor;
 
+import java.io.InputStream;
 import java.util.Optional;
 
 public class MinecraftAssetResolver implements AssetResolver {
     private final ModelManager modelManager;
     private final EquipmentAssetManager equipmentAssetManager;
+    private final ResourceManager resourceManager;
     private final AtlasManager atlasManager;
 
     public MinecraftAssetResolver(Minecraft minecraft) {
         modelManager = minecraft.getModelManager();
         equipmentAssetManager = ((EntityRenderDispatcherAccessor) minecraft.getEntityRenderDispatcher()).getEquipmentAssets();
+        resourceManager = minecraft.getResourceManager();
         atlasManager = minecraft.getAtlasManager();
     }
 
@@ -47,8 +53,19 @@ public Optional<EquipmentClientInfo> getEquipmentInfo(ResourceKey<EquipmentAsset
     }
 
     @Override
-    public Optional<TextureResource> getBlockTexture(ResourceLocation location) {
-        SpriteContents contents = atlasManager.getAtlasOrThrow(AtlasIds.BLOCKS).getSprite(location).contents();
-        return Optional.of(new TextureResource(((SpriteContentsAccessor) contents).getOriginalImage(), contents.width(), contents.height()));
+    public Optional<TextureResource> getTexture(ResourceLocation atlas, ResourceLocation location) {
+        if (atlas == null) {
+            // Not in an atlas - so not animated, probably?
+            return RainbowIO.safeIO(() -> {
+                try (InputStream textureStream = resourceManager.open(Rainbow.decorateTextureLocation(location))) {
+                    return new TextureResource(NativeImage.read(textureStream));
+                }
+            });
+        }
+        SpriteContents contents = atlasManager.getAtlasOrThrow(atlas).getSprite(location).contents();
+        NativeImage original = ((SpriteContentsAccessor) contents).getOriginalImage();
+        NativeImage textureCopy = new NativeImage(original.getWidth(), original.getHeight(), false);
+        textureCopy.copyFrom(original);
+        return Optional.of(new TextureResource(textureCopy, contents.width(), contents.height()));
     }
 }

client/src/main/java/org/geysermc/rainbow/client/MinecraftPackSerializer.java

@@ -28,7 +28,7 @@ public MinecraftPackSerializer(Minecraft minecraft) {
     @Override
     public <T> CompletableFuture<?> saveJson(Codec<T> codec, T object, Path path) {
         DynamicOps<JsonElement> ops = RegistryOps.create(JsonOps.INSTANCE, registries);
-        return CompletableFuture.runAsync(() -> RainbowIO.safeIO(() -> CodecUtil.trySaveJson(codec, object, path.resolveSibling(path.getFileName() + ".json"), ops)),
+        return CompletableFuture.runAsync(() -> RainbowIO.safeIO(() -> CodecUtil.trySaveJson(codec, object, path, ops)),
                 Util.backgroundExecutor().forName("PackSerializer-saveJson"));
     }
 

client/src/main/java/org/geysermc/rainbow/client/PackManager.java

@@ -35,7 +35,7 @@ public final class PackManager {
 
     private static final Path EXPORT_DIRECTORY = FabricLoader.getInstance().getGameDir().resolve(Rainbow.MOD_ID);
     private static final Path PACK_DIRECTORY = Path.of("pack");
-    private static final Path MAPPINGS_FILE = Path.of("geyser_mappings");
+    private static final Path MAPPINGS_FILE = Path.of("geyser_mappings.json");
     private static final Path PACK_ZIP_FILE = Path.of("pack.zip");
     private static final Path REPORT_FILE = Path.of("report.txt");
 

datagen/src/main/java/org/geysermc/rainbow/datagen/RainbowModelProvider.java

@@ -216,7 +216,8 @@ public Optional<EquipmentClientInfo> getEquipmentInfo(ResourceKey<EquipmentAsset
         }
 
         @Override
-        public Optional<TextureResource> getBlockTexture(ResourceLocation location) {
+        public Optional<TextureResource> getTexture(ResourceLocation atlas, ResourceLocation location) {
+            // We don't care about atlas since there are none loaded at datagen
             return resourceManager.getResource(Rainbow.decorateTextureLocation(location))
                     .flatMap(resource -> RainbowIO.safeIO(() -> {
                         Optional<AnimationMetadataSection> animationMetadata = resource.metadata().getSection(AnimationMetadataSection.TYPE);

rainbow/src/main/java/org/geysermc/rainbow/mapping/AssetResolver.java

@@ -18,5 +18,5 @@ public interface AssetResolver {
 
     Optional<EquipmentClientInfo> getEquipmentInfo(ResourceKey<EquipmentAsset> key);
 
-    Optional<TextureResource> getBlockTexture(ResourceLocation location);
+    Optional<TextureResource> getTexture(ResourceLocation atlas, ResourceLocation location);
 }

rainbow/src/main/java/org/geysermc/rainbow/mapping/attachable/AttachableMapper.java

@@ -10,7 +10,6 @@
 import net.minecraft.world.item.equipment.Equippable;
 import org.geysermc.rainbow.mapping.AssetResolver;
 import org.geysermc.rainbow.mapping.geometry.BedrockGeometryContext;
-import org.geysermc.rainbow.mapping.geometry.MappedGeometry;
 import org.geysermc.rainbow.mapping.texture.TextureHolder;
 import org.geysermc.rainbow.pack.attachable.BedrockAttachable;
 
@@ -34,7 +33,7 @@ public static AttachableCreator mapItem(AssetResolver assetResolver, BedrockGeom
                         .filter(assetInfo -> !assetInfo.getSecond().isEmpty())
                         .map(assetInfo -> {
                             ResourceLocation equipmentTexture = getTexture(assetInfo.getSecond(), getLayer(assetInfo.getFirst()));
-                            textureConsumer.accept(TextureHolder.createBuiltIn(equipmentTexture));
+                            textureConsumer.accept(TextureHolder.createBuiltIn(null, equipmentTexture));
                             return BedrockAttachable.equipment(bedrockIdentifier, assetInfo.getFirst(), equipmentTexture.getPath());
                         }))
                 .map(attachable -> {

rainbow/src/main/java/org/geysermc/rainbow/mapping/geometry/BedrockGeometryContext.java

@@ -3,6 +3,7 @@
 import net.minecraft.client.renderer.block.model.TextureSlots;
 import net.minecraft.client.resources.model.Material;
 import net.minecraft.client.resources.model.ResolvedModel;
+import net.minecraft.data.AtlasIds;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
 import org.geysermc.rainbow.Rainbow;
@@ -36,7 +37,7 @@ public static BedrockGeometryContext create(ResourceLocation bedrockIdentifier,
         if (layer0Texture != null) {
             geometry = Optional.empty();
             animation = Optional.empty();
-            icon = TextureHolder.createBuiltIn(layer0Texture.texture());
+            icon = TextureHolder.createBuiltIn(AtlasIds.BLOCKS, layer0Texture.texture());
         } else {
             // Unknown model (doesn't use layer0), so we immediately assume the geometry is custom
             // This check should probably be done differently (actually check if the model is 2D or 3D)

rainbow/src/main/java/org/geysermc/rainbow/mapping/texture/BuiltInTextureHolder.java

@@ -11,17 +11,19 @@
 import java.util.Optional;
 
 public class BuiltInTextureHolder extends TextureHolder {
+    private final ResourceLocation atlas;
     private final ResourceLocation source;
 
-    public BuiltInTextureHolder(ResourceLocation location, ResourceLocation source) {
+    public BuiltInTextureHolder(ResourceLocation location, ResourceLocation atlas, ResourceLocation source) {
         super(location);
+        this.atlas = atlas;
         this.source = source;
     }
 
     @Override
     public Optional<byte[]> load(AssetResolver assetResolver, ProblemReporter reporter) {
         return RainbowIO.safeIO(() -> {
-            try (TextureResource texture = assetResolver.getBlockTexture(source).orElse(null)) {
+            try (TextureResource texture = assetResolver.getTexture(atlas, source).orElse(null)) {
                 Objects.requireNonNull(texture);
                 try (NativeImage firstFrame = texture.getFirstFrame(false)) {
                     return NativeImageUtil.writeToByteArray(firstFrame);

rainbow/src/main/java/org/geysermc/rainbow/mapping/texture/StitchedTextures.java

@@ -55,7 +55,7 @@ private static SpriteLoader.Preparations prepareStitching(Stream<ResourceLocatio
 
     private static Optional<SpriteContents> readSpriteContents(ResourceLocation location, PackContext context) {
         return RainbowIO.safeIO(() -> {
-            try (TextureResource texture = context.assetResolver().getBlockTexture(location).orElse(null)) {
+            try (TextureResource texture = context.assetResolver().getTexture(AtlasIds.BLOCKS, location).orElse(null)) {
                 if (texture != null) {
                     return new SpriteContents(location, texture.sizeOfFrame(), texture.getFirstFrame(true));
                 }

rainbow/src/main/java/org/geysermc/rainbow/mapping/texture/TextureHolder.java

@@ -30,12 +30,12 @@ public static TextureHolder createCustom(ResourceLocation location, Supplier<Nat
         return new CustomTextureHolder(location, supplier);
     }
 
-    public static TextureHolder createBuiltIn(ResourceLocation location, ResourceLocation source) {
-        return new BuiltInTextureHolder(location, source);
+    public static TextureHolder createBuiltIn(ResourceLocation location, ResourceLocation atlas, ResourceLocation source) {
+        return new BuiltInTextureHolder(location, atlas, source);
     }
 
-    public static TextureHolder createBuiltIn(ResourceLocation location) {
-        return createBuiltIn(location, location);
+    public static TextureHolder createBuiltIn(ResourceLocation atlas, ResourceLocation location) {
+        return createBuiltIn(location, atlas, location);
     }
 
     public static TextureHolder createNonExistent(ResourceLocation location) {