Skip to content

Commit 1eea967

Browse files
committed
Fix: Content plugin URLs not being used
1 parent 51a009f commit 1eea967

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

common/src/main/java/com/loohp/multichatdiscordsrvaddon/AssetsDownloader.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,8 @@ public static ServerResourcePackDownloadResult downloadServerResourcePack(File p
176176

177177
if (!Config.i().getResources().serverResourcePackProvider().equalsIgnoreCase("none")) {
178178
String fetchedPackURL = PackProviderUtils.getResourcePackURL();
179-
Debug.debug("Fetched resourcepack URL: " + fetchedPackURL);
180179
if (fetchedPackURL != null) {
181-
fetchedPackURL = null;
180+
url = fetchedPackURL;
182181
hash = null;
183182
}
184183
}

common/src/main/java/com/loohp/multichatdiscordsrvaddon/utils/PackProviderUtils.java

+4-12
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.loohp.multichatdiscordsrvaddon.hooks.ItemsAdderHook;
66
import com.loohp.multichatdiscordsrvaddon.hooks.NexoHook;
77
import com.loohp.multichatdiscordsrvaddon.hooks.OraxenHook;
8+
import dev.lone.itemsadder.api.ItemsAdder;
89

910
import java.util.Locale;
1011

@@ -18,18 +19,9 @@ public static String getResourcePackURL() {
1819
Debug.debug("Parsed provider type: " + providerType);
1920

2021
return switch (providerType) {
21-
case ORAXEN -> {
22-
Debug.debug("Oraxen provider type.");
23-
yield OraxenHook.getResourcePackURL();
24-
}
25-
case NEXO -> {
26-
Debug.debug("Nexo provider type");
27-
yield NexoHook.getResourcePackURL();
28-
}
29-
case ITEMSADDER -> {
30-
Debug.debug("ItemsAdder provider type.");
31-
yield ItemsAdderHook.getResourcePackURL();
32-
}
22+
case ORAXEN -> OraxenHook.getResourcePackURL();
23+
case NEXO -> NexoHook.getResourcePackURL();
24+
case ITEMSADDER -> ItemsAdderHook.getResourcePackURL();
3325
case NONE -> null;
3426
};
3527

0 commit comments

Comments
 (0)