Fixes oops

FiguraMC · Jul 6, 2024 · 360e7b0 · 360e7b0
1 parent d07902d
commit 360e7b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/common/src/main/java/org/figuramc/figura/lua/api/world/WorldAPI.java b/common/src/main/java/org/figuramc/figura/lua/api/world/WorldAPI.java
@@ -205,7 +205,7 @@ public static HashMap<String, Object> getMapData(String id) {
                 decorationMap.put("x", decoration.x());
                 decorationMap.put("y", decoration.y());
                 decorationMap.put("rot", decoration.rot());
-                decorationMap.put("image", decoration.type().getIcon());
+                decorationMap.put("image", decoration.getSpriteLocation());
                 decorations.add(decorationMap);
         }
         map.put("decorations", decorations);

diff --git a/common/src/main/java/org/figuramc/figura/mixin/font/FontSetMixin.java b/common/src/main/java/org/figuramc/figura/mixin/font/FontSetMixin.java
@@ -35,10 +35,8 @@ public abstract class FontSetMixin {
     @Unique
     int figura$codePoint = -1;
 
-    //method_27545 for fabric intermediary, m_232558_ for SRG, lambda$setGlyphProviders$5 unmapped for OF, lambda$reload$5 for NeoForge, i had dig at the bytecode for this one
-    //@Inject(method = {"method_27545", "m_232558_", "lambda$setGlyphProviders$5", "lambda$reload$5"}, at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/font/GlyphInfo;getAdvance(Z)F", shift = At.Shift.BEFORE, remap = true), locals = LocalCapture.CAPTURE_FAILEXCEPTION, remap = false)
-    //method_57035 for fabric intermediary
-    @Inject(method = {"method_57035"}, at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/font/GlyphInfo;getAdvance(Z)F", shift = At.Shift.BEFORE), locals = LocalCapture.CAPTURE_FAILEXCEPTION)
+    //method_57035 for fabric intermediary, lambda$selectProviders$5 for everything else
+    @Inject(method = {"method_57035", "lambda$selectProviders$5"}, at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/font/GlyphInfo;getAdvance(Z)F", shift = At.Shift.BEFORE, remap = true), locals = LocalCapture.CAPTURE_FAILEXCEPTION, remap = false)
     public void thing(List<?> list, Set<?> set, int i, CallbackInfo ci, Iterator<?> var4, GlyphProvider glyphProvider, GlyphInfo glyphInfo) {
         if (figura$isEmojiFont() && glyphInfo instanceof BitmapProvider.Glyph) {
             ((BitmapProviderGlyphAccessor) glyphInfo).figura$setAdvance(8);