diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf1672f33..d7dc2a769 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,14 +57,8 @@ jobs: name: lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }} path: forge/build/libs/ - - name: Upload Lambda NeoForge - uses: actions/upload-artifact@v4.3.6 - with: - name: lambda-neoforge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }} - path: neoforge/build/libs/ - - name: Upload Lambda API uses: actions/upload-artifact@v4.3.6 with: name: lambda-api-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }} - path: common/build/libs/ \ No newline at end of file + path: common/build/libs/ diff --git a/.github/workflows/labeler/labeler-config.yml b/.github/workflows/labeler/labeler-config.yml index d82454e53..9b33776b4 100644 --- a/.github/workflows/labeler/labeler-config.yml +++ b/.github/workflows/labeler/labeler-config.yml @@ -10,9 +10,6 @@ labels: - label: 'forge' title: '(?i)\[?(forge|all)[:\]]' - - label: 'neoforge' - title: '(?i)\[?(neoforge|all)[:\]]' - - label: 'fabric' title: '(?i)\[?(fabric|all)[:\]]' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 51ee30813..01ed27097 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,12 +57,6 @@ jobs: name: lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }} path: forge/build/libs/ - - name: Upload Lambda NeoForge - uses: actions/upload-artifact@v4.3.6 - with: - name: lambda-neoforge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}-${{ env.COMMIT_HASH }} - path: neoforge/build/libs/ - - name: Upload Lambda API uses: actions/upload-artifact@v4.3.6 with: @@ -89,4 +83,3 @@ jobs: files: | fabric/build/libs/lambda-fabric-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar forge/build/libs/lambda-forge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar - neoforge/build/libs/lambda-neoforge-${{ steps.all.outputs.modVersion }}+${{ steps.all.outputs.minecraftVersion }}.jar \ No newline at end of file diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 8856e71ae..b627b49a3 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -4,7 +4,7 @@ val kotlinVersion: String by project val kotlinxCoroutinesVersion: String by project val discordIPCVersion: String by project -architectury { common("fabric", "forge", "neoforge") } +architectury { common("fabric", "forge") } loom { silentMojangMappingsLicense() diff --git a/gradle.properties b/gradle.properties index 7252ee055..38f2d567a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,11 +30,6 @@ kotlinForgeVersion=4.11.0 kotlinForgeVersionMin=4.0.0 kotlinForgeVersionMax=4.11.0 -# NeoForge https://neoforged.net -neoVersion=20.4.237 -neoVersionMin=20.2.3-beta -neoVersionMax=20.999.0 - # Kotlin https://kotlinlang.org/ kotlin.code.style=official diff --git a/libs/baritone-unoptimized-neoforge-1.10.2.jar b/libs/baritone-unoptimized-neoforge-1.10.2.jar deleted file mode 100644 index cd0fa9f36..000000000 Binary files a/libs/baritone-unoptimized-neoforge-1.10.2.jar and /dev/null differ diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts deleted file mode 100644 index ca8cd2b1d..000000000 --- a/neoforge/build.gradle.kts +++ /dev/null @@ -1,100 +0,0 @@ -val modVersion: String by project -val minecraftVersion: String by project -val neoVersion: String by project -val kotlinForgeVersion: String by project -val discordIPCVersion: String by project - -base.archivesName = "${base.archivesName.get()}-neoforge" - -plugins { - id("com.github.johnrengelman.shadow") version "8.1.1" -} - -architectury { - platformSetupLoomIde() - neoForge { - platformPackage = "neoforge" - } -} - -loom { - accessWidenerPath.set(project(":common").loom.accessWidenerPath) -} - -repositories { - // You can add more repositories here if you plan - // on using environment-specific dependencies. - // If you simply want to add a global plugin repository, - // you can add it to the `settings.gradle.kts` file - // in the base of the project and gradle will do the - // rest for you. - maven("https://thedarkcolour.github.io/KotlinForForge/") - maven("https://maven.neoforged.net/releases/") -} - -val common: Configuration by configurations.creating { - configurations.compileClasspath.get().extendsFrom(this) - configurations.runtimeClasspath.get().extendsFrom(this) - configurations["developmentNeoForge"].extendsFrom(this) - isCanBeResolved = true - isCanBeConsumed = false -} - -val includeLib: Configuration by configurations.creating -val includeMod: Configuration by configurations.creating -val shadowBundle: Configuration by configurations.creating { - isCanBeResolved = true - isCanBeConsumed = false -} - -fun DependencyHandlerScope.setupConfigurations() { - includeLib.dependencies.forEach { - implementation(it) - include(it) - // shadowBundle(it) - } - - includeMod.dependencies.forEach { - implementation(it) - // include(it) - } -} - -dependencies { - // NeoForge API - neoForge("net.neoforged:neoforge:$neoVersion") - - // Add dependencies on the required Kotlin modules. - includeLib("org.reflections:reflections:0.10.2") - includeLib("org.javassist:javassist:3.28.0-GA") - includeLib("com.github.Edouard127:KDiscordIPC:$discordIPCVersion") - includeLib("com.pngencoder:pngencoder:0.15.0") - - // Add mods to the mod jar - includeMod("thedarkcolour:kotlinforforge-neoforge:$kotlinForgeVersion") - includeMod("baritone-api:baritone-unoptimized-neoforge:1.10.2") - - // Common (Do not touch) - common(project(":common", configuration = "namedElements")) { isTransitive = false } - shadowBundle(project(path = ":common", configuration = "transformProductionNeoForge")) { isTransitive = false } - - // Finish the configuration - setupConfigurations() -} - -tasks { - shadowJar { - archiveVersion = "$modVersion+$minecraftVersion" - configurations = listOf(shadowBundle) - archiveClassifier = "dev-shadow" - } - - remapJar { - dependsOn(shadowJar) - - archiveVersion = "$modVersion+$minecraftVersion" - inputFile = shadowJar.get().archiveFile - - atAccessWideners.add("lambda.accesswidener") - } -} diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties deleted file mode 100644 index 7da18ea6f..000000000 --- a/neoforge/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -loom.platform=neoforge diff --git a/neoforge/src/main/kotlin/com/lambda/neoforge/LambdaNeoForge.kt b/neoforge/src/main/kotlin/com/lambda/neoforge/LambdaNeoForge.kt deleted file mode 100644 index 7e2390fe2..000000000 --- a/neoforge/src/main/kotlin/com/lambda/neoforge/LambdaNeoForge.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.lambda.neoforge - -import com.lambda.Lambda -import com.lambda.Lambda.LOG -import com.lambda.Lambda.MOD_NAME -import com.lambda.Lambda.VERSION -import com.lambda.core.registry.RegistryController -import com.lambda.core.registry.RegistryWrapper -import com.lambda.graphics.RenderMain -import net.minecraft.registry.Registry -import net.minecraft.registry.entry.RegistryEntry -import net.minecraft.util.Identifier -import net.neoforged.api.distmarker.Dist -import net.neoforged.api.distmarker.OnlyIn -import net.neoforged.bus.api.SubscribeEvent -import net.neoforged.fml.common.Mod -import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent -import net.neoforged.neoforge.client.event.RenderGuiEvent -import net.neoforged.neoforge.registries.RegisterEvent -import thedarkcolour.kotlinforforge.neoforge.forge.FORGE_BUS -import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS - -@Mod(Lambda.MOD_ID) -@OnlyIn(Dist.CLIENT) -object LambdaNeoForge { - @SubscribeEvent - fun onClient(event: FMLClientSetupEvent) { - Lambda.initialize() - LOG.info("$MOD_NAME Forge $VERSION initialized.") - } - - @SubscribeEvent - fun onRegistrySetup(event: RegisterEvent) { - RegistryController.register(event.registryKey, object : RegistryWrapper { - override fun registerForHolder(id: Identifier?, value: T): RegistryEntry { - return Registry.registerReference(event.registry as Registry, id, value) - } - }) - } - - // Most events here are hooked due to neoforge not caring about others - // and directly patching the minecraft classes. - private object ClientEvents { - @SubscribeEvent - fun onHudRender(event: RenderGuiEvent.Post) { RenderMain.render2D() } - } - - init { - MOD_BUS.register(this) - FORGE_BUS.register(ClientEvents) - } -} diff --git a/neoforge/src/main/kotlin/com/lambda/neoforge/LoaderInfoImpl.kt b/neoforge/src/main/kotlin/com/lambda/neoforge/LoaderInfoImpl.kt deleted file mode 100644 index cd81773e6..000000000 --- a/neoforge/src/main/kotlin/com/lambda/neoforge/LoaderInfoImpl.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.lambda.neoforge - -import net.neoforged.fml.loading.FMLLoader - - -object LoaderInfoImpl { - @JvmStatic - fun getVersion(): String = - FMLLoader.getLoadingModList().getModFileById("lambda").versionString() -} diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index d922c1437..000000000 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,48 +0,0 @@ -modLoader = "kotlinforforge" -loaderVersion = "[${kotlinForgeVersion},)" -license = "GNU General Public License v3.0" -issueTrackerURL = "https://github.com/lambda-client/lambda/issues" -#updateJSONURL = "https://raw.githubusercontent.com/lambda-client/lambda/main/update.json" - -[[mods]] -modId = "${modId}" -version = "${modVersion}" -displayName = "Lambda" -authors = "${modAuthors}" -description = "${modDescription}" -logoFile = "assets/lambda/lambda.png" -displayTest = "IGNORE_ALL_VERSION" - -[[mixins]] -config = "lambda.mixins.common.json" - -[[dependencies.${modId}]] -modId = "neoforge" -mandatory = true -type = "required" -versionRange = "[${neoVersionMin},${neoVersionMax}]" -ordering = "NONE" -side = "CLIENT" - -[[dependencies.${modId}]] -modId = "minecraft" -mandatory = true -type = "required" -versionRange = "[${minecraftVersionMin},${minecraftVersionMax}]" -ordering = "NONE" -side = "CLIENT" - -[[dependencies.${modId}]] -modId = "kotlinforforge" -mandatory = true -type = "required" -versionRange = "[${kotlinForgeVersionMin},${kotlinForgeVersionMax}]" -ordering = "NONE" -side = "CLIENT" - -[[dependencies.${modId}]] -modId = "baritoe" -mandatory = true -versionRange = "[${baritoneVersion},]" -ordering = "NONE" -side = "CLIENT" diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml deleted file mode 100644 index 781ef50e2..000000000 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ /dev/null @@ -1,48 +0,0 @@ -modLoader = "kotlinforforge" -loaderVersion = "[${kotlinForgeVersion},)" -license = "GNU General Public License v3.0" -issueTrackerURL = "https://github.com/lambda-client/lambda/issues" -#updateJSONURL = "https://raw.githubusercontent.com/lambda-client/lambda/main/update.json" - -[[mods]] -modId = "${modId}" -version = "${modVersion}" -displayName = "Lambda" -authors = "${modAuthors}" -description = "${modDescription}" -logoFile = "assets/lambda/lambda.png" -displayTest = "IGNORE_ALL_VERSION" - -[[mixins]] -config = "lambda.mixins.common.json" - -[[dependencies.${modId}]] -modId = "neoforge" -mandatory = true -type = "required" -versionRange = "[${neoVersionMin},${neoVersionMax}]" -ordering = "NONE" -side = "CLIENT" - -[[dependencies.${modId}]] -modId = "minecraft" -mandatory = true -type = "required" -versionRange = "[${minecraftVersionMin},${minecraftVersionMax}]" -ordering = "NONE" -side = "CLIENT" - -[[dependencies.${modId}]] -modId = "kotlinforforge" -mandatory = true -type = "required" -versionRange = "[${kotlinForgeVersionMin},${kotlinForgeVersionMax}]" -ordering = "NONE" -side = "CLIENT" - -[[dependencies.${modId}]] -modId = "baritoe" # Baritone decided to do this, jesus fucking christ -mandatory = true -versionRange = "[${baritoneVersion},]" -ordering = "NONE" -side = "CLIENT" diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta deleted file mode 100644 index bcf1d9ead..000000000 --- a/neoforge/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "lambda", - "pack_format": 9 - } -}