diff --git a/build.gradle b/build.gradle index 1d761c1..247ab45 100644 --- a/build.gradle +++ b/build.gradle @@ -10,9 +10,24 @@ repositories {} dependencies { minecraft "com.mojang:minecraft:${project.minecraft_version}" + + // Switch back to Yarn mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + modApi "dev.felnull:special-model-loader:1.4.0+pre.1" + include "dev.felnull:special-model-loader:1.4.0+pre.1" +} + + +repositories { + maven { url "https://maven.parchmentmc.org" } + maven { + name = "FelNull Maven" + url = "https://maven.felnull.dev" + } } processResources { diff --git a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java index d3067af..8758a62 100644 --- a/src/main/java/org/saturnclient/saturnclient/SaturnClient.java +++ b/src/main/java/org/saturnclient/saturnclient/SaturnClient.java @@ -16,6 +16,8 @@ import org.saturnclient.saturnmods.ModManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import dev.felnull.specialmodelloader.api.event.SpecialModelLoaderEvents; + /** * Main class for the Saturn Client mod. */ @@ -32,11 +34,16 @@ public class SaturnClient implements ModInitializer { ClientLifecycleEvents.CLIENT_STOPPING.register(_o -> ConfigManager.save()); ScreenEvents.BEFORE_INIT.register((client, screen, scaledWidth, scaledHeight) -> { - if (SaturnClientConfig.saturnTitleScreen.value && screen instanceof TitleScreen && !(screen instanceof SaturnMenu)) { + if (SaturnClientConfig.saturnTitleScreen.value && screen instanceof TitleScreen + && !(screen instanceof SaturnMenu)) { client.setScreen(new SaturnTitleScreen()); } }); + SpecialModelLoaderEvents.LOAD_SCOPE.register(() -> { + return (resourceManager, location) -> MOD_ID.equals(location.getNamespace()); + }); + KeyInputHandler.register(); if (SaturnSocket.authenticate()) { Cloaks.initialize(); diff --git a/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java b/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java index 5c6b018..564775b 100644 --- a/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java +++ b/src/main/java/org/saturnclient/saturnclient/cosmetics/HatFeatureRenderer.java @@ -42,8 +42,6 @@ public class HatFeatureRenderer extends FeatureRenderer