diff --git a/.gitignore b/.gitignore index a8f53a9..89ce073 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ eclipse run Fabric/run_client/ + +neo/runs/ diff --git a/Common/build.gradle b/Common/build.gradle deleted file mode 100644 index df0f504..0000000 --- a/Common/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'java' - id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT' - id 'maven-publish' -} - -archivesBaseName = "${project.property("mod_name")}-${project.name}" - -apply { - from file("../gradle/scripts/maven.gradle") -} - -minecraft { - version(minecraft_version) -} - -dependencies { - compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5' - implementation(("com.unrealdinnerbone:Trenzalore-Common:${trenzalore_version}+mc${minecraft_version}")) -} - diff --git a/Fabric/build.gradle b/Fabric/build.gradle deleted file mode 100644 index 79d1c7d..0000000 --- a/Fabric/build.gradle +++ /dev/null @@ -1,81 +0,0 @@ -plugins { - id 'fabric-loom' version '1.2-SNAPSHOT' - id 'maven-publish' - id 'idea' - id 'net.darkhax.curseforgegradle' version '1.0.14' -} - -archivesBaseName = "${project.property("mod_name")}-${project.name}" - -Project commonProject = parent.project("Common") - -def mixinEnabled = project.property("mixinsEnabled") == "true" -def mixinDebug = project.property("enableMixinDebug") == "true" -def fabricDataGen = project.property("fabricDataGen") == "true" - -apply { - from file("../gradle/scripts/maven.gradle") -} - -dependencies { - minecraft "com.mojang:minecraft:${minecraft_version}" - mappings loom.officialMojangMappings() - modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}" - modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - modImplementation(("com.unrealdinnerbone:Trenzalore-Fabric:${trenzalore_version}+mc${minecraft_version}")) - implementation commonProject -} - -loom { - if(mixinEnabled) { - mixin { - defaultRefmapName = "${mod_id}.refmap.json" - } - } - runs { - client { - client() - setConfigName("Fabric Client") - ideConfigGenerated(true) - vmArg("-Dmixin.debug.export=${mixinDebug}") - runDir("run_client") - } - server { - server() - setConfigName("Fabric Server") - ideConfigGenerated(true) - vmArg("-Dmixin.debug.export=${mixinDebug}") - runDir("run_server") - } - data { - inherit client - setConfigName("Fabric Data") - ideConfigGenerated(fabricDataGen) - - vmArg("-Dfabric-api.datagen") - vmArg("-Dfabric-api.datagen.output-dir=${commonProject.file("src/generated/resources")}") - vmArg("-Dfabric-api.datagen.modid=${mod_id}") - - runDir "build/datagen" - - } - } -} - -processResources { - from commonProject.sourceSets.main.resources -} - -tasks.withType(JavaCompile) { - source(commonProject.sourceSets.main.allSource) -} - -task curseforgePublish(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { - apiToken = ENV.CURSE_TOKEN - def mainFile = upload(findProperty('curse_id'), remapJar) - mainFile.changelog = file("../CHANGELOG.md") - mainFile.releaseType = "beta" - mainFile.changelogType = "markdown" - mainFile.addRequirement("trenzalore") - mainFile.addJavaVersion("Java 17") -} \ No newline at end of file diff --git a/Forge/build.gradle b/Forge/build.gradle deleted file mode 100644 index 0d64901..0000000 --- a/Forge/build.gradle +++ /dev/null @@ -1,134 +0,0 @@ -plugins { - id 'java' - id 'eclipse' - id 'maven-publish' - id 'net.minecraftforge.gradle' version '6.0.+' - id 'net.darkhax.curseforgegradle' version '1.0.14' - id 'org.spongepowered.mixin' version '0.7-SNAPSHOT' -} - -archivesBaseName = "${project.property("mod_name")}-${project.name}" - -Project commonProject = parent.project("Common") - -def mixinEnabled = project.property("mixinsEnabled") == "true" -def forgeDataGen = project.property("forgeDataGen") == "true" - -if(mixinEnabled) { - println("Mixins Enabled!") - mixin { - add commonProject.sourceSets.main, "${mod_id}.refmap.json" - config("${mod_id}.mixins.json") - } -} - -minecraft { - mappings channel: 'official', version: minecraft_version - - runs { - client { - workingDirectory project.file('run') - ideaModule "${parent.name}.${project.name}.main" - taskName 'Client' - if(mixinEnabled) { - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - } - mods { - modClientRun { - source sourceSets.main - source commonProject.sourceSets.main - } - } - } - - server { - workingDirectory project.file('run') - ideaModule "${parent.name}.${project.name}.main" - taskName 'Server' - if(mixinEnabled) { - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - } - mods { - modServerRun { - source sourceSets.main - source commonProject.sourceSets.main - } - } - } - - if(forgeDataGen) { - data { - workingDirectory project.file('run') - ideaModule "${rootProject.name}.${project.name}.main" - args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') - taskName 'Data' - property 'mixin.env.remapRefMap', 'true' - property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" - mods { - modDataRun { - source sourceSets.main - source commonProject.sourceSets.main - } - } - } - } - } -} - -dependencies { - minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - compileOnly commonProject - if(mixinEnabled) { - annotationProcessor "org.spongepowered:mixin:0.8.5:processor" - } - implementation(("com.unrealdinnerbone:Trenzalore-Forge:${trenzalore_version}+mc${minecraft_version}")) - - -} - -tasks.withType(JavaCompile) { - source(commonProject.sourceSets.main.allSource) -} - -processResources { - from commonProject.sourceSets.main.resources -} - -jar.finalizedBy('reobfJar') - -task curseforgePublish(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { - - apiToken = ENV.CURSE_TOKEN - def mainFile = upload(findProperty('curse_id'), jar) - mainFile.changelog = file("../CHANGELOG.md") - mainFile.releaseType = "beta" - mainFile.changelogType = "markdown" - mainFile.addRequirement("trenzalore") - mainFile.addJavaVersion("Java 17") -} - - -publishing { - publications { - mavenJava(MavenPublication) { - groupId project.group - artifactId project.archivesBaseName - version project.version - artifact jar - } - } - - repositories { - if (ENV.NANITE_TOKEN) { - maven { - url "https://maven.nanite.dev/${SNAPSHOT ? "snapshots" : "releases"}" - credentials { - username = "nanite" - password = "${ENV.NANITE_TOKEN}" - } - } - } - } -} diff --git a/build.gradle b/build.gradle index 04ccc78..0283627 100644 --- a/build.gradle +++ b/build.gradle @@ -1,77 +1,131 @@ +plugins { + id("dev.nanite.mlp") version("0.1.1") + id("java-library") + id("maven-publish") + id("me.modmuss50.mod-publish-plugin") version "0.3.0" +} + + +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +multiLoader.root() { + minecraftVersion.set(project.property("minecraft_version")) + modID.set(project.property("mod_id")) + splitSources.set(true) +} + +allprojects { + def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false) + version = "${mod_version}+mc${minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}" + setArchivesBaseName("${mod_name}-${project.name}".toLowerCase()) + group = "com.unrealdinnerbone" + + +} + subprojects { - apply plugin: 'java' - java.toolchain.languageVersion = JavaLanguageVersion.of(17) + apply plugin: 'java-library' + apply plugin: 'maven-publish' + apply plugin: 'dev.nanite.mlp' - def env = System.getenv(); - def isSnapshot = env.SNAPSHOT == "true" - ext.ENV = env - ext.SNAPSHOT = isSnapshot - version = "${parent.mod_version}+mc${parent.minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}" - group = parent.maven_group + sourceSets.main.resources.srcDir project.file('src/generated/resources') - jar { - from(rootProject.file("LICENSE")) { - rename { "${it}_${mod_name}" } - } - manifest { - attributes([ - 'Specification-Title' : mod_name, - 'Specification-Vendor' : mod_author, - 'Specification-Version' : project.jar.archiveVersion, - 'Implementation-Title' : project.name, - 'Implementation-Version' : project.jar.archiveVersion, - 'Implementation-Vendor' : mod_author, - 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - 'Timestamp' : System.currentTimeMillis(), - 'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})", - 'Built-On-Minecraft' : minecraft_version - ]) - } - } + java.toolchain.languageVersion = JavaLanguageVersion.of(17) + + base { + archivesName = "${project.property("mod_name")}-${project.name}".toLowerCase() + } repositories { - mavenCentral() maven { - name = 'Sponge / Mixin' - url = 'https://repo.spongepowered.org/repository/maven-public/' + name = "Creeperhost" + url = uri("https://maven.creeperhost.net/") } maven { - name = 'Nanite Releases' - url = 'https://maven.nanite.dev/releases' + name = "Nanite" + url = "https://maven.nanite.dev/releases" } } + tasks.withType(ProcessResources).configureEach { + outputs.upToDateWhen { false } + } - tasks.withType(JavaCompile) { - options.encoding = "UTF-8" - options.release = 17 + publishing { + repositories { + if (providers.environmentVariable("NANITE_TOKEN").isPresent()) { + maven { + def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false) + url "https://maven.nanite.dev/${isSnapshot ? 'snapshots' : 'releases'}" + credentials { + username = "nanite" + password = providers.environmentVariable("NANITE_TOKEN").get() + } + } + } + } + publications { + register("mavenJava", MavenPublication) { + groupId project.group + artifactId project.getArchivesBaseName() + } + } } - sourceSets.main.resources.srcDir 'src/generated/resources' +} + - java { - withSourcesJar() +publishMods { + dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null + changelog = file("./CHANGELOG.md").text + version = "${mod_version}" + type = STABLE + + def fabricOptions = publishOptions { + file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile } + displayName = "${project.name} Fabric ${mod_version}+mc${minecraft_version}" + modLoaders.add("fabric") } - processResources { + def forgeOptions = publishOptions { + file = project.provider { project(":forge").tasks.jar }.flatMap { it.archiveFile } + displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}" + modLoaders.add("forge") + } - def buildProps = project.properties.clone() + def neoOptions = publishOptions { + file = project.provider { project(":neo").tasks.jar }.flatMap { it.archiveFile } + displayName = "${project.name} Neo ${mod_version}+mc${minecraft_version}" + modLoaders.add("neoforge") + } - buildProps.put('file', [jarVersion: project.version]) - filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml']) { + def curseForgeOptions = curseforgeOptions { + accessToken = providers.environmentVariable("CURSE_TOKEN") + projectId = "${curse_id}" + minecraftVersions.add("${minecraft_version}") + } - expand buildProps + curseforge("curseforgeFabric") { + from(curseForgeOptions, fabricOptions) + requires { + slug = "fabric-api" } } -} + curseforge("curseforgeForge") { + from(curseForgeOptions, forgeOptions) + } -task curseforgePublish { - doLast { - println "Hello from ${project.name}!" + curseforge("curseforgeNeoForge") { + from(curseForgeOptions, neoOptions) } -} \ No newline at end of file + +} + + + + diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..062535d --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,7 @@ +multiLoader.common() + +publishing.publications.mavenJava.from components.java + +dependencies { + implementation("com.unrealdinnerbone:trenzalore-common:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}") +} \ No newline at end of file diff --git a/common/gradle.properties b/common/gradle.properties new file mode 100644 index 0000000..95dca56 --- /dev/null +++ b/common/gradle.properties @@ -0,0 +1 @@ +fabric.loom.dontRemap=true diff --git a/Common/src/main/java/com/unrealdinnerbone/ibicf/mixin/DimensionRenderInfoMixin.java b/common/src/client/java/com/unrealdinnerbone/ibicf/mixin/DimensionRenderInfoMixin.java similarity index 100% rename from Common/src/main/java/com/unrealdinnerbone/ibicf/mixin/DimensionRenderInfoMixin.java rename to common/src/client/java/com/unrealdinnerbone/ibicf/mixin/DimensionRenderInfoMixin.java diff --git a/Common/src/main/java/com/unrealdinnerbone/ibicf/IBICF.java b/common/src/main/java/com/unrealdinnerbone/ibicf/IBICF.java similarity index 100% rename from Common/src/main/java/com/unrealdinnerbone/ibicf/IBICF.java rename to common/src/main/java/com/unrealdinnerbone/ibicf/IBICF.java diff --git a/Common/src/main/java/com/unrealdinnerbone/ibicf/IBICFConfig.java b/common/src/main/java/com/unrealdinnerbone/ibicf/IBICFConfig.java similarity index 100% rename from Common/src/main/java/com/unrealdinnerbone/ibicf/IBICFConfig.java rename to common/src/main/java/com/unrealdinnerbone/ibicf/IBICFConfig.java diff --git a/Common/src/main/resources/assets/ibicf/logo.png b/common/src/main/resources/assets/ibicf/logo.png similarity index 100% rename from Common/src/main/resources/assets/ibicf/logo.png rename to common/src/main/resources/assets/ibicf/logo.png diff --git a/Common/src/main/resources/ibicf.mixins.json b/common/src/main/resources/ibicf.mixins.json similarity index 94% rename from Common/src/main/resources/ibicf.mixins.json rename to common/src/main/resources/ibicf.mixins.json index 9a9af9a..a9ceb62 100644 --- a/Common/src/main/resources/ibicf.mixins.json +++ b/common/src/main/resources/ibicf.mixins.json @@ -4,7 +4,7 @@ "package": "com.unrealdinnerbone.ibicf.mixin", "compatibilityLevel": "JAVA_17", "refmap": "ibicf.refmap.json", - "mixins": [ + "client": [ "DimensionRenderInfoMixin" ], "injectors": { diff --git a/Common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta similarity index 100% rename from Common/src/main/resources/pack.mcmeta rename to common/src/main/resources/pack.mcmeta diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..3a3b3a0 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,15 @@ +multiLoader.fabric() { + fabricLoaderVersion.set("${fabric_loader_version}") + fabricApiVersion.set("${fabric_version}") +} + +dependencies { + modImplementation("com.unrealdinnerbone:trenzalore-fabric:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}") +} + + +publishing.publications.mavenJava.from components.java + +remapJar { + setArchivesBaseName("${project.property("mod_name")}-${project.name}".toLowerCase()) +} \ No newline at end of file diff --git a/Fabric/src/main/java/com/unrealdinnerbone/ibicf/IBICFFabric.java b/fabric/src/main/java/com/unrealdinnerbone/ibicf/fabric/IBICFFabric.java similarity index 67% rename from Fabric/src/main/java/com/unrealdinnerbone/ibicf/IBICFFabric.java rename to fabric/src/main/java/com/unrealdinnerbone/ibicf/fabric/IBICFFabric.java index 86cd4a1..53cbf75 100644 --- a/Fabric/src/main/java/com/unrealdinnerbone/ibicf/IBICFFabric.java +++ b/fabric/src/main/java/com/unrealdinnerbone/ibicf/fabric/IBICFFabric.java @@ -1,5 +1,6 @@ -package com.unrealdinnerbone.ibicf; +package com.unrealdinnerbone.ibicf.fabric; +import com.unrealdinnerbone.ibicf.IBICF; import net.fabricmc.api.ModInitializer; public class IBICFFabric implements ModInitializer { diff --git a/Fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json similarity index 93% rename from Fabric/src/main/resources/fabric.mod.json rename to fabric/src/main/resources/fabric.mod.json index 87e6259..823a4f4 100644 --- a/Fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -23,7 +23,7 @@ "environment": "*", "entrypoints": { "main": [ - "com.unrealdinnerbone.ibicf.IBICFFabric" + "com.unrealdinnerbone.ibicf.fabric.IBICFFabric" ] }, "depends": { diff --git a/forge/build.gradle b/forge/build.gradle new file mode 100644 index 0000000..46e14f5 --- /dev/null +++ b/forge/build.gradle @@ -0,0 +1,33 @@ +multiLoader.forge() { + forgeVersion.set("${forge_version}") +} + +java.sourceSets { + main { + java { + srcDirs = ["src/main/java", project(":common").file("src/client/java")] + } + resources { + srcDirs = ["src/main/resources", project(":common").file("src/client/resources")] + } + } +} + + +publishing.publications.mavenJava.artifact jar + +repositories { + maven { + url "https://cursemaven.com" + } + maven { + url "https://maven.nanite.dev/releases" + } +} + + +dependencies { + implementation(fg.deobf("com.unrealdinnerbone:trenzalore-forge:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}")) { + transitive = true + } +} diff --git a/Forge/src/main/java/com/unrealdinnerbone/ibicf/IBICFForge.java b/forge/src/main/java/com/unrealdinnerbone/ibicf/forge/IBICFForge.java similarity index 64% rename from Forge/src/main/java/com/unrealdinnerbone/ibicf/IBICFForge.java rename to forge/src/main/java/com/unrealdinnerbone/ibicf/forge/IBICFForge.java index ba8c5eb..0de96de 100644 --- a/Forge/src/main/java/com/unrealdinnerbone/ibicf/IBICFForge.java +++ b/forge/src/main/java/com/unrealdinnerbone/ibicf/forge/IBICFForge.java @@ -1,5 +1,6 @@ -package com.unrealdinnerbone.ibicf; +package com.unrealdinnerbone.ibicf.forge; +import com.unrealdinnerbone.ibicf.IBICF; import net.minecraftforge.fml.common.Mod; @Mod(IBICF.MOD_ID) diff --git a/Forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml similarity index 84% rename from Forge/src/main/resources/META-INF/mods.toml rename to forge/src/main/resources/META-INF/mods.toml index 91eebaf..36a61ab 100644 --- a/Forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -2,8 +2,8 @@ modLoader="javafml" loaderVersion="[44,)" license="All Rights Reserved unless stated otherwise. Distribution permission is given to FeedTheBeast and CurseForge for use in modpacks" [[mods]] -modId="ibicf" -version="${file.jarVersion}" +modId="${mod_id}" +version="${mod_version}" displayName="I Believe I Can Fly" logoFile="logo.png" credits="" @@ -11,19 +11,19 @@ authors="UnRealDinnerbone" description=''' Change cloud height ''' -[[dependencies.ibicf]] +[[dependencies.${mod_id}]] modId="forge" mandatory=true versionRange="[44,)" ordering="NONE" side="BOTH" -[[dependencies.ibicf]] +[[dependencies.${mod_id}]] modId="minecraft" mandatory=true versionRange="[${minecraft_version}]" ordering="NONE" side="BOTH" -[[dependencies.ibicf]] +[[dependencies.${mod_id}]] modId="trenzalore" mandatory=true versionRange="[${trenzalore_version},)" diff --git a/gradle.properties b/gradle.properties index 1318487..64ec09b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -mod_version=3.0.0 +mod_version=4.0.0 maven_group=com.unrealdinnerbone curse_id=517002 mod_name=IBICF @@ -7,29 +7,20 @@ mod_author=UnRealDinnerbone mod_id=ibicf -#Project Settings -mixinsEnabled=true -fabricDataGen=false -forgeDataGen=false - - # Common -minecraft_version=1.20.1 +minecraft_version=1.20.4 # Forge -forge_version=47.0.1 -//forge_ats_enabled=true +forge_version=49.0.13 -# Fabric -fabric_version=0.83.1+1.20.1 -fabric_loader_version=0.14.21 +neo_version=20.4.70-beta + +fabric_version=0.91.2+1.20.4 +fabric_loader_version=0.15.1 # Other -trenzalore_version=3.0.0 +trenzalore_version=4.0.1 # Gradle org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false - -#Debug -enableMixinDebug=false \ No newline at end of file +org.gradle.daemon=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neo/build.gradle b/neo/build.gradle new file mode 100644 index 0000000..90e7c97 --- /dev/null +++ b/neo/build.gradle @@ -0,0 +1,22 @@ +multiLoader.neo() { + neoVersion.set("${neo_version}") +} + +java.sourceSets { + main { + java { + srcDirs = ["src/main/java", project(":common").file("src/client/java")] + } + resources { + srcDirs = ["src/main/resources", project(":common").file("src/client/resources")] + } + } +} + + +dependencies { + implementation("com.unrealdinnerbone:trenzalore-neo:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}") +} + +publishing.publications.mavenJava.from components.java + diff --git a/neo/src/main/java/com/unrealdinnerbone/ibicf/neo/IBICFNeo.java b/neo/src/main/java/com/unrealdinnerbone/ibicf/neo/IBICFNeo.java new file mode 100644 index 0000000..d7628fb --- /dev/null +++ b/neo/src/main/java/com/unrealdinnerbone/ibicf/neo/IBICFNeo.java @@ -0,0 +1,13 @@ +package com.unrealdinnerbone.ibicf.neo; + + +import com.unrealdinnerbone.ibicf.IBICF; +import net.neoforged.fml.common.Mod; + +@Mod(IBICF.MOD_ID) +public class IBICFNeo { + + public IBICFNeo() { + IBICF.init(); + } +} \ No newline at end of file diff --git a/neo/src/main/resources/META-INF/mods.toml b/neo/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..11b57a2 --- /dev/null +++ b/neo/src/main/resources/META-INF/mods.toml @@ -0,0 +1,33 @@ +modLoader="javafml" +loaderVersion="[1,)" +license="All Rights Reserved unless stated otherwise. Distribution permission is given to FeedTheBeast and CurseForge for use in modpacks" +[[mods]] +modId="${mod_id}" +version="${mod_version}" +displayName="I Believe I Can Fly" +logoFile="logo.png" +credits="" +authors="UnRealDinnerbone" +description=''' +Change cloud height +''' +[[dependencies.${mod_id}]] + modId="neoforge" +required=true + versionRange="[1.0,)" + ordering="NONE" + side="BOTH" +[[dependencies.${mod_id}]] + modId="minecraft" +required=true + versionRange="[${minecraft_version}]" + ordering="NONE" + side="BOTH" +[[dependencies.${mod_id}]] + modId="trenzalore" +required=true + versionRange="[${trenzalore_version},)" + ordering="NONE" + side="BOTH" +[[mixins]] + config="${mod_id}.mixins.json" diff --git a/settings.gradle b/settings.gradle index 5954eb5..6ce624f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,24 +1,26 @@ pluginManagement { repositories { + mavenLocal() gradlePluginPortal() maven { name = 'Creeperhost' url = 'https://maven.creeperhost.net/' } - maven { - name = 'Forge' - url = 'https://maven.minecraftforge.net/' - } - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } maven { name = 'Sponge Snapshots' url = 'https://repo.spongepowered.org/repository/maven-public/' } - maven { url "https://maven.architectury.dev/" } } + + + plugins { + id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7" apply(false) + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' + } + } -include("Common", "Fabric", "Forge") \ No newline at end of file + + + +include("common", "neo", "fabric", "forge") \ No newline at end of file