Merge branch '1.20.1' into 1.20

# Conflicts: # changelog.md # gradle.properties # src/main/java/org/ladysnake/impersonate/impl/mixin/compat/EffectiveCosmeticsMixin.java # src/main/resources/fabric.mod.json
Ladysnake · Jan 2, 2024 · 0dec7e3 · 0dec7e3
2 parents b5cc2d2 + dd11d5f
commit 0dec7e3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,11 @@ Version 3.0.0
 - Updated to 1.20.4
 - **BREAKING (for developers) :** Changed package from `io.github.ladysnake` to `org.ladysnake`
 
+------------------------------------------------------
+Version 2.10.2
+------------------------------------------------------
+- Fixed incompatibility with Effective 3.0
+
 ------------------------------------------------------
 Version 2.10.1
 ------------------------------------------------------

diff --git a/gradle/compat-libs.versions.toml b/gradle/compat-libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-effective = "2.1+1.19.2"
+effective = "3.0.0+1.20.1"
 
 [libraries]
-effective = { module = "io.github.ladysnake:Effective", version.ref = "effective" }
+effective = { module = "org.ladysnake:effective", version.ref = "effective" }
diff --git a/src/main/java/org/ladysnake/impersonate/impl/mixin/compat/EffectiveCosmeticsMixin.java b/src/main/java/org/ladysnake/impersonate/impl/mixin/compat/EffectiveCosmeticsMixin.java
@@ -18,12 +18,12 @@
 package org.ladysnake.impersonate.impl.mixin.compat;
 
 import com.mojang.authlib.GameProfile;
-import ladysnake.effective.cosmetics.EffectiveCosmetics;
-import ladysnake.effective.cosmetics.data.PlayerCosmeticData;
 import net.minecraft.client.render.entity.PlayerModelPart;
 import net.minecraft.entity.player.PlayerEntity;
 import org.jetbrains.annotations.Nullable;
 import org.ladysnake.impersonate.Impersonator;
+import org.ladysnake.effective.cosmetics.EffectiveCosmetics;
+import org.ladysnake.effective.cosmetics.data.PlayerCosmeticData;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -13,10 +13,9 @@
     "Aelpecyem"
   ],
   "contact": {
+    "homepage": "https://ladysnake.org/wiki/impersonate",
     "sources": "https://github.com/Ladysnake/Impersonate",
-    "issues": "https://github.com/Ladysnake/Impersonate/issues",
-    "website": "https://ladysnake.org/wiki/impersonate",
-    "discord": "ladysnake.glitch.me/discord"
+    "issues": "https://github.com/Ladysnake/Impersonate/issues"
   },
   "environment": "*",
   "entrypoints": {
@@ -50,6 +49,12 @@
   "custom": {
     "cardinal-components": [
       "impersonate:impersonation"
-    ]
+    ],
+    "modmenu": {
+      "links": {
+        "modmenu.discord": "https://discord.ladysnake.org",
+        "modmenu.wiki": "https://ladysnake.org/wiki/impersonate"
+      }
+    }
   }
 }