diff --git a/allium/build.gradle b/allium/build.gradle deleted file mode 100755 index 05df6ab..0000000 --- a/allium/build.gradle +++ /dev/null @@ -1,109 +0,0 @@ -plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' - id 'maven-publish' -} - -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 - -// Following by example, using semantic versioning -String v = 'v' + project.mod_version -if ("0" != project.release_candidate) { - v += "-rc" + project.release_candidate -} -version = v - -repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. - maven { - name "SquidDev" - url "https://squiddev.cc/maven" - } - - mavenCentral() - - //maven { url 'https://jitpack.io' } - - - maven { - name "NucleMaven™" - url "https://maven.nucleoid.xyz" - } - - maven { - name "Basique's Maven" - url "https://basique.top/maven/releases" - } -} - -dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modImplementation include("org.squiddev:Cobalt:${project.cobalt}") - modImplementation include("net.fabricmc:tiny-mappings-parser:${project.tiny_parser}") - modImplementation include("me.basiqueevangelist:enhanced-reflection:${project.enhanced_reflections}") - //modImplementation include("com.github.BasiqueEvangelist:EnhancedReflection:${project.enhanced_reflections}") - modImplementation include("io.netty:netty-codec-http:4.1.77.Final") - modImplementation "eu.pb4:placeholder-api:${project.placeholder_api}" - - - // Used for testing Scripts. No code in the repo should depend on these - //modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api}" - //modImplementation "eu.pb4:polymer:${project.polymer}" -} - -processResources { - inputs.property "version", project.mod_version - - filesMatching("fabric.mod.json") { - expand "mod_version": project.mod_version - } -} - -tasks.withType(JavaCompile).configureEach { - // Minecraft 1.18 (1.18-pre2) upwards uses Java 17. - it.options.release = 17 -} - -java { - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() -} - -jar { - from("LICENSE") { - rename { "${it}_${project.archives_base_name}"} - } -} - -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - groupId = "dev.hugeblank" - artifactId = "allium" - version = version - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - maven { - name = "hugeblankRepo" - url = "https://maven.hugeblank.dev/releases" - credentials(org.gradle.api.credentials.PasswordCredentials) - authentication { - basic(BasicAuthentication) - } - } - } -} diff --git a/allium/build.gradle.kts b/allium/build.gradle.kts new file mode 100755 index 0000000..7f05b55 --- /dev/null +++ b/allium/build.gradle.kts @@ -0,0 +1,54 @@ +val mavenGroup: String by project + +val alliumVersion: String by project +val alliumReleaseCandidate: String by project +val alliumBaseName: String by project + +val tinyParser: String by project + + +// Following by example, using semantic versioning null +var v = alliumVersion +if ("0" != alliumReleaseCandidate) { + v = "$v-rc$alliumReleaseCandidate" +} +version = v +group = mavenGroup + +base { + archivesName.set(alliumBaseName) +} + +dependencies { + modImplementation(include("net.fabricmc", "tiny-mappings-parser", tinyParser)) +} + +java { + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +// configure the maven publication +publishing { + publications { + register("mavenJava", MavenPublication::class) { + from(components["java"]) + groupId = mavenGroup + artifactId = alliumBaseName + version = version + } + } + + repositories { + maven { + name = "hugeblankRepo" + url = uri("https://maven.hugeblank.dev/releases") + credentials(PasswordCredentials::class) + authentication { + create("basic") + } + } + } +} \ No newline at end of file diff --git a/allium/gradle.properties b/allium/gradle.properties deleted file mode 100755 index 8eca9fb..0000000 --- a/allium/gradle.properties +++ /dev/null @@ -1,25 +0,0 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G - -# Fabric Properties - # check these on https://fabricmc.net/develop - minecraft_version=1.21.1 - yarn_mappings=1.21.1+build.3 - loader_version=0.16.5 - -# Mod Properties - mod_version = 0.1.0 - # If release candidate is left at 0, it will not show up in the jar name - release_candidate = 0 - maven_group = dev.hugeblank - archives_base_name = allium - -# Dependencies - cobalt = 0.7.0 - tiny_parser = 0.3.0+build.17 - enhanced_reflections = 0.1.6 - -# Script test dependencies - fabric_api = 0.57.0+1.19 - placeholder_api = 2.0.0-beta.7+1.19 - polymer = 0.2.3+1.19 \ No newline at end of file diff --git a/allium/gradlew b/allium/gradlew deleted file mode 100755 index c53aefa..0000000 --- a/allium/gradlew +++ /dev/null @@ -1,234 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" -APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/allium/gradlew.bat b/allium/gradlew.bat deleted file mode 100755 index 107acd3..0000000 --- a/allium/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/bouquet/build.gradle b/bouquet/build.gradle deleted file mode 100644 index b151934..0000000 --- a/bouquet/build.gradle +++ /dev/null @@ -1,116 +0,0 @@ -plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' - id 'maven-publish' -} - -version = project.mod_version -group = project.maven_group - -base { - archivesName = project.archives_base_name -} - -repositories { - maven { - name "hugeblank's Maven" - url "https://maven.hugeblank.dev/releases" - } - - maven { - name "SquidDev" - url "https://squiddev.cc/maven" - } - - mavenCentral() - - //maven { url 'https://jitpack.io' } - - - maven { - name "NucleMaven™" - url "https://maven.nucleoid.xyz" - } - - maven { - name "Basique's Maven" - url "https://basique.top/maven/releases" - } -} - -loom { - splitEnvironmentSourceSets() - - mods { - "allium-api" { - sourceSet sourceSets.main - sourceSet sourceSets.client - } - } - -} - -dependencies { - // To change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - modImplementation include("org.squiddev:Cobalt:${project.cobalt}") - modImplementation include("me.basiqueevangelist:enhanced-reflection:${project.enhanced_reflections}") - modImplementation include("io.netty:netty-codec-http:${project.netty_http}") - modImplementation "eu.pb4:placeholder-api:${project.placeholder_api}" - modImplementation include("dev.hugeblank:allium:${project.allium}") - -} - -processResources { - inputs.property "version", project.version - - filesMatching("fabric.mod.json") { - expand "version": project.version - } -} - -tasks.withType(JavaCompile).configureEach { - it.options.release = 21 -} - -java { - // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task - // if it is present. - // If you remove this line, sources will not be generated. - withSourcesJar() - - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 -} - -jar { - from("LICENSE") { - rename { "${it}_${project.base.archivesName.get()}"} - } -} - -// configure the maven publication -publishing { - publications { - mavenJava(MavenPublication) { - groupId = group - artifactId = "allium-api" - version = version - from components.java - } - } - - // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. - repositories { - maven { - name = "hugeblankRepo" - url = "https://maven.hugeblank.dev/releases" - credentials(org.gradle.api.credentials.PasswordCredentials) - authentication { - basic(BasicAuthentication) - } - } - } -} \ No newline at end of file diff --git a/bouquet/build.gradle.kts b/bouquet/build.gradle.kts new file mode 100644 index 0000000..401c82b --- /dev/null +++ b/bouquet/build.gradle.kts @@ -0,0 +1,62 @@ +val mavenGroup: String by project + +val bouquetVersion: String by project +val bouquetReleaseCandidate: String by project +val bouquetBaseName: String by project + +// Bouquet Dependencies +val nettyHttp: String by project +val placeholderApi: String by project + +version = bouquetVersion +group = mavenGroup + +base { + archivesName.set(bouquetBaseName) +} + +loom { + splitEnvironmentSourceSets() + mods { + register("bouquet") { + sourceSet(sourceSets["main"]) + sourceSet(sourceSets["client"]) + } + } + +} + +dependencies { + modImplementation(include("io.netty", "netty-codec-http", nettyHttp)) + modImplementation("eu.pb4", "placeholder-api", placeholderApi) + implementation(project(path = ":allium", configuration = "namedElements")) +} + +java { + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +publishing { + publications { + register("mavenJava", MavenPublication::class) { + from(components["java"]) + groupId = mavenGroup + artifactId = bouquetBaseName + version = version + } + } + + repositories { + maven { + name = "hugeblankRepo" + url = uri("https://maven.hugeblank.dev/releases") + credentials(PasswordCredentials::class) + authentication { + create("basic") + } + } + } +} \ No newline at end of file diff --git a/bouquet/gradle.properties b/bouquet/gradle.properties deleted file mode 100644 index 928bc4b..0000000 --- a/bouquet/gradle.properties +++ /dev/null @@ -1,23 +0,0 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G -org.gradle.parallel=true - -# Fabric Properties -# check these on https://fabricmc.net/develop -minecraft_version=1.21.1 -yarn_mappings=1.21.1+build.3 -loader_version=0.16.2 - -# Mod Properties -mod_version=0.1.0 -maven_group=dev.hugeblank -archives_base_name=bouquet - -# Dependencies (included) -allium=v0.1.0 -cobalt = 0.7.0 -enhanced_reflections = 0.1.6 -netty_http = 4.1.77.Final - -# Dependencies (not included) -placeholder_api = 2.4.1+1.21 \ No newline at end of file diff --git a/bouquet/gradle/wrapper/gradle-wrapper.jar b/bouquet/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index a4b76b9..0000000 Binary files a/bouquet/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/bouquet/gradle/wrapper/gradle-wrapper.properties b/bouquet/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 9355b41..0000000 --- a/bouquet/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/bouquet/settings.gradle b/bouquet/settings.gradle deleted file mode 100644 index 75c4d72..0000000 --- a/bouquet/settings.gradle +++ /dev/null @@ -1,10 +0,0 @@ -pluginManagement { - repositories { - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - mavenCentral() - gradlePluginPortal() - } -} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..26fe7b6 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,111 @@ +plugins { + id("fabric-loom") version "1.7-SNAPSHOT" + id("maven-publish") +} +// Common Mod Properties +val mavenGroup: String by project + +// Fabric Properties +val minecraftVersion: String by project +val yarnMappings: String by project +val loaderVersion: String by project + +// Common Dependencies +val cobalt: String by project +val tinyParser: String by project +val enhancedReflections: String by project + +// Bouquet Dependencies +val nettyHttp: String by project +val placeholderApi: String by project + +allprojects { + apply(plugin = "fabric-loom") + apply(plugin = "maven-publish") + + repositories { + maven("https://maven.hugeblank.dev/releases") { + content { + includeGroup("dev.hugeblank") + } + } + maven("https://squiddev.cc/maven") { + content { + includeGroup("org.squiddev") + } + } + maven("https://maven.nucleoid.xyz") { + content { + includeGroup("eu.pb4") + } + } + maven("https://basique.top/maven/releases") { + content { + includeGroup("me.basiqueevangelist") + } + } + } + + dependencies { + minecraft("com.mojang", "minecraft", minecraftVersion) + mappings("net.fabricmc", "yarn", yarnMappings, null, "v2") + modImplementation("net.fabricmc", "fabric-loader", loaderVersion) + + modImplementation(include("org.squiddev", "Cobalt", cobalt)) + modImplementation(include("me.basiqueevangelist","enhanced-reflection", enhancedReflections)) + } + + tasks { + processResources { + inputs.property("version", project.version) + + filesMatching("fabric.mod.json") { + expand(mutableMapOf("version" to project.version)) + } + } + + jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}" } + } + } + } +} + +dependencies { + implementation("net.fabricmc", "tiny-mappings-parser", tinyParser) + implementation("io.netty", "netty-codec-http", nettyHttp) + implementation("eu.pb4", "placeholder-api", placeholderApi) +} + +evaluationDependsOnChildren() + +tasks { + loom { + val loomRootDir = project.projectDir.relativeTo(project.rootDir) + + runs { + named("client") { + client() + configName = "Moonflower Dev Client" + ideConfigGenerated(true) + runDir(loomRootDir.resolve("run").toString()) + programArgs("-username", "GradleDev") + dependencies { + implementation(project(path = ":allium", configuration = "namedElements")) + implementation(project(path = ":bouquet", configuration = "namedElements")) + } + } + register("allium") { + client() + configName = "Allium Only" + ideConfigGenerated(true) + runDir(loomRootDir.resolve("run").toString()) + programArgs("-username", "GradleDev") + dependencies { + implementation(project(path = ":allium", configuration = "namedElements")) + } + } + } + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f9604cb --- /dev/null +++ b/gradle.properties @@ -0,0 +1,31 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# Common Mod Properties +mavenGroup=dev.hugeblank + +# Allium Properties +alliumVersion=0.1.0 +alliumReleaseCandidate=0 +alliumBaseName=allium + +# Bouquet Properties +bouquetVersion=0.1.0 +bouquetReleaseCandidate=0 +bouquetBaseName=bouquet + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraftVersion=1.21.1 +yarnMappings=1.21.1+build.3 +loaderVersion=0.16.2 + +# Common Dependencies +cobalt=0.7.0 +tinyParser=0.3.0+build.17 +enhancedReflections=0.1.6 + +# Bouquet Dependencies +nettyHttp=4.1.77.Final +placeholderApi=2.4.1+1.21 \ No newline at end of file diff --git a/allium/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from allium/gradle/wrapper/gradle-wrapper.jar rename to gradle/wrapper/gradle-wrapper.jar diff --git a/allium/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from allium/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties diff --git a/bouquet/gradlew b/gradlew similarity index 99% rename from bouquet/gradlew rename to gradlew index f5feea6..b26d411 100755 --- a/bouquet/gradlew +++ b/gradlew @@ -249,4 +249,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" +exec "$JAVACMD" "$@" \ No newline at end of file diff --git a/bouquet/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 similarity index 96% rename from bouquet/gradlew.bat rename to gradlew.bat index 9b42019..f46bb52 --- a/bouquet/gradlew.bat +++ b/gradlew.bat @@ -1,94 +1,94 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega \ No newline at end of file diff --git a/allium/settings.gradle b/settings.gradle old mode 100755 new mode 100644 similarity index 72% rename from allium/settings.gradle rename to settings.gradle index b02216b..08a0ccd --- a/allium/settings.gradle +++ b/settings.gradle @@ -8,3 +8,8 @@ pluginManagement { gradlePluginPortal() } } + +rootProject.name = "moonflower-dev" + +include("allium") +include("bouquet") \ No newline at end of file