Fail to depend on MixinExtras

Gaming32 · Apr 20, 2023 · ccdbf75 · ccdbf75
1 parent 3256112
commit ccdbf75
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 6 deletions.
diff --git a/src/main/java/io/github/gaming32/worldhost/gui/FriendsButton.java b/src/main/java/io/github/gaming32/worldhost/gui/FriendsButton.java
@@ -16,7 +16,12 @@ public class FriendsButton extends Button implements FriendsListUpdate {
     private int bgX, bgWidth;
 
     public FriendsButton(int x, int y, int width, int height, OnPress onPress) {
-        super(x, y, width, height, Component.empty(), onPress, DEFAULT_NARRATION);
+        super(
+            x, y, width, height, Component.empty(), onPress
+            //#if MC >= 11904
+            , DEFAULT_NARRATION
+            //#endif
+        );
         registerForUpdates();
     }
 
@@ -30,11 +35,21 @@ public void friendsListUpdate(Set<UUID> friends) {
         bgWidth = textRenderer.width(" " + online + " ");
     }
 
+    //#if MC < 11904
+    //$$ private int getX() {
+    //$$     return x;
+    //$$ }
+    //$$
+    //$$ private int getY() {
+    //$$     return y;
+    //$$ }
+    //#endif
+
     @Override
     //#if MC >= 11904
     public void renderString(@NotNull PoseStack poseStack, @NotNull Font font, int i) {
     //#else
-    //$$ protected void renderBg(PoseStack matrices, Minecraft minecraft, int mouseX, int mouseY) {
+    //$$ protected void renderBg(PoseStack poseStack, Minecraft minecraft, int mouseX, int mouseY) {
     //#endif
         final int baseX = getX() + bgX;
         final int baseY = getY() + (height - 12) / 2;

diff --git a/src/main/java/io/github/gaming32/worldhost/gui/OnlineFriendsScreen.java b/src/main/java/io/github/gaming32/worldhost/gui/OnlineFriendsScreen.java
@@ -32,6 +32,10 @@
 
 import java.util.*;
 
+//#if MC < 11904
+//$$ import java.text.ParseException;
+//#endif
+
 public class OnlineFriendsScreen extends WorldHostScreen implements FriendsListUpdate {
     private final Screen parent;
     private OnlineFriendsList list;
@@ -422,7 +426,7 @@ private void updateServerInfo() {
             //$$     try {
             //$$         favicon = ServerData.parseFavicon(favicon);
             //$$     } catch (ParseException e) {
-            //$$         WorldHostCommon.LOGGER.error("Invalid server icon", e);
+            //$$         WorldHost.LOGGER.error("Invalid server icon", e);
             //$$     }
             //$$ }
             //$$

diff --git a/src/main/java/io/github/gaming32/worldhost/mixin/MixinPublishCommand.java b/src/main/java/io/github/gaming32/worldhost/mixin/MixinPublishCommand.java
@@ -9,6 +9,11 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+//#if MC < 11904
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+//#endif
+
 @Mixin(PublishCommand.class)
 public class MixinPublishCommand {
     //#if MC >= 11904

diff --git a/src/main/java/io/github/gaming32/worldhost/mixin/MixinShareToLanScreen.java b/src/main/java/io/github/gaming32/worldhost/mixin/MixinShareToLanScreen.java
@@ -7,6 +7,8 @@
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
 //#if MC < 11904
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+//$$ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 //$$ import io.github.gaming32.worldhost.versions.Components;
 //$$ import net.minecraft.network.chat.MutableComponent;
 //$$ import org.spongepowered.asm.mixin.injection.At;

diff --git a/version.gradle.kts b/version.gradle.kts
@@ -18,6 +18,8 @@ repositories {
     }
 
     maven("https://maven.terraformersmc.com/releases")
+
+    maven("https://jitpack.io")
 }
 
 val bundle: Configuration by configurations.creating {
@@ -47,9 +49,11 @@ dependencies {
 
     includeImplementation("org.quiltmc:quilt-json5:1.0.2")
 
-    val mixinExtras = "com.github.LlamaLad7.MixinExtras:mixinextras-${mcData.loader.name}:0.2.0-beta.6"
-    includeImplementation("com.github.LlamaLad7.MixinExtras:mixinextras-fabric:0.2.0-beta.6")
-    annotationProcessor("com.github.LlamaLad7.MixinExtras:mixinextras-fabric:0.2.0-beta.6")
+    "com.github.LlamaLad7.MixinExtras:mixinextras-${mcData.loader.name}:0.2.0-beta.6".let {
+        modImplementation(it)
+        bundle(it)
+        annotationProcessor(it)
+    }
 
     if (mcData.isFabric) {
         when (mcData.version) {