commit e2896303a7bad9352c646e6ffd8fbc01f901c221 Author: Andrew nuark G Date: Wed Apr 29 21:14:26 2026 +0700 feat: initial 1.21.1 mod release diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fea2c61 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +# MacOS DS_Store files +.DS_Store + +# Gradle cache folder +.gradle + +# Gradle build folder +build + +# IntelliJ +out/ +.idea +*.iml +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# Common working directory +run +repo/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..9b39950 --- /dev/null +++ b/build.gradle @@ -0,0 +1,215 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'idea' + id 'net.neoforged.moddev' version '2.0.141' + id 'org.jetbrains.kotlin.jvm' version '2.3.0' +} + +version = mod_version +group = mod_group_id + +repositories { + mavenLocal() + maven { + name = 'Kotlin for Forge' + url = 'https://thedarkcolour.github.io/KotlinForForge/' + content { includeGroup "thedarkcolour" } + } + + maven { + // for Patchouli and JEI + name "blamejared" + url "https://maven.blamejared.com/" + content { + includeGroup "vazkii.patchouli" + includeGroup "vazkii.psi" + includeGroup "mezz.jei" + } + } + maven { + name = 'Modrinth' + url = 'https://api.modrinth.com/maven' + content { + includeGroup 'maven.modrinth' + } + } + exclusiveContent { + forRepository { + maven { + url "https://cursemaven.com" + } + } + filter { + includeGroup "curse.maven" + } + } + maven { + name = "Iron's Maven - Release" + url = "https://code.redspace.io/releases" + } + maven { + name = "Iron's Maven - Snapshots" + url = "https://code.redspace.io/snapshots" + } + maven { url = "https://maven.enginehub.org/repo/" } + maven { + url = "https://dl.cloudsmith.io/public/geckolib3/geckolib/maven/" + content { + includeGroup("software.bernie.geckolib") + } + } + maven { url = "https://maven.theillusivec4.top" } + maven { url = "https://maven.kosmx.dev/" } +} + +base { + archivesName = mod_id +} + +java.toolchain.languageVersion = JavaLanguageVersion.of(21) +kotlin.jvmToolchain(21) + +neoForge { + // Specify the version of NeoForge to use. + version = project.neo_version + + parchment { + mappingsVersion = project.parchment_mappings_version + minecraftVersion = project.parchment_minecraft_version + } + + // This line is optional. Access Transformers are automatically detected + // accessTransformers.add('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + client() + + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + server { + server() + programArgument '--nogui' + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + type = "gameTestServer" + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + data { + data() + + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + // gameDirectory = project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } + + // applies to all the run configs above + configureEach { + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + systemProperty 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + logLevel = org.slf4j.event.Level.DEBUG + } + } + + mods { + // define mod <-> source bindings + // these are used to tell the game which sources are for which mod + // mostly optional in a single mod project + // but multi mod projects should define one per mod + "${mod_id}" { + sourceSet(sourceSets.main) + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + + +dependencies { + implementation 'thedarkcolour:kotlinforforge-neoforge:5.11.0' + + compileOnly "mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}" + compileOnly "mezz.jei:jei-${jei_mc_version}-neoforge-api:${jei_version}" + runtimeOnly "mezz.jei:jei-${jei_mc_version}-neoforge:${jei_version}" + + compileOnly "vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE:api" + runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE" + + implementation "vazkii.psi:psi:${psi_version}" + + runtimeOnly("curse.maven:mekanism-268560:7017663") + runtimeOnly("curse.maven:ftb-library-forge-404465:7746959") + runtimeOnly("curse.maven:architectury-api-419699:5786327") + + implementation "top.theillusivec4.curios:curios-neoforge:${curios_version}+${minecraft_version}" +} + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) { + var replaceProperties = [minecraft_version : minecraft_version, + minecraft_version_range: minecraft_version_range, + neo_version : neo_version, + neo_version_range : neo_version_range, + loader_version_range : loader_version_range, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + mod_authors : mod_authors, + mod_description : mod_description] + inputs.properties replaceProperties + expand replaceProperties + from "src/main/templates" + into "build/generated/sources/modMetadata" +} + +// Include the output of "generateModMetadata" as an input directory for the build +// this works with both building through Gradle and the IDE. +sourceSets.main.resources.srcDir generateModMetadata +// To avoid having to run "generateModMetadata" manually, make it run on every project reload +neoForge.ideSyncTask generateModMetadata + +// Example configuration to allow publishing using the maven-publish plugin +publishing { + publications { + register('mavenJava', MavenPublication) { + from components.java + } + } + repositories { + maven { + url "file://${project.projectDir}/repo" + } + } +} + +// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..647a715 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,52 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +org.gradle.jvmargs=-Xmx2G +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true +## Environment Properties +# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge +# The Minecraft version must agree with the Neo version to get a valid artifact +minecraft_version=1.21.1 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.21.1,1.22) +# The Neo version must agree with the Minecraft version to get a valid artifact +neo_version=21.1.219 +# The Neo version range can use any version of Neo as bounds +neo_version_range=[21,) +# The loader version range can only use the major version of FML as bounds +loader_version_range=[5.3,) +parchment_minecraft_version=1.21.11 +parchment_mappings_version=2025.12.21-nightly-SNAPSHOT +## Mod Properties +# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} +# Must match the String constant located in the main mod class annotated with @Mod. +mod_id=fluxedpsi +# The human-readable display name for the mod. +mod_name=fluxed-psi +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=All Rights Reserved +# The mod version. See https://semver.org/ +mod_version=1.0.0 +# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. +# This should match the base package used for the mod sources. +# See https://maven.apache.org/guides/mini/guide-naming-conventions.html +mod_group_id=xyz.nuark.mcmod +# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. +mod_authors=nuark +# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. +mod_description=This mod adds trinkets which allow player to use FE, before using Psi energy + +jei_version=19.25.0.323 +jei_mc_version=1.21.1 +patchouli_version=1.21-87 +psi_version=1.21.1-107 +shield_api_version=2.1.0-neoforge +psi_tweaks_version=1.0.3 + +irons_spells_version=1.21.1-3.14.6 +geckolib_version=4.7.5.1 +player_animator_version=2.0.1+1.21.1 +curios_version=9.2.2 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a441313 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..b740cf1 --- /dev/null +++ b/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/platforms/jvm/plugins-application/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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/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 diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ada876e --- /dev/null +++ b/settings.gradle @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + mavenLocal() + gradlePluginPortal() + maven { url = 'https://maven.neoforged.net/releases' } + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} diff --git a/src/generated/resources/.cache/0f1b230d86df7ea05119b56390160191b09b614c b/src/generated/resources/.cache/0f1b230d86df7ea05119b56390160191b09b614c new file mode 100644 index 0000000..a8fbcc7 --- /dev/null +++ b/src/generated/resources/.cache/0f1b230d86df7ea05119b56390160191b09b614c @@ -0,0 +1,3 @@ +// 1.21.1 2026-04-29T18:03:00.708981 Curios for fluxedpsi +330b7ca13e09cf4b4779c6a4aaaca999b777d733 data/fluxedpsi/curios/entities/flux_container.json +a873acd7a5bd99ee9d88efe20625718ecaac3b08 data/fluxedpsi/curios/slots/flux_container.json diff --git a/src/generated/resources/.cache/2f800bb08f13c25f20cb0250995ab041391aaf23 b/src/generated/resources/.cache/2f800bb08f13c25f20cb0250995ab041391aaf23 new file mode 100644 index 0000000..83a1819 --- /dev/null +++ b/src/generated/resources/.cache/2f800bb08f13c25f20cb0250995ab041391aaf23 @@ -0,0 +1,4 @@ +// 1.21.1 2026-04-29T17:23:28.9429283 Item Models: fluxedpsi +426df254927044eeef33f01836ed2b2634ed649f assets/fluxedpsi/models/item/flux_container_t1.json +1acf2bc8956d778f68c4416d7226ab321e538464 assets/fluxedpsi/models/item/flux_container_t2.json +ec4e95aa4c757a483c48769151bbe40a34e936d1 assets/fluxedpsi/models/item/flux_container_t3.json diff --git a/src/generated/resources/.cache/8d6f053e899caa089445d26148977cd091fd25d1 b/src/generated/resources/.cache/8d6f053e899caa089445d26148977cd091fd25d1 new file mode 100644 index 0000000..8e32873 --- /dev/null +++ b/src/generated/resources/.cache/8d6f053e899caa089445d26148977cd091fd25d1 @@ -0,0 +1 @@ +// 1.21.1 2026-04-29T17:23:28.9459297 Tags for minecraft:block mod id fluxedpsi diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e new file mode 100644 index 0000000..06c2d64 --- /dev/null +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -0,0 +1,7 @@ +// 1.21.1 2026-04-29T21:09:24.236329 Recipes +c35ab949228b71f7587feb56aa6c5a528c60ca9c data/fluxedpsi/advancement/recipes/tools/rec_fct1.json +4d1c03a2d76ce6c7b85d32074822b21f71229f57 data/fluxedpsi/advancement/recipes/tools/rec_fct2.json +400bb4a7e05fb3b99c96ed3558bb91141db6098c data/fluxedpsi/advancement/recipes/tools/rec_fct3.json +1659e58e359fdf5390abb4b722944cea77297cc4 data/fluxedpsi/recipe/rec_fct1.json +fd2d54e6d45addeae6ba1f550093089e72ef308f data/fluxedpsi/recipe/rec_fct2.json +5839b2739a031ecf13950a36ff06c1e02d9f3c20 data/fluxedpsi/recipe/rec_fct3.json diff --git a/src/generated/resources/.cache/a229d258535ac5880f343f945becd4e8be003937 b/src/generated/resources/.cache/a229d258535ac5880f343f945becd4e8be003937 new file mode 100644 index 0000000..9647e36 --- /dev/null +++ b/src/generated/resources/.cache/a229d258535ac5880f343f945becd4e8be003937 @@ -0,0 +1,2 @@ +// 1.21.1 2026-04-29T18:25:01.1377235 Languages: en_us for mod: fluxedpsi +8270aba999d989e1146b728c4f7e4b76293f1606 assets/fluxedpsi/lang/en_us.json diff --git a/src/generated/resources/.cache/b5a652cd017b3010c1c64d0a38f41804ed6787cb b/src/generated/resources/.cache/b5a652cd017b3010c1c64d0a38f41804ed6787cb new file mode 100644 index 0000000..3ba4285 --- /dev/null +++ b/src/generated/resources/.cache/b5a652cd017b3010c1c64d0a38f41804ed6787cb @@ -0,0 +1,2 @@ +// 1.21.1 2026-04-29T17:42:04.8847913 Tags for minecraft:item mod id fluxedpsi +37db52c31c97aa2e94767ac630ea4772af74a318 data/fluxedpsi/tags/item/flux_container.json diff --git a/src/generated/resources/.cache/efb7e155139a8b4103c138d6075be01f3955b3f8 b/src/generated/resources/.cache/efb7e155139a8b4103c138d6075be01f3955b3f8 new file mode 100644 index 0000000..1f4a8b6 --- /dev/null +++ b/src/generated/resources/.cache/efb7e155139a8b4103c138d6075be01f3955b3f8 @@ -0,0 +1,2 @@ +// 1.21.1 2026-04-29T18:25:01.1397222 Languages: ru_ru for mod: fluxedpsi +ffdbe86492bf4b6a8105ebbdb770851358147387 assets/fluxedpsi/lang/ru_ru.json diff --git a/src/generated/resources/assets/fluxedpsi/lang/en_us.json b/src/generated/resources/assets/fluxedpsi/lang/en_us.json new file mode 100644 index 0000000..e9ef97c --- /dev/null +++ b/src/generated/resources/assets/fluxedpsi/lang/en_us.json @@ -0,0 +1,8 @@ +{ + "fluxedpsi.item.fluxedps": "Charge: %s / %s FE", + "item.fluxedpsi.flux_container_t1": "Flux container T1", + "item.fluxedpsi.flux_container_t2": "Flux container T2", + "item.fluxedpsi.flux_container_t3": "Flux container T3", + "item.wtf_flux_container": "SOMETHING IS VERY WRONG!", + "key.categories.flux_container": "Flux container" +} \ No newline at end of file diff --git a/src/generated/resources/assets/fluxedpsi/lang/ru_ru.json b/src/generated/resources/assets/fluxedpsi/lang/ru_ru.json new file mode 100644 index 0000000..718a054 --- /dev/null +++ b/src/generated/resources/assets/fluxedpsi/lang/ru_ru.json @@ -0,0 +1,8 @@ +{ + "fluxedpsi.item.fluxedps": "Заряд: %s / %s FE", + "item.fluxedpsi.flux_container_t1": "Контейнер потока T1", + "item.fluxedpsi.flux_container_t2": "Контейнер потока T2", + "item.fluxedpsi.flux_container_t3": "Контейнер потока T3", + "item.wtf_flux_container": "ЧТО-ТО НЕ ТАК!", + "key.categories.flux_container": "Контейнер потока" +} \ No newline at end of file diff --git a/src/generated/resources/assets/fluxedpsi/models/item/flux_container_t1.json b/src/generated/resources/assets/fluxedpsi/models/item/flux_container_t1.json new file mode 100644 index 0000000..07d59e2 --- /dev/null +++ b/src/generated/resources/assets/fluxedpsi/models/item/flux_container_t1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fluxedpsi:item/flux_container_t1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/fluxedpsi/models/item/flux_container_t2.json b/src/generated/resources/assets/fluxedpsi/models/item/flux_container_t2.json new file mode 100644 index 0000000..d9a4a93 --- /dev/null +++ b/src/generated/resources/assets/fluxedpsi/models/item/flux_container_t2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fluxedpsi:item/flux_container_t2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/fluxedpsi/models/item/flux_container_t3.json b/src/generated/resources/assets/fluxedpsi/models/item/flux_container_t3.json new file mode 100644 index 0000000..7046023 --- /dev/null +++ b/src/generated/resources/assets/fluxedpsi/models/item/flux_container_t3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "fluxedpsi:item/flux_container_t3" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/fluxedpsi/advancement/recipes/tools/rec_fct1.json b/src/generated/resources/data/fluxedpsi/advancement/recipes/tools/rec_fct1.json new file mode 100644 index 0000000..77ecf3e --- /dev/null +++ b/src/generated/resources/data/fluxedpsi/advancement/recipes/tools/rec_fct1.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "fluxedpsi:rec_fct1" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "fluxedpsi:rec_fct1" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/fluxedpsi/advancement/recipes/tools/rec_fct2.json b/src/generated/resources/data/fluxedpsi/advancement/recipes/tools/rec_fct2.json new file mode 100644 index 0000000..2600000 --- /dev/null +++ b/src/generated/resources/data/fluxedpsi/advancement/recipes/tools/rec_fct2.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "fluxedpsi:rec_fct2" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "fluxedpsi:rec_fct2" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/fluxedpsi/advancement/recipes/tools/rec_fct3.json b/src/generated/resources/data/fluxedpsi/advancement/recipes/tools/rec_fct3.json new file mode 100644 index 0000000..fdc4470 --- /dev/null +++ b/src/generated/resources/data/fluxedpsi/advancement/recipes/tools/rec_fct3.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_redstone": { + "conditions": { + "items": [ + { + "items": "minecraft:redstone_block" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "fluxedpsi:rec_fct3" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_redstone" + ] + ], + "rewards": { + "recipes": [ + "fluxedpsi:rec_fct3" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/fluxedpsi/curios/entities/flux_container.json b/src/generated/resources/data/fluxedpsi/curios/entities/flux_container.json new file mode 100644 index 0000000..657ae8b --- /dev/null +++ b/src/generated/resources/data/fluxedpsi/curios/entities/flux_container.json @@ -0,0 +1,8 @@ +{ + "entities": [ + "minecraft:player" + ], + "slots": [ + "flux_container" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/fluxedpsi/curios/slots/flux_container.json b/src/generated/resources/data/fluxedpsi/curios/slots/flux_container.json new file mode 100644 index 0000000..215a0e2 --- /dev/null +++ b/src/generated/resources/data/fluxedpsi/curios/slots/flux_container.json @@ -0,0 +1,5 @@ +{ + "icon": "fluxedpsi:item/flux_container_curio", + "replace": false, + "size": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/fluxedpsi/recipe/rec_fct1.json b/src/generated/resources/data/fluxedpsi/recipe/rec_fct1.json new file mode 100644 index 0000000..2e7929c --- /dev/null +++ b/src/generated/resources/data/fluxedpsi/recipe/rec_fct1.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "B": { + "item": "minecraft:redstone_block" + }, + "E": { + "item": "psi:ebony_psimetal" + }, + "R": { + "item": "minecraft:repeater" + } + }, + "pattern": [ + "ERE", + "EBE", + "EEE" + ], + "result": { + "count": 1, + "id": "fluxedpsi:flux_container_t1" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/fluxedpsi/recipe/rec_fct2.json b/src/generated/resources/data/fluxedpsi/recipe/rec_fct2.json new file mode 100644 index 0000000..dcdf1c5 --- /dev/null +++ b/src/generated/resources/data/fluxedpsi/recipe/rec_fct2.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "B": { + "item": "fluxedpsi:flux_container_t1" + }, + "E": { + "item": "psi:ebony_psimetal" + }, + "X": { + "item": "psi:cad_battery_basic" + }, + "Z": { + "item": "psi:cad_battery_extended" + } + }, + "pattern": [ + "EZE", + "XBX", + "EZE" + ], + "result": { + "count": 1, + "id": "fluxedpsi:flux_container_t2" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/fluxedpsi/recipe/rec_fct3.json b/src/generated/resources/data/fluxedpsi/recipe/rec_fct3.json new file mode 100644 index 0000000..7c9cdc9 --- /dev/null +++ b/src/generated/resources/data/fluxedpsi/recipe/rec_fct3.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "B": { + "item": "fluxedpsi:flux_container_t2" + }, + "E": { + "item": "psi:ebony_psimetal" + }, + "X": { + "item": "psi:cad_battery_extended" + }, + "Z": { + "item": "psi:cad_battery_ultradense" + } + }, + "pattern": [ + "EZE", + "XBX", + "EZE" + ], + "result": { + "count": 1, + "id": "fluxedpsi:flux_container_t3" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/fluxedpsi/tags/item/flux_container.json b/src/generated/resources/data/fluxedpsi/tags/item/flux_container.json new file mode 100644 index 0000000..a6ccfc9 --- /dev/null +++ b/src/generated/resources/data/fluxedpsi/tags/item/flux_container.json @@ -0,0 +1,7 @@ +{ + "values": [ + "fluxedpsi:flux_container_t1", + "fluxedpsi:flux_container_t2", + "fluxedpsi:flux_container_t3" + ] +} \ No newline at end of file diff --git a/src/main/java/xyz/nuark/mcmod/fluxedpsi/mixin/PlayerDataMixin.java b/src/main/java/xyz/nuark/mcmod/fluxedpsi/mixin/PlayerDataMixin.java new file mode 100644 index 0000000..42f8271 --- /dev/null +++ b/src/main/java/xyz/nuark/mcmod/fluxedpsi/mixin/PlayerDataMixin.java @@ -0,0 +1,58 @@ +package xyz.nuark.mcmod.fluxedpsi.mixin; + +import net.minecraft.world.entity.player.Player; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.ModifyVariable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import vazkii.psi.common.core.handler.PlayerDataHandler; +import xyz.nuark.mcmod.fluxedpsi.util.PsiCalculationsUtil; + +import java.lang.ref.WeakReference; + +@Mixin(PlayerDataHandler.PlayerData.class) +public abstract class PlayerDataMixin { + @Shadow + @Final + public WeakReference playerWR; + + @ModifyVariable( + method = "deductPsi(IIZZ)V", + at = @At("HEAD"), + ordinal = 0, + argsOnly = true + ) + public int deductPsi(int original) { + Player player = playerWR.get(); + + int amount = 0; + if (player != null) { + amount = PsiCalculationsUtil.INSTANCE.deductEnergyFromFluxContainer(player, original); + } + + return original - amount; + } + +// @Inject(method = "getTotalPsi", at = @At("RETURN"), cancellable = true) +// private void getTotalPsi(CallbackInfoReturnable cir) { +// int totalPsi = cir.getReturnValueI(); +// Player player = playerWR.get(); +// if (player != null) { +// int attrValue = (int) player.getAttributeValue(ModAttributes.MAX_PSI); +// cir.setReturnValue(totalPsi + attrValue); +// } +// } +// +// @Inject(method = "getRegenPerTick", at = @At("RETURN"), cancellable = true) +// private void getRegenPerTick(CallbackInfoReturnable cir) { +// int regen = cir.getReturnValueI(); +// Player player = playerWR.get(); +// if (player != null) { +// int attrValue = (int) player.getAttributeValue(ModAttributes.REGEN_PSI); +// cir.setReturnValue(regen + attrValue); +// } +// } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/FluxedPsi.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/FluxedPsi.kt new file mode 100644 index 0000000..87693b8 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/FluxedPsi.kt @@ -0,0 +1,121 @@ +package xyz.nuark.mcmod.fluxedpsi + +import net.minecraft.client.Minecraft +import net.minecraft.resources.ResourceLocation +import net.minecraft.world.item.CreativeModeTabs +import net.neoforged.bus.api.SubscribeEvent +import net.neoforged.fml.common.EventBusSubscriber +import net.neoforged.fml.common.Mod +import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent +import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent +import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent +import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent +import net.neoforged.neoforge.data.event.GatherDataEvent +import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent +import org.apache.logging.log4j.Level +import org.apache.logging.log4j.LogManager +import org.apache.logging.log4j.Logger +import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS +import thedarkcolour.kotlinforforge.neoforge.forge.runForDist +import xyz.nuark.mcmod.fluxedpsi.capability.ModCapabilities +import xyz.nuark.mcmod.fluxedpsi.component.ModComponents +import xyz.nuark.mcmod.fluxedpsi.datagen.ModBlockTagsProvider +import xyz.nuark.mcmod.fluxedpsi.datagen.ModCuriosProvider +import xyz.nuark.mcmod.fluxedpsi.datagen.ModItemModelProvider +import xyz.nuark.mcmod.fluxedpsi.datagen.ModItemTagsProvider +import xyz.nuark.mcmod.fluxedpsi.datagen.ModLanguageProviders +import xyz.nuark.mcmod.fluxedpsi.datagen.ModRecipeProvider +import xyz.nuark.mcmod.fluxedpsi.item.ModItems + + +@Mod(FluxedPsi.ID) +@EventBusSubscriber +object FluxedPsi { + const val ID = "fluxedpsi" + + // the logger for our mod + val LOGGER: Logger = LogManager.getLogger(ID) + + init { + val obj = runForDist(clientTarget = { + MOD_BUS.addListener(::onClientSetup) + Minecraft.getInstance() + }, serverTarget = { + MOD_BUS.addListener(::onServerSetup) + "test" + }) + + ModItems.ITEMS.register(MOD_BUS) + ModComponents.COMPONENTS.register(MOD_BUS) + + println(obj) + } + + /** + * This is used for initializing client specific + * things such as renderers and keymaps + * Fired on the mod specific event bus. + */ + private fun onClientSetup(event: FMLClientSetupEvent) { + LOGGER.log(Level.INFO, "Initializing client...") + } + + /** + * Fired on the global Forge bus. + */ + private fun onServerSetup(event: FMLDedicatedServerSetupEvent) { + LOGGER.log(Level.INFO, "Server starting...") + } + + @SubscribeEvent + fun onCommonSetup(event: FMLCommonSetupEvent) { + LOGGER.log(Level.INFO, "Hello! This is working!") + } + + @SubscribeEvent + fun buildContents(event: BuildCreativeModeTabContentsEvent) { + if (event.tabKey === CreativeModeTabs.TOOLS_AND_UTILITIES) { + event.accept(ModItems.FLUX_CONTAINER_T1.get()) + event.accept(ModItems.FLUX_CONTAINER_T2.get()) + event.accept(ModItems.FLUX_CONTAINER_T3.get()) + } + } + + @SubscribeEvent + fun registerCapabilities(event: RegisterCapabilitiesEvent) { + ModCapabilities.registerCapabilities(event) + } + + @SubscribeEvent + fun gatherData(event: GatherDataEvent) { + val existingFileHelper = event.existingFileHelper + val generator = event.generator + val output = generator.packOutput + val lookupProvider = event.lookupProvider + val blockTagsProvider = ModBlockTagsProvider(output, lookupProvider, existingFileHelper) + + generator.addProvider( + event.includeServer(), + ModCuriosProvider(output, existingFileHelper, lookupProvider) + ) + generator.addProvider( + event.includeClient(), + ModItemModelProvider(output, existingFileHelper) + ) + ModLanguageProviders.provideProviders(generator, event.includeClient()) + generator.addProvider( + event.includeServer(), + blockTagsProvider + ) + generator.addProvider( + event.includeServer(), + ModItemTagsProvider(output, existingFileHelper, lookupProvider, blockTagsProvider.contentsGetter()) + ) + generator.addProvider( + event.includeServer(), + ModRecipeProvider(output, lookupProvider) + ) + } + + fun resource(name: String): ResourceLocation = ResourceLocation.fromNamespaceAndPath(FluxedPsi.ID, name) +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/EnergyAdditionalPsiHandler.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/EnergyAdditionalPsiHandler.kt new file mode 100644 index 0000000..1a29982 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/EnergyAdditionalPsiHandler.kt @@ -0,0 +1,56 @@ +package xyz.nuark.mcmod.fluxedpsi.capability + +import net.minecraft.world.item.ItemStack +import net.neoforged.neoforge.capabilities.Capabilities +import net.neoforged.neoforge.energy.IEnergyStorage + + +class EnergyAdditionalPsiHandler(val stack: ItemStack) : IAdditionalPsiHandler { + override fun receivePsi(amount: Int, simulate: Boolean): Int { + val energyStorage: IEnergyStorage? = stack.getCapability(Capabilities.EnergyStorage.ITEM) + if (energyStorage != null) { + return energyStorage.receiveEnergy(amount, simulate) + } + return 0 + } + + override fun extractPsi(amount: Int, simulate: Boolean): Int { + val energyStorage: IEnergyStorage? = stack.getCapability(Capabilities.EnergyStorage.ITEM) + if (energyStorage != null) { + return energyStorage.extractEnergy(amount, simulate) + } + return 0 + } + + override fun getPsiStored(): Int { + val energyStorage: IEnergyStorage? = stack.getCapability(Capabilities.EnergyStorage.ITEM) + if (energyStorage != null) { + return energyStorage.energyStored + } + return 0 + } + + override fun getMaxPsiStored(): Int { + val energyStorage: IEnergyStorage? = stack.getCapability(Capabilities.EnergyStorage.ITEM) + if (energyStorage != null) { + return energyStorage.maxEnergyStored + } + return 0 + } + + override fun canExtract(): Boolean { + val energyStorage: IEnergyStorage? = stack.getCapability(Capabilities.EnergyStorage.ITEM) + if (energyStorage != null) { + return energyStorage.canExtract() + } + return false + } + + override fun canReceive(): Boolean { + val energyStorage: IEnergyStorage? = stack.getCapability(Capabilities.EnergyStorage.ITEM) + if (energyStorage != null) { + return energyStorage.canReceive() + } + return false + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/EnergyStorageItemStack.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/EnergyStorageItemStack.kt new file mode 100644 index 0000000..4c386e5 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/EnergyStorageItemStack.kt @@ -0,0 +1,72 @@ +package xyz.nuark.mcmod.fluxedpsi.capability + +import net.minecraft.core.HolderLookup +import net.minecraft.nbt.IntTag +import net.minecraft.nbt.Tag +import net.minecraft.world.item.ItemStack +import net.neoforged.neoforge.energy.EnergyStorage +import xyz.nuark.mcmod.fluxedpsi.component.ModComponents +import xyz.nuark.mcmod.fluxedpsi.item.FluxContainer +import kotlin.math.absoluteValue + +class EnergyStorageItemStack(val stack: ItemStack) : EnergyStorage((stack.item as FluxContainer).maxCapacity) { + fun setEnergy(energy: Int) { + this.energy = energy + stack.set(ModComponents.STORED_ENERGY, energy) + } + + override fun receiveEnergy(toReceive: Int, simulate: Boolean): Int { + if (canReceive()) { + val receiveBuffer = capacity - energy + val receivedReal = (toReceive - (toReceive - receiveBuffer).absoluteValue).coerceAtLeast(0) + if (!simulate) { + setEnergy(energy + receivedReal) + } + + return receivedReal + } else { + return 0 + } + } + + override fun extractEnergy(toExtract: Int, simulate: Boolean): Int { + if (canExtract()) { + val extracted = (energy - toExtract).coerceIn(0, capacity) + if (!simulate) { + setEnergy(energy - extracted) + } + + return extracted + } else { + return 0 + } + } + + override fun getEnergyStored(): Int { + return stack.getOrDefault(ModComponents.STORED_ENERGY, 0) + } + + override fun getMaxEnergyStored(): Int { + return capacity + } + + override fun canExtract(): Boolean { + return maxExtract > 0 + } + + override fun canReceive(): Boolean { + return maxReceive > 0 + } + + override fun serializeNBT(provider: HolderLookup.Provider): Tag { + return IntTag.valueOf(energyStored) + } + + override fun deserializeNBT(provider: HolderLookup.Provider, nbt: Tag) { + if (nbt.javaClass::class != IntTag::class) { + throw IllegalArgumentException("Invalid tag $nbt") + } + + energy = (nbt as IntTag).asInt + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/IAdditionalPsiHandler.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/IAdditionalPsiHandler.kt new file mode 100644 index 0000000..e73848e --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/IAdditionalPsiHandler.kt @@ -0,0 +1,15 @@ +package xyz.nuark.mcmod.fluxedpsi.capability + +interface IAdditionalPsiHandler { + fun receivePsi(amount: Int, simulate: Boolean): Int + + fun extractPsi(amount: Int, simulate: Boolean): Int + + fun getPsiStored(): Int + + fun getMaxPsiStored(): Int + + fun canExtract(): Boolean + + fun canReceive(): Boolean +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/ModCapabilities.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/ModCapabilities.kt new file mode 100644 index 0000000..09972f6 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/capability/ModCapabilities.kt @@ -0,0 +1,32 @@ +package xyz.nuark.mcmod.fluxedpsi.capability + +import net.minecraft.world.item.ItemStack +import net.neoforged.neoforge.capabilities.Capabilities +import net.neoforged.neoforge.capabilities.ItemCapability +import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent +import xyz.nuark.mcmod.fluxedpsi.FluxedPsi +import xyz.nuark.mcmod.fluxedpsi.item.FluxContainer +import xyz.nuark.mcmod.fluxedpsi.item.ModItems + + +object ModCapabilities { + val ADDITIONAL_PSI_HANDLER_ITEM: ItemCapability = ItemCapability.create( + FluxedPsi.resource("psi_handler"), + IAdditionalPsiHandler::class.java, + Void::class.java + ) + + fun registerCapabilities(event: RegisterCapabilitiesEvent) { + event.registerItem( + Capabilities.EnergyStorage.ITEM, + { stack: ItemStack, ctx: Void? -> FluxContainer.getEnergyStorage(stack) }, + ModItems.FLUX_CONTAINER_T1, ModItems.FLUX_CONTAINER_T2, ModItems.FLUX_CONTAINER_T3 + ) + + event.registerItem( + ADDITIONAL_PSI_HANDLER_ITEM, + { stack: ItemStack, ctx: Void? -> EnergyAdditionalPsiHandler(stack) }, + ModItems.FLUX_CONTAINER_T1, ModItems.FLUX_CONTAINER_T2, ModItems.FLUX_CONTAINER_T3 + ) + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/component/ModComponents.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/component/ModComponents.kt new file mode 100644 index 0000000..42b7699 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/component/ModComponents.kt @@ -0,0 +1,22 @@ +package xyz.nuark.mcmod.fluxedpsi.component + +import com.mojang.serialization.Codec +import net.minecraft.core.component.DataComponentType +import net.minecraft.core.registries.Registries +import net.minecraft.network.codec.ByteBufCodecs +import net.neoforged.neoforge.registries.DeferredRegister +import xyz.nuark.mcmod.fluxedpsi.FluxedPsi +import java.util.function.Supplier + + +object ModComponents { + val COMPONENTS = DeferredRegister.create(Registries.DATA_COMPONENT_TYPE, FluxedPsi.ID) + + val STORED_ENERGY = DataComponentType.builder().run { + persistent(Codec.INT).networkSynchronized(ByteBufCodecs.INT) + val componentType = build() + + COMPONENTS.register("stored_energy", Supplier { componentType }) + return@run componentType + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModBlockTagsProvider.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModBlockTagsProvider.kt new file mode 100644 index 0000000..fcba2fd --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModBlockTagsProvider.kt @@ -0,0 +1,18 @@ +package xyz.nuark.mcmod.fluxedpsi.datagen + +import net.minecraft.core.HolderLookup +import net.minecraft.data.PackOutput +import net.neoforged.neoforge.common.data.BlockTagsProvider +import net.neoforged.neoforge.common.data.ExistingFileHelper +import xyz.nuark.mcmod.fluxedpsi.FluxedPsi +import java.util.concurrent.CompletableFuture + + +class ModBlockTagsProvider( + output: PackOutput, + lookupProvider: CompletableFuture, + existingFileHelper: ExistingFileHelper +) : BlockTagsProvider(output, lookupProvider, FluxedPsi.ID, existingFileHelper) { + override fun addTags(provider: HolderLookup.Provider) { + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModCuriosProvider.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModCuriosProvider.kt new file mode 100644 index 0000000..57a9b4c --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModCuriosProvider.kt @@ -0,0 +1,25 @@ +package xyz.nuark.mcmod.fluxedpsi.datagen + +import com.mojang.serialization.MapCodec +import net.minecraft.core.HolderLookup +import net.minecraft.data.PackOutput +import net.neoforged.neoforge.client.model.generators.ItemModelProvider +import net.neoforged.neoforge.common.conditions.ICondition +import net.neoforged.neoforge.common.data.ExistingFileHelper +import top.theillusivec4.curios.api.CuriosDataProvider +import xyz.nuark.mcmod.fluxedpsi.FluxedPsi +import xyz.nuark.mcmod.fluxedpsi.item.ModItems +import java.util.concurrent.CompletableFuture + +class ModCuriosProvider(output: PackOutput, existingFileHelper: ExistingFileHelper, registries: CompletableFuture) : CuriosDataProvider(FluxedPsi.ID, output, existingFileHelper, registries) { + override fun generate(registries: HolderLookup.Provider?, fileHelper: ExistingFileHelper?) { + createSlot("flux_container") + .icon(FluxedPsi.resource("item/flux_container_curio")) + .size(1) + .replace(false) + + createEntities("flux_container") + .addPlayer() + .addSlots("flux_container") + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModItemModelProvider.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModItemModelProvider.kt new file mode 100644 index 0000000..a8358db --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModItemModelProvider.kt @@ -0,0 +1,15 @@ +package xyz.nuark.mcmod.fluxedpsi.datagen + +import net.minecraft.data.PackOutput +import net.neoforged.neoforge.client.model.generators.ItemModelProvider +import net.neoforged.neoforge.common.data.ExistingFileHelper +import xyz.nuark.mcmod.fluxedpsi.FluxedPsi +import xyz.nuark.mcmod.fluxedpsi.item.ModItems + +class ModItemModelProvider(output: PackOutput, existingFileHelper: ExistingFileHelper) : ItemModelProvider(output, FluxedPsi.ID, existingFileHelper) { + override fun registerModels() { + basicItem(ModItems.FLUX_CONTAINER_T1.get()) + basicItem(ModItems.FLUX_CONTAINER_T2.get()) + basicItem(ModItems.FLUX_CONTAINER_T3.get()) + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModItemTagsProvider.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModItemTagsProvider.kt new file mode 100644 index 0000000..4f202f6 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModItemTagsProvider.kt @@ -0,0 +1,24 @@ +package xyz.nuark.mcmod.fluxedpsi.datagen + +import net.minecraft.core.HolderLookup +import net.minecraft.core.registries.Registries +import net.minecraft.data.PackOutput +import net.minecraft.data.tags.ItemTagsProvider +import net.minecraft.tags.TagKey +import net.minecraft.world.level.block.Block +import net.neoforged.neoforge.common.data.ExistingFileHelper +import xyz.nuark.mcmod.fluxedpsi.FluxedPsi +import xyz.nuark.mcmod.fluxedpsi.item.ModItems +import java.util.concurrent.CompletableFuture + +class ModItemTagsProvider( + output: PackOutput, + existingFileHelper: ExistingFileHelper, + lookupProvider: CompletableFuture, + blockTags: CompletableFuture> +) : ItemTagsProvider(output, lookupProvider, blockTags, FluxedPsi.ID, existingFileHelper) { + override fun addTags(p0: HolderLookup.Provider) { + tag(TagKey.create(Registries.ITEM, FluxedPsi.resource("flux_container"))) + .add(ModItems.FLUX_CONTAINER_T1.get(), ModItems.FLUX_CONTAINER_T2.get(), ModItems.FLUX_CONTAINER_T3.get()) + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModLanguageProviders.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModLanguageProviders.kt new file mode 100644 index 0000000..abc4b1f --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModLanguageProviders.kt @@ -0,0 +1,38 @@ +package xyz.nuark.mcmod.fluxedpsi.datagen + +import net.minecraft.data.DataGenerator +import net.minecraft.data.PackOutput +import net.neoforged.neoforge.common.data.ExistingFileHelper +import net.neoforged.neoforge.common.data.LanguageProvider +import net.neoforged.neoforge.data.event.GatherDataEvent +import xyz.nuark.mcmod.fluxedpsi.FluxedPsi +import xyz.nuark.mcmod.fluxedpsi.item.ModItems + +object ModLanguageProviders { + class ModRuRuLanguageProvider(output: PackOutput) : LanguageProvider(output, FluxedPsi.ID, "ru_ru") { + override fun addTranslations() { + add(ModItems.FLUX_CONTAINER_T1.get(), "Контейнер потока T1") + add(ModItems.FLUX_CONTAINER_T2.get(), "Контейнер потока T2") + add(ModItems.FLUX_CONTAINER_T3.get(), "Контейнер потока T3") + add("key.categories.flux_container", "Контейнер потока") + add("fluxedpsi.item.fluxedps", "Заряд: %s / %s FE") + add("item.wtf_flux_container", "ЧТО-ТО НЕ ТАК!") + } + } + + class ModEnUsLanguageProvider(output: PackOutput) : LanguageProvider(output, FluxedPsi.ID, "en_us") { + override fun addTranslations() { + add(ModItems.FLUX_CONTAINER_T1.get(), "Flux container T1") + add(ModItems.FLUX_CONTAINER_T2.get(), "Flux container T2") + add(ModItems.FLUX_CONTAINER_T3.get(), "Flux container T3") + add("key.categories.flux_container", "Flux container") + add("fluxedpsi.item.fluxedps", "Charge: %s / %s FE") + add("item.wtf_flux_container", "SOMETHING IS VERY WRONG!") + } + } + + fun provideProviders(generator: DataGenerator, shouldRun: Boolean) { + generator.addProvider(shouldRun, ModRuRuLanguageProvider(generator.packOutput)) + generator.addProvider(shouldRun, ModEnUsLanguageProvider(generator.packOutput)) + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModRecipeProvider.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModRecipeProvider.kt new file mode 100644 index 0000000..ecff86d --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/datagen/ModRecipeProvider.kt @@ -0,0 +1,49 @@ +package xyz.nuark.mcmod.fluxedpsi.datagen + +import net.minecraft.core.HolderLookup +import net.minecraft.data.PackOutput +import net.minecraft.data.recipes.RecipeCategory +import net.minecraft.data.recipes.RecipeOutput +import net.minecraft.data.recipes.RecipeProvider +import net.minecraft.data.recipes.ShapedRecipeBuilder +import net.minecraft.world.item.Items +import xyz.nuark.mcmod.fluxedpsi.FluxedPsi +import xyz.nuark.mcmod.fluxedpsi.item.ModItems +import java.util.concurrent.CompletableFuture + + +class ModRecipeProvider(output: PackOutput, registries: CompletableFuture) : RecipeProvider(output, registries) { + override fun buildRecipes(recipeOutput: RecipeOutput) { + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.FLUX_CONTAINER_T1.get()) + .pattern("ERE") + .pattern("EBE") + .pattern("EEE") + .define('E', vazkii.psi.common.item.base.ModItems.ebonyPsimetal.get()) + .define('R', Items.REPEATER) + .define('B', Items.REDSTONE_BLOCK) + .unlockedBy("has_redstone", has(Items.REDSTONE_BLOCK)) + .save(recipeOutput, FluxedPsi.resource("rec_fct1")) + + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.FLUX_CONTAINER_T2.get()) + .pattern("EZE") + .pattern("XBX") + .pattern("EZE") + .define('E', vazkii.psi.common.item.base.ModItems.ebonyPsimetal.get()) + .define('X', vazkii.psi.common.item.base.ModItems.cadBatteryBasic.get()) + .define('Z', vazkii.psi.common.item.base.ModItems.cadBatteryExtended.get()) + .define('B', ModItems.FLUX_CONTAINER_T1.get()) + .unlockedBy("has_redstone", has(Items.REDSTONE_BLOCK)) + .save(recipeOutput, FluxedPsi.resource("rec_fct2")) + + ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.FLUX_CONTAINER_T3.get()) + .pattern("EZE") + .pattern("XBX") + .pattern("EZE") + .define('E', vazkii.psi.common.item.base.ModItems.ebonyPsimetal.get()) + .define('X', vazkii.psi.common.item.base.ModItems.cadBatteryExtended.get()) + .define('Z', vazkii.psi.common.item.base.ModItems.cadBatteryUltradense.get()) + .define('B', ModItems.FLUX_CONTAINER_T2.get()) + .unlockedBy("has_redstone", has(Items.REDSTONE_BLOCK)) + .save(recipeOutput, FluxedPsi.resource("rec_fct3")) + } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/item/FluxContainer.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/item/FluxContainer.kt new file mode 100644 index 0000000..5318d98 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/item/FluxContainer.kt @@ -0,0 +1,62 @@ +package xyz.nuark.mcmod.fluxedpsi.item + +import net.minecraft.network.chat.Component +import net.minecraft.world.item.Item +import net.minecraft.world.item.ItemStack +import net.minecraft.world.item.TooltipFlag +import net.neoforged.neoforge.capabilities.Capabilities +import net.neoforged.neoforge.capabilities.ICapabilityProvider +import net.neoforged.neoforge.energy.ComponentEnergyStorage +import net.neoforged.neoforge.energy.IEnergyStorage +import xyz.nuark.mcmod.fluxedpsi.capability.EnergyStorageItemStack +import xyz.nuark.mcmod.fluxedpsi.component.ModComponents + + +class FluxContainer(properties: Properties, val maxCapacity: Int) : Item(properties.stacksTo(1)) { + override fun appendHoverText( + stack: ItemStack, + context: TooltipContext, + tooltip: MutableList, + flag: TooltipFlag + ) { + val energy = stack.getCapability(Capabilities.EnergyStorage.ITEM) + if (energy != null) { + tooltip.add( + Component.translatable( + "fluxedpsi.item.fluxedps", + energy.energyStored.toString(), + energy.maxEnergyStored.toString() + ) + ) + } else { + tooltip.add(Component.translatable("fluxedpsi.item.wtf_flux_container")) + } + super.appendHoverText(stack, context, tooltip, flag) + } + + override fun isBarVisible(stack: ItemStack): Boolean { + val energy = stack.getCapability(Capabilities.EnergyStorage.ITEM) + if (energy != null) { + return energy.energyStored < energy.maxEnergyStored + } + return false + } + + override fun getBarWidth(stack: ItemStack): Int { + val energy = stack.getCapability(Capabilities.EnergyStorage.ITEM) + if (energy != null) { + return (13f * (energy.energyStored / energy.maxEnergyStored).toFloat()).toInt() + } + return 0 + } + + override fun getBarColor(stack: ItemStack): Int { + return 0x00FFFF + } + + companion object { + fun getEnergyStorage(stack: ItemStack): IEnergyStorage { + return ComponentEnergyStorage(stack, ModComponents.STORED_ENERGY, (stack.item as FluxContainer).maxCapacity) + } + } +} diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/item/ModItems.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/item/ModItems.kt new file mode 100644 index 0000000..cd7e7a2 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/item/ModItems.kt @@ -0,0 +1,12 @@ +package xyz.nuark.mcmod.fluxedpsi.item + +import net.neoforged.neoforge.registries.DeferredRegister +import xyz.nuark.mcmod.fluxedpsi.FluxedPsi + +object ModItems { + val ITEMS = DeferredRegister.createItems(FluxedPsi.ID) + + val FLUX_CONTAINER_T1 = ITEMS.registerItem("flux_container_t1") { props -> FluxContainer(props, 100_000) } + val FLUX_CONTAINER_T2 = ITEMS.registerItem("flux_container_t2") { props -> FluxContainer(props, 500_000) } + val FLUX_CONTAINER_T3 = ITEMS.registerItem("flux_container_t3") { props -> FluxContainer(props, 1_000_000) } +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/util/PsiCalculationsUtil.kt b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/util/PsiCalculationsUtil.kt new file mode 100644 index 0000000..e973e26 --- /dev/null +++ b/src/main/kotlin/xyz/nuark/mcmod/fluxedpsi/util/PsiCalculationsUtil.kt @@ -0,0 +1,25 @@ +package xyz.nuark.mcmod.fluxedpsi.util + +import net.minecraft.world.entity.player.Player +import top.theillusivec4.curios.api.CuriosApi +import xyz.nuark.mcmod.fluxedpsi.capability.ModCapabilities + +object PsiCalculationsUtil { + fun deductEnergyFromFluxContainer(player: Player, cost: Int): Int { + val curiosInv = CuriosApi.getCuriosInventory(player) + return when { + curiosInv.isPresent -> { + var deducted = 0 + val curioEquipInv = curiosInv.get().equippedCurios + for (i in 0 until curioEquipInv.slots) { + val item = curioEquipInv.getStackInSlot(i) + item.getCapability(ModCapabilities.ADDITIONAL_PSI_HANDLER_ITEM)?.let { + deducted += it.extractPsi(cost, false) + } + } + deducted + } + else -> 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/curios/lang/en_us.json b/src/main/resources/assets/curios/lang/en_us.json new file mode 100644 index 0000000..44b86e8 --- /dev/null +++ b/src/main/resources/assets/curios/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "curios.identifier.flux_container": "Flux container" +} \ No newline at end of file diff --git a/src/main/resources/assets/curios/lang/ru_ru.json b/src/main/resources/assets/curios/lang/ru_ru.json new file mode 100644 index 0000000..26f1857 --- /dev/null +++ b/src/main/resources/assets/curios/lang/ru_ru.json @@ -0,0 +1,3 @@ +{ + "curios.identifier.flux_container": "Контейнер потока" +} \ No newline at end of file diff --git a/src/main/resources/assets/fluxedpsi/textures/item/flux_container_curio.png b/src/main/resources/assets/fluxedpsi/textures/item/flux_container_curio.png new file mode 100644 index 0000000..ccfab0f Binary files /dev/null and b/src/main/resources/assets/fluxedpsi/textures/item/flux_container_curio.png differ diff --git a/src/main/resources/assets/fluxedpsi/textures/item/flux_container_t1.png b/src/main/resources/assets/fluxedpsi/textures/item/flux_container_t1.png new file mode 100644 index 0000000..a5610b7 Binary files /dev/null and b/src/main/resources/assets/fluxedpsi/textures/item/flux_container_t1.png differ diff --git a/src/main/resources/assets/fluxedpsi/textures/item/flux_container_t2.png b/src/main/resources/assets/fluxedpsi/textures/item/flux_container_t2.png new file mode 100644 index 0000000..25c2562 Binary files /dev/null and b/src/main/resources/assets/fluxedpsi/textures/item/flux_container_t2.png differ diff --git a/src/main/resources/assets/fluxedpsi/textures/item/flux_container_t3.png b/src/main/resources/assets/fluxedpsi/textures/item/flux_container_t3.png new file mode 100644 index 0000000..abf277d Binary files /dev/null and b/src/main/resources/assets/fluxedpsi/textures/item/flux_container_t3.png differ diff --git a/src/main/resources/data/curios/tags/item/flux_container.json b/src/main/resources/data/curios/tags/item/flux_container.json new file mode 100644 index 0000000..cc1d3b4 --- /dev/null +++ b/src/main/resources/data/curios/tags/item/flux_container.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#fluxedpsi:flux_container" + ] +} \ No newline at end of file diff --git a/src/main/resources/fluxedpsi.mixins.json b/src/main/resources/fluxedpsi.mixins.json new file mode 100644 index 0000000..ca9c94d --- /dev/null +++ b/src/main/resources/fluxedpsi.mixins.json @@ -0,0 +1,17 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "xyz.nuark.mcmod.fluxedpsi.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "PlayerDataMixin" + ], + "client": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} \ No newline at end of file diff --git a/src/main/templates/META-INF/neoforge.mods.toml b/src/main/templates/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..3c78a15 --- /dev/null +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -0,0 +1,93 @@ +# This is an example mods.toml file. It contains the data relating to the loading mods. +# There are several mandatory fields (#mandatory), and many more that are optional (#optional). +# The overall format is standard TOML format, v0.5.0. +# Note that there are a couple of TOML lists in this file. +# Find more information on toml format here: https://github.com/toml-lang/toml +# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml +modLoader = "kotlinforforge" #mandatory +# A version range to match for said mod loader - for regular FML @Mod it will be the the FML version. This is currently 47. +loaderVersion = "${loader_version_range}" #mandatory +# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties. +# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here. +license = "${mod_license}" +# A URL to refer people to when problems occur with this mod +#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional +# A list of mods - how many allowed here is determined by the individual mod loader +[[mods]] #mandatory +# The modid of the mod +modId = "${mod_id}" #mandatory +# The version number of the mod +version = "${mod_version}" #mandatory +# A display name for the mod +displayName = "${mod_name}" #mandatory +# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforge.net/docs/misc/updatechecker/ +#updateJSONURL="https://change.me.example.invalid/updates.json" #optional +# A URL for the "homepage" for this mod, displayed in the mod UI +#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional +# A file name (in the root of the mod JAR) containing a logo for display +#logoFile="fluxedpsi.png" #optional +# A text field displayed in the mod UI +#credits="" #optional +# A text field displayed in the mod UI +authors = "${mod_authors}" #optional + +# The description text for the mod (multi line!) (#mandatory) +description = '''${mod_description}''' + +# The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded. +[[mixins]] +config="${mod_id}.mixins.json" + +# The [[accessTransformers]] block allows you to declare where your AT file is. +# If this block is omitted, a fallback attempt will be made to load an AT from META-INF/accesstransformer.cfg +#[[accessTransformers]] +#file="META-INF/accesstransformer.cfg" + +# The coremods config file path is not configurable and is always loaded from META-INF/coremods.json + +# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. +[[dependencies."${mod_id}"]] #optional +# the modid of the dependency +modId = "neoforge" #mandatory +# The type of the dependency. Can be one of "required", "optional", "incompatible" or "discouraged" (case insensitive). +# 'required' requires the mod to exist, 'optional' does not +# 'incompatible' will prevent the game from loading when the mod exists, and 'discouraged' will show a warning +type = "required" #mandatory +# Optional field describing why the dependency is required or why it is incompatible +# reason="..." +# The version range of the dependency +versionRange = "${neo_version_range}" #mandatory +# An ordering relationship for the dependency. +# BEFORE - This mod is loaded BEFORE the dependency +# AFTER - This mod is loaded AFTER the dependency +ordering = "NONE" +# Side this dependency is applied on - BOTH, CLIENT, or SERVER +side = "BOTH" +# Here's another dependency +[[dependencies."${mod_id}"]] +modId = "minecraft" +type = "required" +# This version range declares a minimum of the current minecraft version up to but not including the next major version +versionRange = "${minecraft_version_range}" +ordering = "NONE" +side = "BOTH" + +[[dependencies."${mod_id}"]] +modId = "psi" +type = "required" +versionRange = "[1.21.1-107,)" +ordering = "NONE" +side = "BOTH" + +#[[dependencies."${mod_id}"]] +#modId = "psi_tweaks" +#type = "required" +#versionRange = "[1.0.1,)" +#ordering = "NONE" +#side = "BOTH" + +# Features are specific properties of the game environment, that you may want to declare you require. This example declares +# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't +# stop your mod loading on the server for example. +#[features."${mod_id}"] +#openGLVersion="[3.2,)"