fix package relocate

TeamFelNull · May 1, 2023 · e4ff972 · e4ff972
1 parent 244d95f
commit e4ff972
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
+
 Changelog to track updates for this mod.  
-    Add your changes to Unreleased if you want to commit.  
-    Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+Add your changes to Unreleased if you want to commit.  
+Please write according to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
@@ -15,15 +16,20 @@ Changelog to track updates for this mod.
 
 ### Fixed
 
+- Fixed a bug that caused a conflict with some mods, causing them to not start and crash.
+
 ### Security
 
 ## [3.16.3] - 2023-04-28
 
 ### Changed
+
 - Updated LavaPlayer version to 1.4
 
 ### Fixed
+
 - Fixed an issue where YouTube could not be played (Fixed by updating LavaPlayer version)
 
 [Unreleased]: https://github.com/TeamFelnull/IamMusicPlayer/compare/v3.16.3...HEAD
+
 [3.16.3]: https://github.com/TeamFelnull/IamMusicPlayer/commits/v3.16.3
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -84,10 +84,17 @@ shadowJar {
     relocate('com.sedmelluq.discord.lavaplayer', 'dev.felnull.imp.include.com.sedmelluq.discord.lavaplayer') {
         exclude 'com.sedmelluq.discord.lavaplayer.natives.**'
     }
+
     mergeServiceFiles {
         relocate 'javax.ws.rs.ext', 'dev.felnull.imp.include.javax.ws.rs.ext'
+        //   relocate 'javax.script.ScriptEngineFactory', 'dev.felnull.imp.include.javax.script.ScriptEngineFactory'
         relocate 'org.glassfish.jersey.internal.spi', 'dev.felnull.imp.include.org.glassfish.jersey.internal.spi'
     }
+
+    relocate 'ibxm', 'dev.felnull.imp.include.ibxm'
+    relocate 'net.sourceforge.jaad.aac', 'dev.felnull.imp.include.net.sourceforge.jaad.aac'
+    relocate 'org.mozilla.javascript', 'dev.felnull.imp.include.org.mozilla.javascript'
+    relocate 'org.mozilla.classfile', 'dev.felnull.imp.include.org.mozilla.classfile'
 }
 shadowJar {
     exclude "architectury.common.json"

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -99,10 +99,17 @@ shadowJar {
     relocate('com.sedmelluq.discord.lavaplayer', 'dev.felnull.imp.include.com.sedmelluq.discord.lavaplayer') {
         exclude 'com.sedmelluq.discord.lavaplayer.natives.**'
     }
+
     mergeServiceFiles {
         relocate 'javax.ws.rs.ext', 'dev.felnull.imp.include.javax.ws.rs.ext'
+        // relocate 'javax.script.ScriptEngineFactory', 'dev.felnull.imp.include.javax.script.ScriptEngineFactory'
         relocate 'org.glassfish.jersey.internal.spi', 'dev.felnull.imp.include.org.glassfish.jersey.internal.spi'
     }
+
+    relocate 'ibxm', 'dev.felnull.imp.include.ibxm'
+    relocate 'net.sourceforge.jaad.aac', 'dev.felnull.imp.include.net.sourceforge.jaad.aac'
+    relocate 'org.mozilla.javascript', 'dev.felnull.imp.include.org.mozilla.javascript'
+    relocate 'org.mozilla.classfile', 'dev.felnull.imp.include.org.mozilla.classfile'
 }
 shadowJar {
     exclude "fabric.mod.json"

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ support_versions=1.18.2
 #-------------------MOD Data--------------------#
 archives_base_name=iammusicplayer
 mod_display_name=IamMusicPlayer
-mod_version=3.16.3
+mod_version=3.16.4
 #-----------------Library Version---------------#
 architectury_version=4.1.32
 fabric_loader_version=0.13.3