diff --git a/build.gradle b/build.gradle index b1e5b09..324375a 100644 --- a/build.gradle +++ b/build.gradle @@ -9,24 +9,17 @@ group = libs.versions.maven.group.get() version = "${libs.versions.minecraft.get()}-${libs.versions.mod.get()}" base.archivesName = "${libs.versions.archives.name.get()}-forge" -loom { - forge { - mixinConfigs = [ - "bounced.mixins.json" - ] - } -} - repositories { mavenCentral() maven { url = "https://jitpack.io" } maven { url = "https://api.modrinth.com/maven" } + maven { url = "https://maven.neoforged.net/releases/" } } dependencies { minecraft(libs.minecraft) mappings(libs.yarn) { artifact { classifier = "v2" } } - forge(libs.forge) + neoForge(libs.neoforge) modCompileOnly(libs.splasher) } diff --git a/gradle.properties b/gradle.properties index 534599f..12dd19f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx4G org.gradle.parallel=true -loom.platform=forge \ No newline at end of file +loom.platform=neoforge \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2b605e9..8abac8b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,9 +3,9 @@ maven-group = "band.kessokuteatime" archives-name = "bounced" mod = "4.0.0" -minecraft = "1.20.1" -yarn = "1.20.1+build.10" -forge = "1.20.1-47.2.21" +minecraft = "1.20.4" +yarn = "1.20.4+build.3" +neoforge = "20.4.219" architectury-loom = "1.5-SNAPSHOT" splasher = "6.0.0-mc1.20" @@ -13,7 +13,7 @@ splasher = "6.0.0-mc1.20" [libraries] minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" } yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" } -forge = { group = "net.minecraftforge", name = "forge", version.ref = "forge" } +neoforge = { group = "net.neoforged", name = "neoforge", version.ref = "neoforge" } splasher = { group = "maven.modrinth", name = "splasher", version.ref = "splasher" } diff --git a/settings.gradle b/settings.gradle index 72f5431..af8defe 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,7 +2,7 @@ pluginManagement { repositories { maven { url = "https://maven.fabricmc.net/" } maven { url = "https://maven.architectury.dev/" } - maven { url = "https://maven.minecraftforge.net/" } + maven { url = "https://maven.neoforged.net/releases/" } mavenCentral() gradlePluginPortal() } diff --git a/src/main/java/band/kessokuteatime/bounced/Bounced.java b/src/main/java/band/kessokuteatime/bounced/Bounced.java index 443c0d8..550c21d 100644 --- a/src/main/java/band/kessokuteatime/bounced/Bounced.java +++ b/src/main/java/band/kessokuteatime/bounced/Bounced.java @@ -5,15 +5,14 @@ import net.minecraft.client.gui.screen.AccessibilityOnboardingScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraftforge.client.event.ScreenEvent; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.IExtensionPoint; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.loading.FMLLoader; -import net.minecraftforge.network.NetworkConstants; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.IExtensionPoint; +import net.neoforged.fml.ModList; +import net.neoforged.fml.ModLoadingContext; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.loading.FMLLoader; +import net.neoforged.neoforge.client.event.ScreenEvent; +import net.neoforged.neoforge.common.NeoForge; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +32,7 @@ public class Bounced { shouldJump = new AtomicBoolean(false); public Bounced() { - ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true)); + ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (a, b) -> true)); if (FMLLoader.getDist().isClient()) { this.onInitializeClient(); } @@ -41,12 +40,12 @@ public Bounced() { public void onInitializeClient() { boolean isSplasherLoaded = ModList.get().isLoaded("splasher"); - IEventBus forgeEventBus = MinecraftForge.EVENT_BUS; + IEventBus forgeEventBus = NeoForge.EVENT_BUS; - forgeEventBus.addListener(screenInitEvent -> { + forgeEventBus.addListener(ScreenEvent.Init.Post.class, screenInitEvent -> { Screen screen = screenInitEvent.getScreen(); if (screen instanceof TitleScreen || screen instanceof AccessibilityOnboardingScreen) { - forgeEventBus.addListener(screenMousePressedEvent -> { + forgeEventBus.addListener(ScreenEvent.MouseButtonPressed.Post.class, screenMousePressedEvent -> { double mouseX = screenMousePressedEvent.getMouseX(); double mouseY = screenMousePressedEvent.getMouseY(); double scaledWidth = screen.width; diff --git a/src/main/java/band/kessokuteatime/bounced/mixin/SplashTextAnimator.java b/src/main/java/band/kessokuteatime/bounced/mixin/SplashTextAnimator.java index 62292aa..cb5bb4f 100644 --- a/src/main/java/band/kessokuteatime/bounced/mixin/SplashTextAnimator.java +++ b/src/main/java/band/kessokuteatime/bounced/mixin/SplashTextAnimator.java @@ -32,7 +32,7 @@ private void init(CallbackInfo ci) { * Triggers and restarts the animation. */ @ModifyArg( - method = "render", + method = "renderBackground", at = @At( value = "INVOKE", target = "Lnet/minecraft/client/gui/RotatingCubeMapRenderer;render(FF)V" diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 73628a3..804d641 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[43,)" +loaderVersion = "[1,)" license = "GPL-3.0" [[mods]] @@ -13,23 +13,19 @@ Such A Vibrant Title! ''' logoFile = "icon.png" +[[mixins]] +config = "bounced.mixins.json" + [[dependencies.bounced]] -modId = "forge" +modId = "neoforge" mandatory = true -versionRange = "[43,)" +versionRange = "[20.3,)" ordering = "NONE" side = "BOTH" [[dependencies.bounced]] modId = "minecraft" mandatory = true -versionRange = "[1.20,)" +versionRange = "[1.20.3,1.20.4]" ordering = "NONE" side = "BOTH" - -[[dependencies.bounced]] -modId = "architectury" -mandatory = true -versionRange = "[9,)" -ordering = "AFTER" -side = "BOTH"