WIP

gradle.properties

@@ -3,13 +3,14 @@ group=com.chylex.hee
 version=2.0.0-dev
 
 # Dependencies
-neoForgeVersion=20.4.162-beta
+javaVersion=21
-kotlinForForgeVersion=4.10.0
+neoForgeVersion=20.6.13-beta
+kotlinForForgeVersion=5.0.2
 
 # Constraints
-minecraftVersionRange=[1.20.4,)
+minecraftVersionRange=[1.20.6,)
-neoForgeVersionRange=(20.4.161,)
+neoForgeVersionRange=[20.6.13-beta,)
-kotlinForForgeVersionRange=[4.10.0,)
+kotlinForForgeVersionRange=[5.0.0,)
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G

gradle/plugins/build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-	implementation(group = "net.neoforged.gradle", name = "userdev", version = "7.0.93")
+	implementation(group = "net.neoforged.gradle", name = "userdev", version = "7.0.120")
 	implementation(group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version = "1.9.22")
 }
 

gradle/plugins/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/plugins/gradlew

@@ -0,0 +1,249 @@
+#!/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/HEAD/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
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# 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
+    if ! command -v java >/dev/null 2>&1
+    then
+        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
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        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
+
+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# 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" "$@"

gradle/plugins/gradlew.bat

@@ -0,0 +1,92 @@
+@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=.
+@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

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/1/hee-gradle-plugins-1.jar.md5

@@ -1 +1 @@
-1035eba8627d98cf4db7ab08ae060c50
+aa44ccb3fd72c71545347da83af1b6de

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/1/hee-gradle-plugins-1.jar.sha1

@@ -1 +1 @@
-570451c98782d0208a4f20c6f7e0a00534ef40ed
+1688c1bb9e3b2c119ad7216a25c6cdc3ff6a3883

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/1/hee-gradle-plugins-1.module

@@ -10,7 +10,7 @@
   },
   "createdBy": {
     "gradle": {
-      "version": "8.6"
+      "version": "8.7"
     }
   },
   "variants": [
@@ -20,7 +20,7 @@
         "org.gradle.category": "library",
         "org.gradle.dependency.bundling": "external",
         "org.gradle.jvm.environment": "standard-jvm",
-        "org.gradle.jvm.version": 17,
+        "org.gradle.jvm.version": 21,
         "org.gradle.libraryelements": "jar",
         "org.gradle.usage": "java-api",
         "org.jetbrains.kotlin.platform.type": "jvm"
@@ -29,11 +29,11 @@
         {
           "name": "hee-gradle-plugins-1.jar",
           "url": "hee-gradle-plugins-1.jar",
-          "size": 727705,
+          "size": 730771,
-          "sha512": "4d1cd9afa350376ca3f3fe06656ab4ea094719313a6b1b6d929b93ae709d3e94d10926dcd9dfeb2a168138f0832eacfa02a84361a39aa21ec03cc57a8e97a703",
+          "sha512": "adb3fd1ea5dfcb927a70ee218173b1f01c1ede2ec9ee650a6e1d27630de7298ace78a1bb11e6811dd97ce0e9001d3a053646c443a7029cf4378e1f356fe54b3d",
-          "sha256": "1bbf6d006f5c4fdc2aeb843bcaefa9b83a0ca123e5e62e04320764a99d9c5c9d",
+          "sha256": "fec6505e378bb2e92b8c8c29749cbed42276d72452569e4518b148796e1c6f73",
-          "sha1": "570451c98782d0208a4f20c6f7e0a00534ef40ed",
+          "sha1": "1688c1bb9e3b2c119ad7216a25c6cdc3ff6a3883",
-          "md5": "1035eba8627d98cf4db7ab08ae060c50"
+          "md5": "aa44ccb3fd72c71545347da83af1b6de"
         }
       ]
     },
@@ -43,7 +43,7 @@
         "org.gradle.category": "library",
         "org.gradle.dependency.bundling": "external",
         "org.gradle.jvm.environment": "standard-jvm",
