fix MixinScreen

Author: plusls

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx4G
 minecraft_version=1.18.2
 loader_version=0.13.3
-mod_version=0.2
+mod_version=0.2.1
 pre_release=alpha
 maven_group=com.plusls
 archives_base_name=xaero-map-addition

src/main/java/com/plusls/xma/compat/gui/screen/CompatScreen.java

@@ -3,5 +3,5 @@
 import net.minecraft.client.gui.components.AbstractWidget;
 
 public interface CompatScreen {
-    <T extends AbstractWidget> T addAbstractWidget(T abstractWidget);
+    AbstractWidget addAbstractWidget(AbstractWidget abstractWidget);
 }

xaero_map_addition-compat-mc1_15/src/main/java/com/plusls/xma/compat/mixin/compat/screen/MixinScreen.java

@@ -9,12 +9,11 @@
 @Mixin(Screen.class)
 public abstract class MixinScreen implements CompatScreen {
 
-    // 不知道为什么，如果不加前缀会自动帮我mapping，然而这里不存在mapping
     @Shadow
-    protected abstract <T extends AbstractWidget> T shadow$addButton(T abstractWidget);
+    protected abstract AbstractWidget addButton(AbstractWidget abstractWidget);
 
     @Override
-    public <T extends AbstractWidget> T addAbstractWidget(T abstractWidget) {
-        return shadow$addButton(abstractWidget);
+    public AbstractWidget addAbstractWidget(AbstractWidget abstractWidget) {
+        return addButton(abstractWidget);
     }
 }

xaero_map_addition-compat-mc1_16/src/main/java/com/plusls/xma/compat/mixin/compat/screen/MixinScreen.java

@@ -2,18 +2,22 @@
 
 import com.plusls.xma.compat.gui.screen.CompatScreen;
 import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(Screen.class)
 public abstract class MixinScreen implements CompatScreen {
 
+    // mojang mappings 这里显示是泛型
+    // yarn: protected Element addDrawableChild(Element drawableElement)
+    // 如果采用泛型会在编译时类型擦除成 Object，然后无法匹配上方法导致 shadow 失败
     @Shadow
-    protected abstract <T extends AbstractWidget> T addButton(T abstractWidget);
+    protected abstract AbstractWidget addButton(AbstractWidget guiEventListener);
 
     @Override
-    public <T extends AbstractWidget> T addAbstractWidget(T abstractWidget) {
+    public AbstractWidget addAbstractWidget(AbstractWidget abstractWidget) {
         return addButton(abstractWidget);
     }
 }

xaero_map_addition-compat-mc1_17/src/main/java/com/plusls/xma/compat/mixin/compat/screen/MixinScreen.java

@@ -2,22 +2,22 @@
 
 import com.plusls.xma.compat.gui.screen.CompatScreen;
 import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Widget;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.screens.Screen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(Screen.class)
 public abstract class MixinScreen implements CompatScreen {
 
+    // mojang mappings 这里显示是泛型
+    // yarn: protected Element addDrawableChild(Element drawableElement)
+    // 如果采用泛型会在编译时类型擦除成 Object，然后无法匹配上方法导致 shadow 失败
     @Shadow
-    protected abstract <T extends GuiEventListener & Widget & NarratableEntry> T addRenderableWidget(T guiEventListener);
-
+    protected abstract GuiEventListener addRenderableWidget(GuiEventListener guiEventListener);
 
     @Override
-    public <T extends AbstractWidget> T addAbstractWidget(T abstractWidget) {
-        return addRenderableWidget(abstractWidget);
+    public AbstractWidget addAbstractWidget(AbstractWidget abstractWidget) {
+        return (AbstractWidget) addRenderableWidget(abstractWidget);
     }
 }

xaero_map_addition-compat-mc1_18/src/main/java/com/plusls/xma/compat/mixin/compat/screen/MixinScreen.java

@@ -2,22 +2,22 @@
 
 import com.plusls.xma.compat.gui.screen.CompatScreen;
 import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Widget;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.screens.Screen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
 @Mixin(Screen.class)
 public abstract class MixinScreen implements CompatScreen {
 
+    // mojang mappings 这里显示是泛型
+    // yarn: protected Element addDrawableChild(Element drawableElement)
+    // 如果采用泛型会在编译时类型擦除成 Object，然后无法匹配上方法导致 shadow 失败
     @Shadow
-    protected abstract <T extends GuiEventListener & Widget & NarratableEntry> T addRenderableWidget(T guiEventListener);
-
+    protected abstract GuiEventListener addRenderableWidget(GuiEventListener guiEventListener);
 
     @Override
-    public <T extends AbstractWidget> T addAbstractWidget(T abstractWidget) {
-        return addRenderableWidget(abstractWidget);
+    public AbstractWidget addAbstractWidget(AbstractWidget abstractWidget) {
+        return (AbstractWidget) addRenderableWidget(abstractWidget);
     }
 }