Fix resize

Jack253-png · Sep 22, 2024 · 781d575 · 781d575
1 parent eda1cf6
commit 781d575
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/flutter-ui/src/main/java/com/primogemstudio/advancedfmk/flutter/FlutterInstance.kt b/flutter-ui/src/main/java/com/primogemstudio/advancedfmk/flutter/FlutterInstance.kt
@@ -10,13 +10,14 @@ import com.primogemstudio.advancedfmk.flutter.Shaders.POST_BLUR
 import net.minecraft.client.Minecraft
 import java.lang.ref.Cleaner
 
-class FlutterInstance(assets: String?, val rect: FlutterRect, var width: Int, var height: Int): AutoCloseable {
+class FlutterInstance(assets: String?, val rect: FlutterRect, var width: Int, var height: Int) : AutoCloseable {
     companion object {
         val ITARGET = TextureTarget(1, 1, false, false).apply {
             setClearColor(0f, 0f, 0f, 0f)
             clear(false)
         }
     }
+
     private val cleaner: Cleaner.Cleanable
     val handle: Long = FlutterNative.createInstance(assets)
     var pressed: Boolean = false

diff --git a/.../advancedfmk/mixin/RenderSystemMixin.java → .../advancedfmk/mixin/GameRendererMixin.java b/.../advancedfmk/mixin/RenderSystemMixin.java → .../advancedfmk/mixin/GameRendererMixin.java
@@ -2,7 +2,9 @@
 
 import com.primogemstudio.advancedfmk.flutter.FlutterInstance;
 import com.primogemstudio.advancedfmk.flutter.FlutterRect;
+import com.primogemstudio.advancedfmk.flutter.FlutterViewEvent;
 import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
@@ -11,15 +13,16 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(GameRenderer.class)
-public abstract class RenderSystemMixin {
+public abstract class GameRendererMixin {
     @Unique
     private static FlutterInstance instance;
 
     @Inject(method = "render", at = @At(value = "RETURN"))
     private void flipFrame(DeltaTracker deltaTracker, boolean renderLevel, CallbackInfo ci) {
         if (instance == null) {
+            var window = Minecraft.getInstance().getWindow();
             instance = new FlutterInstance("jar://app", new FlutterRect(), 600, 800);
-            instance.sendSizeEvent();
+            FlutterViewEvent.INSTANCE.resize(window.getWidth(), window.getHeight());
             instance.getComposeData().setBlurType(1);
             instance.getComposeData().setBlurRadius(8);
             instance.getComposeData().setNoise(0.005f);

diff --git a/flutter-ui/src/main/resources/advancedfmk.flutter.mixins.json b/flutter-ui/src/main/resources/advancedfmk.flutter.mixins.json
@@ -5,10 +5,10 @@
   "compatibilityLevel": "JAVA_21",
   "client": [
     "FlutterWindowMixin",
+    "GameRendererMixin",
     "KeyboardHandlerMixin",
     "MinecraftMixin",
-    "MouseHandlerMixin",
-    "RenderSystemMixin"
+    "MouseHandlerMixin"
   ],
   "injectors": {
     "defaultRequire": 1