-        "org.gradle.jvm.version": 17,
+        "org.gradle.jvm.version": 21,
         "org.gradle.libraryelements": "jar",
         "org.gradle.usage": "java-runtime",
         "org.jetbrains.kotlin.platform.type": "jvm"
@@ -53,7 +53,7 @@
           "group": "net.neoforged.gradle",
           "module": "userdev",
           "version": {
-            "requires": "7.0.93"
+            "requires": "7.0.120"
           }
         },
         {
@@ -68,11 +68,11 @@
         {
           "name": "hee-gradle-plugins-1.jar",
           "url": "hee-gradle-plugins-1.jar",
-          "size": 727705,
+          "size": 730771,
-          "sha512": "4d1cd9afa350376ca3f3fe06656ab4ea094719313a6b1b6d929b93ae709d3e94d10926dcd9dfeb2a168138f0832eacfa02a84361a39aa21ec03cc57a8e97a703",
+          "sha512": "adb3fd1ea5dfcb927a70ee218173b1f01c1ede2ec9ee650a6e1d27630de7298ace78a1bb11e6811dd97ce0e9001d3a053646c443a7029cf4378e1f356fe54b3d",
-          "sha256": "1bbf6d006f5c4fdc2aeb843bcaefa9b83a0ca123e5e62e04320764a99d9c5c9d",
+          "sha256": "fec6505e378bb2e92b8c8c29749cbed42276d72452569e4518b148796e1c6f73",
-          "sha1": "570451c98782d0208a4f20c6f7e0a00534ef40ed",
+          "sha1": "1688c1bb9e3b2c119ad7216a25c6cdc3ff6a3883",
-          "md5": "1035eba8627d98cf4db7ab08ae060c50"
+          "md5": "aa44ccb3fd72c71545347da83af1b6de"
         }
       ]
     }

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/1/hee-gradle-plugins-1.module.md5

@@ -1 +1 @@
-b89dd9e07f65e5dd3863434a8169d7c3
+eb8e41a237adcd3deb6a027ca2727591

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/1/hee-gradle-plugins-1.module.sha1

@@ -1 +1 @@
-8de05eb812a643cc9939fb9d1a5d6d4a8a6d5220
+0c4d70a143aacfbe7f294b3b78bca3578ee54773

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/1/hee-gradle-plugins-1.pom

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>net.neoforged.gradle</groupId>
       <artifactId>userdev</artifactId>
-      <version>7.0.93</version>
+      <version>7.0.120</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/1/hee-gradle-plugins-1.pom.md5

@@ -1 +1 @@
-8d1141435ff5bbac0d3a2a4164d933f6
+91b6a4aa191ec0c4dce4abefeb00f72e

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/1/hee-gradle-plugins-1.pom.sha1

@@ -1 +1 @@
-b9bcb22e5e722ddc506c20c71c307819a4221633
+1e6a80349a017a5a53816cf61cf5fc7fc5ba4fc1

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/maven-metadata.xml

@@ -8,6 +8,6 @@
     <versions>
       <version>1</version>
     </versions>
-    <lastUpdated>20240220150718</lastUpdated>
+    <lastUpdated>20240511045812</lastUpdated>
   </versioning>
 </metadata>

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/maven-metadata.xml.md5

@@ -1 +1 @@
-eff02692a3a3a2e7ccbdd3e53e192f5d
+7ce37a9e86fa68b383373e0d57b1acca

gradle/plugins/repository/com/chylex/hee/gradle/hee-gradle-plugins/maven-metadata.xml.sha1

@@ -1 +1 @@
-c4d2a7945a7acd963d6ed5daeedc34c6f50db046
+ccab83dffe0ef60a39dba93afab2ce63a36f3097

gradle/plugins/repository/hee/java/hee.java.gradle.plugin/maven-metadata.xml

@@ -8,6 +8,6 @@
     <versions>
       <version>1</version>
     </versions>
-    <lastUpdated>20240220150710</lastUpdated>
+    <lastUpdated>20240511045756</lastUpdated>
   </versioning>
 </metadata>

