Skip to content

Commit 1a1a755

Browse files
committed
Removed NetEaseCloud and Update mod name in lang files
1 parent 18fccdd commit 1a1a755

22 files changed

+22
-312
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[Architectury Transformer DEBUG] Closed File Systems for /home/toast/imp-vs/IamMusicPlayer_FIX/common/build/libs/iammusicplayer-3.19.12.jar
1+
[Architectury Transformer DEBUG] Closed File Systems for /home/robin/IdeaProjects/IamMusicPlayer_FIX2/common/build/libs/common.jar

api_server.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

common/src/main/java/dev/felnull/imp/IMPConfig.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ public class IMPConfig implements ConfigData {
2929
@ConfigEntry.Category("client")
3030
public String lavaPlayerNativesURL = "https://raw.githubusercontent.com/TeamFelnull/IamMusicPlayer/master/lavaplayer/natives_link.json";
3131

32-
@ConfigEntry.Category("client")
33-
public String neteaseCloudMusicApiURL = "https://raw.githubusercontent.com/TeamFelnull/IamMusicPlayer/master/api_server.json";
34-
3532
@ConfigEntry.Category("client")
3633
public boolean hideDisplaySprite = false;
3734

common/src/main/java/dev/felnull/imp/client/handler/ClientHandler.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import dev.felnull.imp.client.gui.screen.monitor.music_manager.MusicManagerMonitor;
1414
import dev.felnull.imp.client.music.MusicEngine;
1515
import dev.felnull.imp.client.music.MusicSyncManager;
16-
import dev.felnull.imp.client.neteasecloudmusic.NetEaseCloudMusicManager;
1716
import dev.felnull.imp.client.renderer.item.IMPItemRenderers;
1817
import dev.felnull.imp.client.renderer.item.hand.BoomboxHandRenderer;
1918
import dev.felnull.imp.entity.IRingerPartyParrot;
@@ -97,7 +96,6 @@ private static void onPauseChange(boolean paused) {
9796

9897
private static InteractionResult onConfigSave(ConfigHolder<IMPConfig> configHolder, IMPConfig impConfig) {
9998
MusicEngine.getInstance().destroy();
100-
NetEaseCloudMusicManager.getInstance().reload();
10199
return InteractionResult.PASS;
102100
}
103101

common/src/main/java/dev/felnull/imp/client/music/loader/IMPMusicLoaders.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class IMPMusicLoaders {
1111

1212
public static void init() {
1313
register(LavaMusicLoader::new);
14-
register(NetEaseCloudMusicLoader::new);
1514
register(YoutubeDownloaderMusicLoader::new);
1615
}
1716

common/src/main/java/dev/felnull/imp/client/music/loader/NetEaseCloudMusicLoader.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

common/src/main/java/dev/felnull/imp/client/music/media/IMPMusicMedias.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ public class IMPMusicMedias {
1010
public static final YoutubeMusicMedia YOUTUBE = new YoutubeMusicMedia("youtube");
1111
public static final SoundCloudMusicMedia SOUNDCLOUD = new SoundCloudMusicMedia("soundcloud");
1212
public static final HttpMusicMedia HTTP = new HttpMusicMedia("http");
13-
public static final NetEaseCloudMusicMedia NETEASE_CLOUD_MUSIC = new NetEaseCloudMusicMedia();
1413

1514
public static void init() {
1615
register("youtube", YOUTUBE);
1716
register("soundcloud", SOUNDCLOUD);
18-
register("netease_cloud_music", NETEASE_CLOUD_MUSIC);
1917
register("http", HTTP);
2018
}
2119

common/src/main/java/dev/felnull/imp/client/music/media/NetEaseCloudMusicMedia.java

Lines changed: 0 additions & 76 deletions
This file was deleted.

common/src/main/java/dev/felnull/imp/client/neteasecloudmusic/NetEaseCloudMusicManager.java

Lines changed: 0 additions & 149 deletions
This file was deleted.

common/src/main/java/dev/felnull/imp/client/renderer/PlayImageRenderer.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import dev.felnull.fnjl.util.FNMath;
55
import dev.felnull.fnjl.util.FNURLUtil;
66
import dev.felnull.imp.IamMusicPlayer;
7-
import dev.felnull.imp.client.music.media.NetEaseCloudMusicMedia;
8-
import dev.felnull.imp.client.neteasecloudmusic.NetEaseCloudMusicManager;
97
import dev.felnull.imp.music.resource.ImageInfo;
108
import dev.felnull.otyacraftengine.client.util.OERenderUtils;
119
import dev.felnull.otyacraftengine.client.util.OETextureUtils;
@@ -24,7 +22,6 @@ public class PlayImageRenderer {
2422
private static final String YOUTUBE_THUMBNAIL_URL = "https://i.ytimg.com/vi/%s/hqdefault.jpg";
2523
private static final Pattern YOUTUBE_THUMBNAIL_URL_REGEX = Pattern.compile("https://i.ytimg.com/vi/.+/hqdefault.jpg");
2624
private static final Pattern SOUND_CLOUD_URL_REGEX = Pattern.compile("https://soundcloud.com/.+");
27-
private static final Pattern NETEASE_CLOUD_MUSIC_URL_REGEX = Pattern.compile("https://p1.music.126.net/.+");
2825
private static final String SCT_IMG_ST = "<img ";
2926
private static final String SCT_IMG_END = ">";
3027
private static final String SCT_SRC_ST = "src=\"";
@@ -45,18 +42,6 @@ public String getSwapURL(String url) {
4542
}
4643
return ret;
4744
}
48-
} else if (url.startsWith("imp_ncmp_")) {
49-
var curl = url.substring("imp_ncmp_".length());
50-
if (!curl.isEmpty()) {
51-
String ret = null;
52-
try {
53-
var necmm = NetEaseCloudMusicManager.getInstance();
54-
var sj = necmm.getSongJson(curl);
55-
ret = necmm.getPictureURL(sj);
56-
} catch (Exception ignored) {
57-
}
58-
return ret;
59-
}
6045
}
6146
return null;
6247
}
@@ -171,17 +156,6 @@ private Pair<ResourceLocation, Vec2> getImageTexture(ImageInfo imageInfo, boolea
171156
h = (float) scale.h();
172157
}
173158
return Pair.of(loc, new Vec2(w, h));
174-
} else if (imageInfo.getImageType() == ImageInfo.ImageType.NETEASE_CLOUD_MUSIC_PICTURE) {
175-
var idf = imageInfo.getIdentifier();
176-
var loc = OETextureUtils.getAndLoadURLTextureAsync("imp_ncmp_" + idf, cash).of(NetEaseCloudMusicMedia.ICON);
177-
var scale = OETextureUtils.getTextureScale(loc);
178-
float w = 1;
179-
float h = 1;
180-
if (scale != null) {
181-
w = (float) scale.w();
182-
h = (float) scale.h();
183-
}
184-
return Pair.of(loc, new Vec2(w, h));
185159
}
186160
return null;
187161
}

0 commit comments

Comments
 (0)