gradle/plugins/repository/hee/java/hee.java.gradle.plugin/maven-metadata.xml.md5

@@ -1 +1 @@
-b2d173f618128699caeeeefb57bf0835
+481d2f09bb9d9a2cdf3ffd61616ea652

gradle/plugins/repository/hee/java/hee.java.gradle.plugin/maven-metadata.xml.sha1

@@ -1 +1 @@
-25158a2318ae386093e3c7fd2f057778f4520cdc
+3d05735650ab704bf3b385b3626fbb12f466678f

gradle/plugins/repository/hee/kotlin/hee.kotlin.gradle.plugin/maven-metadata.xml

@@ -8,6 +8,6 @@
     <versions>
       <version>1</version>
     </versions>
-    <lastUpdated>20240220150710</lastUpdated>
+    <lastUpdated>20240511045756</lastUpdated>
   </versioning>
 </metadata>

gradle/plugins/repository/hee/kotlin/hee.kotlin.gradle.plugin/maven-metadata.xml.md5

@@ -1 +1 @@
-05d12570d8c5458f7f23035e5c255647
+f06cf9593c9502e5a3d1909bc0687138

gradle/plugins/repository/hee/kotlin/hee.kotlin.gradle.plugin/maven-metadata.xml.sha1

@@ -1 +1 @@
-6a7855f617a3cfd901fc00b4290ed9c8a1bbe44b
+eb639213c74e8c4628c4bd24c5bd0332ad08b596

gradle/plugins/repository/hee/library/hee.library.gradle.plugin/maven-metadata.xml

@@ -8,6 +8,6 @@
     <versions>
       <version>1</version>
     </versions>
-    <lastUpdated>20240220150710</lastUpdated>
+    <lastUpdated>20240511045756</lastUpdated>
   </versioning>
 </metadata>

gradle/plugins/repository/hee/library/hee.library.gradle.plugin/maven-metadata.xml.md5

@@ -1 +1 @@
-f09c73a0c15f8e272c7934a0f06f2612
+dc0e1cc1e754e2ec2a408bbd1604be7c

gradle/plugins/repository/hee/library/hee.library.gradle.plugin/maven-metadata.xml.sha1

@@ -1 +1 @@
-21b7dc20878f18200f68478e937812d25689acf7
+ad3db736626b1527910ba3e6e2a6f497e8944254

gradle/plugins/repository/hee/minecraft/hee.minecraft.gradle.plugin/maven-metadata.xml

@@ -8,6 +8,6 @@
     <versions>
       <version>1</version>
     </versions>
-    <lastUpdated>20240220150710</lastUpdated>
+    <lastUpdated>20240511045756</lastUpdated>
   </versioning>
 </metadata>

gradle/plugins/repository/hee/minecraft/hee.minecraft.gradle.plugin/maven-metadata.xml.md5

@@ -1 +1 @@
-1060d15fe527b22c7e71803545d79623
+73b2a813e1770cb4c8aeb02757543b27

gradle/plugins/repository/hee/minecraft/hee.minecraft.gradle.plugin/maven-metadata.xml.sha1

@@ -1 +1 @@
-fe93a19bdacdf824857a804d8f5d28a908be7b7f
+52d1fb510144d3378edbe87c4f69fd79a67d7011

gradle/plugins/src/main/kotlin/hee.java.gradle.kts

@@ -1,10 +1,11 @@
+val javaVersion: String by project
+
 plugins {
 	java
 }
 
 sourceSets {
 	configureEach {
-		
 		java.setSrcDirs(listOf(file("./$name/java")))
 		resources.setSrcDirs(listOf(file("./$name/resources")))
 	}
@@ -12,7 +13,7 @@ sourceSets {
 
 java {
 	toolchain {
-		languageVersion.set(JavaLanguageVersion.of(17))
+		languageVersion.set(JavaLanguageVersion.of(javaVersion))
 	}
 }
 

gradle/plugins/src/main/kotlin/hee.library.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 sourceSets {
 	main {
 		resources {
-			srcDir(rootProject.layout.projectDirectory.dir("resources/common"))
+			// srcDir(rootProject.layout.projectDirectory.dir("resources/common"))
 		}
 	}
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -15,8 +15,7 @@ pluginManagement {
 	}
 }
 
-include(":neoforge")
+for (module in listOf("core", "content", "neoforge")) {
-project(":neoforge").projectDir = file("./src/neoforge")
+	include(":$module")
-
+	project(":$module").projectDir = file("./src/$module")
-include(":content")
+}
-project(":content").projectDir = file("./src/content")

src/content/build.gradle.kts

@@ -3,3 +3,7 @@ plugins {
 	id("hee.library")
 	id("hee.minecraft")
 }
+
+dependencies {
+	implementation(project(":core"))
+}

src/content/main/kotlin/com/chylex/hee/content/HeeBlocks.kt

@@ -0,0 +1,11 @@
+package com.chylex.hee.content
+
+import com.chylex.hee.content.block.GloomrockBlock
+import com.chylex.hee.core.Constants
+import net.neoforged.neoforge.registries.DeferredRegister
+
+object HeeBlocks {
+	private val REGISTRY = DeferredRegister.createBlocks(Constants.MOD_ID)
+	
+	val GLOOMROCK = GloomrockBlock.register(REGISTRY)
+}

src/content/main/kotlin/com/chylex/hee/content/Test.kt

@@ -1,7 +1,9 @@
 package com.chylex.hee.content
 
+import com.chylex.hee.core.Constants
+
 object Test {
 	fun test() {
-		println("Test")
+		println(Constants.MOD_ID)
 	}
 }

src/content/main/kotlin/com/chylex/hee/content/block/GloomrockBlock.kt

@@ -0,0 +1,6 @@
+package com.chylex.hee.content.block
+
+import com.chylex.hee.core.HeeBlock
+
+object GloomrockBlock : HeeBlock() {
+}

src/core/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins {
+	id("hee.kotlin")
+	id("hee.library")
+	id("hee.minecraft")
+}

src/core/main/kotlin/com/chylex/hee/core/Constants.kt

@@ -0,0 +1,5 @@
+package com.chylex.hee.core
+
+object Constants {
+	const val MOD_ID = "hee"
+}

src/core/main/kotlin/com/chylex/hee/core/HeeBlock.kt

@@ -0,0 +1,9 @@
+package com.chylex.hee.core
+
+import net.neoforged.neoforge.registries.DeferredRegister
+
+open class HeeBlock {
+	fun register(registry: DeferredRegister.Blocks) {
+		
+	}
+}

src/core/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1 @@
+FMLModType: GAMELIBRARY

src/neoforge/build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
 }
 
 dependencies {
+	implementation(project(":core"))
 	implementation(project(":content"))
 }
 
@@ -18,6 +19,7 @@ runs {
 		}
 		
 		modSource(project)
+		modSource(project(":core"))
 		modSource(project(":content"))
 		
 		workingDirectory = rootProject.layout.projectDirectory.dir("run").asFile
@@ -34,7 +36,7 @@ tasks.processResources {
 	inputs.property("neoForgeVersionRange", neoForgeVersionRange)
 	inputs.property("kotlinForForgeVersionRange", kotlinForForgeVersionRange)
 	
-	filesMatching("META-INF/mods.toml") {
+	filesMatching("META-INF/neoforge.mods.toml") {
 		expand(inputs.properties)
 	}
 }

src/neoforge/main/kotlin/com/chylex/hee/HardcoreEnderExpansion.kt

@@ -1,13 +1,14 @@
 package com.chylex.hee
 
 import com.chylex.hee.content.Test
+import com.chylex.hee.core.Constants
+import com.chylex.hee.core.HeeBlock
 import net.neoforged.fml.common.Mod
 
-@Mod(HardcoreEnderExpansion.ID)
+@Mod(Constants.MOD_ID)
 object HardcoreEnderExpansion {
-	const val ID = "hee"
-	
 	init {
 		Test.test()
+		HeeBlock()
 	}
 }