commit fc5b65a53b5056058249387f4dd472c3b3dd459d Author: trunksbomb Date: Sun Mar 22 17:26:38 2026 -0400 initial commit diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..b7bbcc4 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/* text eol=lf +src/generated/**/*.json text eol=lf diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..b93c3c6 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,30 @@ +name: Build + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true + + - name: Setup JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v4 + + # This is needed to be able to run ./gradlew below + # You can run `git update-index --chmod +x gradlew` then remove this step. + - name: Make Gradle wrapper executable + run: chmod +x ./gradlew + + - name: Build with Gradle + run: ./gradlew build \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d18e332 --- /dev/null +++ b/.gitignore @@ -0,0 +1,41 @@ +### Gradle ### +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/**/build/ + +### IntelliJ IDEA ### +.idea/ +*.iws +*.iml +*.ipr +out/ +!**/src/**/out/ + +.run/ + +### Eclipse ### +.apt_generated +.classpath +.eclipse/ +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/**/bin/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store + +### Minecraft Modding ### +run/ +!**/src/**/run/ +**/src/generated/**/.cache/ +repo/ +!**/src/**/repo/ +/.gradle-user-home/ diff --git a/README.md b/README.md new file mode 100644 index 0000000..b421122 --- /dev/null +++ b/README.md @@ -0,0 +1,25 @@ + +Installation information +======= + +This template repository can be directly cloned to get you started with a new +mod. Simply create a new repository cloned from this one, by following the +instructions provided by [GitHub](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template). + +Once you have your clone, simply open the repository in the IDE of your choice. The usual recommendation for an IDE is either IntelliJ IDEA or Eclipse. + +If at any point you are missing libraries in your IDE, or you've run into problems you can +run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything +{this does not affect your code} and then start the process again. + +Mapping Names: +============ +By default, the MDK is configured to use the official mapping names from Mojang for methods and fields +in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this +license. For the latest license text, refer to the mapping file itself, or the reference copy here: +https://github.com/NeoForged/NeoForm/blob/main/Mojang.md + +Additional Resources: +========== +Community Documentation: https://docs.neoforged.net/ +NeoForged Discord: https://discord.neoforged.net/ diff --git a/TEMPLATE_LICENSE.txt b/TEMPLATE_LICENSE.txt new file mode 100644 index 0000000..b64bc64 --- /dev/null +++ b/TEMPLATE_LICENSE.txt @@ -0,0 +1,24 @@ +MIT License + +Copyright (c) 2023 NeoForged project + +This license applies to the template files as supplied by github.com/NeoForged/MDK + + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..c79a323 --- /dev/null +++ b/build.gradle @@ -0,0 +1,180 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'net.neoforged.moddev' version '2.0.140' + id 'idea' +} + +tasks.named('wrapper', Wrapper).configure { + // Define wrapper values here so as to not have to always do so when updating gradlew.properties. + // Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with + // documentation attached on cursor hover of gradle classes and methods. However, this comes with increased + // file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards. + // (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`) + distributionType = Wrapper.DistributionType.BIN +} + +version = mod_version +group = mod_group_id + +sourceSets.main.resources { + // Include resources generated by data generators. + srcDir('src/generated/resources') + + // Exclude common development only resources from finalized outputs + exclude("**/*.bbmodel") // BlockBench project files + exclude("src/generated/**/.cache") // datagen cache files +} + +repositories { + maven { + url = uri("https://cursemaven.com/") + content { + includeGroup "curse.maven" + } + } +} + +base { + archivesName = mod_id +} + +// Mojang ships Java 21 to end users in 1.21.1, so mods should target Java 21. +java.toolchain.languageVersion = JavaLanguageVersion.of(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 = project.files('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 + // multi mod projects should define one per mod + "${mod_id}" { + sourceSet(sourceSets.main) + } + } +} + +// Sets up a dependency configuration called 'localRuntime'. +// This configuration should be used instead of 'runtimeOnly' to declare +// a dependency that will be present for runtime testing but that is +// "optional", meaning it will not be pulled by dependents of this mod. +configurations { + runtimeClasspath.extendsFrom localRuntime +} + +dependencies { + // Dev-runtime helpers for the client. + compileOnly "curse.maven:jei-238222:7391682" + localRuntime "curse.maven:jade-324717:6155158" + localRuntime "curse.maven:jei-238222:7391682" +} + +// 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, + loader_version_range : loader_version_range, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + ] + 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" + } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + +// 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..c384d0d --- /dev/null +++ b/gradle.properties @@ -0,0 +1,39 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +org.gradle.jvmargs=-Xmx1G +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true + +#read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment +# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started +parchment_minecraft_version=1.21.1 +parchment_mappings_version=2024.11.17 +# 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] +# The Neo version must agree with the Minecraft version to get a valid artifact +neo_version=21.1.220 +# The loader version range can only use the major version of FML as bounds +loader_version_range=[1,) + +## 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=bagtabs +# The human-readable display name for the mod. +mod_name=Bag Tabs +# 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=com.trunksbomb.bagtabs diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 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..23449a2 --- /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-9.2.1-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..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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="\\\"\\\"" + + +# 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, 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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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..7a488e3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ +pluginManagement { + repositories { + gradlePluginPortal() + } +} + +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' +} diff --git a/src/main/java/com/trunksbomb/bagtabs/BagTabs.java b/src/main/java/com/trunksbomb/bagtabs/BagTabs.java new file mode 100644 index 0000000..c9697ae --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/BagTabs.java @@ -0,0 +1,75 @@ +package com.trunksbomb.bagtabs; + +import com.mojang.logging.LogUtils; +import com.trunksbomb.bagtabs.item.BagItem; +import com.trunksbomb.bagtabs.menu.BagMenu; +import com.trunksbomb.bagtabs.network.BagTabsNetwork; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.CreativeModeTabs; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.component.DyedItemColor; +import net.minecraft.world.item.component.ItemContainerContents; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredItem; +import net.neoforged.neoforge.registries.DeferredRegister; +import org.slf4j.Logger; +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.inventory.MenuType; +import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; + +@Mod(BagTabs.MODID) +public class BagTabs { + public static final String MODID = "bagtabs"; + public static final Logger LOGGER = LogUtils.getLogger(); + + public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MODID); + public static final DeferredRegister> MENUS = DeferredRegister.create(Registries.MENU, MODID); + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID); + + public static final DeferredItem BAG = ITEMS.register("bag", () -> new BagItem( + new Item.Properties() + .stacksTo(1) + .component(DataComponents.CONTAINER, ItemContainerContents.EMPTY) + .component(DataComponents.DYED_COLOR, new DyedItemColor(BagItem.DEFAULT_COLOR, true)) + )); + public static final DeferredHolder BAG_TAB = CREATIVE_MODE_TABS.register( + "main", + () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup." + MODID)) + .withTabsBefore(CreativeModeTabs.TOOLS_AND_UTILITIES) + .icon(() -> BAG.get().getDefaultInstance()) + .displayItems((parameters, output) -> BagItem.createCreativeStacks().forEach(output::accept)) + .build() + ); + + public static final DeferredHolder, MenuType> BAG_MENU = MENUS.register( + "bag", + () -> IMenuTypeExtension.create(BagMenu::fromNetwork) + ); + + public BagTabs(IEventBus modEventBus) { + ITEMS.register(modEventBus); + MENUS.register(modEventBus); + CREATIVE_MODE_TABS.register(modEventBus); + + modEventBus.addListener(this::registerPayloadHandlers); + } + + private void registerPayloadHandlers(RegisterPayloadHandlersEvent event) { + BagTabsNetwork.register(event.registrar("1")); + } + + public static Component translation(String path) { + return Component.translatable("bagtabs." + path); + } + + public static ResourceLocation id(String path) { + return ResourceLocation.fromNamespaceAndPath(MODID, path); + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/BagTabsClient.java b/src/main/java/com/trunksbomb/bagtabs/BagTabsClient.java new file mode 100644 index 0000000..2e8dc92 --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/BagTabsClient.java @@ -0,0 +1,48 @@ +package com.trunksbomb.bagtabs; + +import com.trunksbomb.bagtabs.client.BagScreen; +import com.trunksbomb.bagtabs.client.BagTabOverlay; +import net.neoforged.bus.api.IEventBus; +import net.minecraft.client.color.item.ItemColor; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.DyedItemColor; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.client.event.RegisterColorHandlersEvent; +import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; +import net.neoforged.neoforge.client.event.ScreenEvent; +import net.neoforged.neoforge.common.NeoForge; + +@Mod(value = BagTabs.MODID, dist = Dist.CLIENT) +public class BagTabsClient { + public BagTabsClient(IEventBus modEventBus) { + modEventBus.addListener(BagTabsClient::registerScreens); + modEventBus.addListener(BagTabsClient::registerItemColors); + NeoForge.EVENT_BUS.addListener(BagTabsClient::renderTabs); + NeoForge.EVENT_BUS.addListener(BagTabsClient::clickTabs); + } + + private static void registerScreens(RegisterMenuScreensEvent event) { + event.register(BagTabs.BAG_MENU.get(), BagScreen::new); + } + + private static void registerItemColors(RegisterColorHandlersEvent.Item event) { + ItemColor bagColor = (stack, tintIndex) -> tintIndex == 0 ? DyedItemColor.getOrDefault(stack, BagItemColor.DEFAULT_TINT) : -1; + event.register(bagColor, BagTabs.BAG.get()); + } + + private static void renderTabs(ScreenEvent.Render.Post event) { + BagTabOverlay.render(event); + } + + private static void clickTabs(ScreenEvent.MouseButtonPressed.Pre event) { + BagTabOverlay.mouseClicked(event); + } + + private static final class BagItemColor { + private static final int DEFAULT_TINT = 0x9E7B4F; + + private BagItemColor() { + } + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/bag/BagAccess.java b/src/main/java/com/trunksbomb/bagtabs/bag/BagAccess.java new file mode 100644 index 0000000..d17f751 --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/bag/BagAccess.java @@ -0,0 +1,26 @@ +package com.trunksbomb.bagtabs.bag; + +import java.util.ArrayList; +import java.util.List; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; + +public final class BagAccess { + private BagAccess() { + } + + public static List findBags(Player player) { + List bags = new ArrayList<>(); + Inventory inventory = player.getInventory(); + + for (int slot = 0; slot < inventory.getContainerSize(); slot++) { + ItemStack stack = inventory.getItem(slot); + if (stack.getItem() instanceof InventoryBag inventoryBag) { + bags.add(new BagEntry(slot, stack.copy(), inventoryBag)); + } + } + + return bags; + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/bag/BagContainer.java b/src/main/java/com/trunksbomb/bagtabs/bag/BagContainer.java new file mode 100644 index 0000000..5ea3aa7 --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/bag/BagContainer.java @@ -0,0 +1,58 @@ +package com.trunksbomb.bagtabs.bag; + +import com.trunksbomb.bagtabs.item.BagItem; +import net.minecraft.core.NonNullList; +import net.minecraft.core.component.DataComponents; +import net.minecraft.world.SimpleContainer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.ItemContainerContents; + +public class BagContainer extends SimpleContainer { + private final Player player; + private final int slot; + + public BagContainer(Player player, int slot) { + super(BagItem.SLOT_COUNT); + this.player = player; + this.slot = slot; + + ItemContainerContents contents = player.getInventory().getItem(slot).getOrDefault(DataComponents.CONTAINER, ItemContainerContents.EMPTY); + contents.copyInto(this.getItems()); + } + + @Override + public boolean canPlaceItem(int index, ItemStack stack) { + return !(stack.getItem() instanceof InventoryBag); + } + + @Override + public void setChanged() { + super.setChanged(); + ItemStack bagStack = this.player.getInventory().getItem(this.slot); + if (!bagStack.isEmpty() && bagStack.getItem() instanceof BagItem) { + bagStack.set(DataComponents.CONTAINER, ItemContainerContents.fromItems(this.copyItems())); + this.player.getInventory().setChanged(); + } + } + + @Override + public boolean stillValid(Player player) { + if (player != this.player) { + return false; + } + + ItemStack current = player.getInventory().getItem(this.slot); + return current.getItem() instanceof BagItem; + } + + private NonNullList copyItems() { + NonNullList items = NonNullList.withSize(this.getContainerSize(), ItemStack.EMPTY); + + for (int i = 0; i < this.getContainerSize(); i++) { + items.set(i, this.getItem(i).copy()); + } + + return items; + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/bag/BagEntry.java b/src/main/java/com/trunksbomb/bagtabs/bag/BagEntry.java new file mode 100644 index 0000000..198d541 --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/bag/BagEntry.java @@ -0,0 +1,6 @@ +package com.trunksbomb.bagtabs.bag; + +import net.minecraft.world.item.ItemStack; + +public record BagEntry(int slot, ItemStack stack, InventoryBag bag) { +} diff --git a/src/main/java/com/trunksbomb/bagtabs/bag/InventoryBag.java b/src/main/java/com/trunksbomb/bagtabs/bag/InventoryBag.java new file mode 100644 index 0000000..991b182 --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/bag/InventoryBag.java @@ -0,0 +1,7 @@ +package com.trunksbomb.bagtabs.bag; + +import net.minecraft.server.level.ServerPlayer; + +public interface InventoryBag { + void openFromInventory(ServerPlayer player, int slot); +} diff --git a/src/main/java/com/trunksbomb/bagtabs/client/BagScreen.java b/src/main/java/com/trunksbomb/bagtabs/client/BagScreen.java new file mode 100644 index 0000000..3dad2cf --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/client/BagScreen.java @@ -0,0 +1,32 @@ +package com.trunksbomb.bagtabs.client; + +import com.trunksbomb.bagtabs.menu.BagMenu; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.player.Inventory; + +public class BagScreen extends AbstractContainerScreen { + private static final ResourceLocation CONTAINER_BACKGROUND = ResourceLocation.withDefaultNamespace("textures/gui/container/generic_54.png"); + + public BagScreen(BagMenu menu, Inventory playerInventory, Component title) { + super(menu, playerInventory, title); + this.imageHeight = 168; + this.inventoryLabelY = this.imageHeight - 94; + } + + @Override + public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) { + super.render(guiGraphics, mouseX, mouseY, partialTick); + this.renderTooltip(guiGraphics, mouseX, mouseY); + } + + @Override + protected void renderBg(GuiGraphics guiGraphics, float partialTick, int mouseX, int mouseY) { + int left = this.leftPos; + int top = this.topPos; + guiGraphics.blit(CONTAINER_BACKGROUND, left, top, 0, 0, this.imageWidth, 71); + guiGraphics.blit(CONTAINER_BACKGROUND, left, top + 71, 0, 126, this.imageWidth, 96); + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/client/BagTabOverlay.java b/src/main/java/com/trunksbomb/bagtabs/client/BagTabOverlay.java new file mode 100644 index 0000000..32e1787 --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/client/BagTabOverlay.java @@ -0,0 +1,125 @@ +package com.trunksbomb.bagtabs.client; + +import com.trunksbomb.bagtabs.BagTabs; +import com.trunksbomb.bagtabs.bag.BagAccess; +import com.trunksbomb.bagtabs.bag.BagEntry; +import com.trunksbomb.bagtabs.item.BagItem; +import com.trunksbomb.bagtabs.network.OpenBagPayload; +import com.mojang.blaze3d.systems.RenderSystem; +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.client.gui.screens.inventory.InventoryScreen; +import net.minecraft.client.resources.sounds.SimpleSoundInstance; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.component.DyedItemColor; +import net.neoforged.neoforge.client.event.ScreenEvent; +import net.neoforged.neoforge.network.PacketDistributor; + +public final class BagTabOverlay { + private static final ResourceLocation TAB_BASE_TEXTURE = BagTabs.id("textures/gui/bag_tabs_base.png"); + private static final ResourceLocation TAB_OVERLAY_TEXTURE = BagTabs.id("textures/gui/bag_tabs_overlay.png"); + private static final int TAB_WIDTH = 22; + private static final int TAB_HEIGHT = 22; + private static final int TAB_GAP = 0; + private static final int TAB_Y_OFFSET = -3; + private static final int TAB_X_OFFSET = 7; + + private BagTabOverlay() { + } + + public static void render(ScreenEvent.Render.Post event) { + if (!(event.getScreen() instanceof InventoryScreen inventoryScreen)) { + return; + } + + Player player = Minecraft.getInstance().player; + if (player == null) { + return; + } + + List tabs = getRenderedTabs(inventoryScreen, player); + if (tabs.isEmpty()) { + return; + } + + GuiGraphics guiGraphics = event.getGuiGraphics(); + int mouseX = event.getMouseX(); + int mouseY = event.getMouseY(); + + for (RenderedTab tab : tabs) { + renderTab(guiGraphics, tab, mouseX, mouseY); + guiGraphics.renderItem(tab.entry().stack(), tab.x() + 3, tab.y() + 3); + } + + for (RenderedTab tab : tabs) { + if (tab.isHovered(mouseX, mouseY)) { + guiGraphics.renderTooltip(Minecraft.getInstance().font, tab.entry().stack().getHoverName(), mouseX, mouseY); + break; + } + } + } + + public static void mouseClicked(ScreenEvent.MouseButtonPressed.Pre event) { + if (!(event.getScreen() instanceof InventoryScreen inventoryScreen) || event.getButton() != 0) { + return; + } + + Player player = Minecraft.getInstance().player; + if (player == null) { + return; + } + + for (RenderedTab tab : getRenderedTabs(inventoryScreen, player)) { + if (tab.isHovered(event.getMouseX(), event.getMouseY())) { + PacketDistributor.sendToServer(new OpenBagPayload(tab.entry().slot())); + Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + event.setCanceled(true); + return; + } + } + } + + private static List getRenderedTabs(AbstractContainerScreen screen, Player player) { + List bags = BagAccess.findBags(player); + List renderedTabs = new ArrayList<>(); + int x = screen.getGuiLeft() + TAB_X_OFFSET; + int y = screen.getGuiTop() + screen.getYSize() + TAB_Y_OFFSET; + int maxX = screen.getGuiLeft() + screen.getXSize() - TAB_WIDTH; + + for (BagEntry bag : bags) { + if (x > maxX) { + break; + } + + renderedTabs.add(new RenderedTab(bag, x, y)); + x += TAB_WIDTH + TAB_GAP; + } + + return renderedTabs; + } + + private static void renderTab(GuiGraphics guiGraphics, RenderedTab tab, int mouseX, int mouseY) { + boolean hovered = tab.isHovered(mouseX, mouseY); + int color = DyedItemColor.getOrDefault(tab.entry().stack(), BagItem.DEFAULT_COLOR); + float red = ((color >> 16) & 0xFF) / 255.0F; + float green = ((color >> 8) & 0xFF) / 255.0F; + float blue = (color & 0xFF) / 255.0F; + int uOffset = hovered ? TAB_WIDTH : 0; + + RenderSystem.setShaderColor(red, green, blue, 1.0F); + guiGraphics.blit(TAB_BASE_TEXTURE, tab.x(), tab.y(), uOffset, 0, TAB_WIDTH, TAB_HEIGHT, TAB_WIDTH * 2, TAB_HEIGHT); + RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); + guiGraphics.blit(TAB_OVERLAY_TEXTURE, tab.x(), tab.y(), uOffset, 0, TAB_WIDTH, TAB_HEIGHT, TAB_WIDTH * 2, TAB_HEIGHT); + } + + private record RenderedTab(BagEntry entry, int x, int y) { + private boolean isHovered(double mouseX, double mouseY) { + return mouseX >= this.x && mouseX < this.x + TAB_WIDTH && mouseY >= this.y && mouseY < this.y + TAB_HEIGHT; + } + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/compat/jei/BagTabsJeiPlugin.java b/src/main/java/com/trunksbomb/bagtabs/compat/jei/BagTabsJeiPlugin.java new file mode 100644 index 0000000..239e2d4 --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/compat/jei/BagTabsJeiPlugin.java @@ -0,0 +1,42 @@ +package com.trunksbomb.bagtabs.compat.jei; + +import com.trunksbomb.bagtabs.BagTabs; +import com.trunksbomb.bagtabs.item.BagItem; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.JeiPlugin; +import mezz.jei.api.constants.VanillaTypes; +import mezz.jei.api.ingredients.subtypes.IIngredientSubtypeInterpreter; +import mezz.jei.api.ingredients.subtypes.UidContext; +import mezz.jei.api.registration.IExtraIngredientRegistration; +import mezz.jei.api.registration.ISubtypeRegistration; +import net.minecraft.core.component.DataComponents; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.component.DyedItemColor; + +@JeiPlugin +public class BagTabsJeiPlugin implements IModPlugin { + private static final ResourceLocation PLUGIN_UID = BagTabs.id("jei_plugin"); + + @Override + public ResourceLocation getPluginUid() { + return PLUGIN_UID; + } + + @Override + public void registerItemSubtypes(ISubtypeRegistration registration) { + registration.registerSubtypeInterpreter(BagTabs.BAG.get(), (stack, context) -> { + if (context == UidContext.Ingredient) { + DyedItemColor color = stack.get(DataComponents.DYED_COLOR); + if (color != null) { + return Integer.toHexString(color.rgb()); + } + } + return IIngredientSubtypeInterpreter.NONE; + }); + } + + @Override + public void registerExtraIngredients(IExtraIngredientRegistration registration) { + registration.addExtraIngredients(VanillaTypes.ITEM_STACK, BagItem.createCreativeStacks()); + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/item/BagItem.java b/src/main/java/com/trunksbomb/bagtabs/item/BagItem.java new file mode 100644 index 0000000..f9b280e --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/item/BagItem.java @@ -0,0 +1,86 @@ +package com.trunksbomb.bagtabs.item; + +import com.trunksbomb.bagtabs.BagTabs; +import com.trunksbomb.bagtabs.bag.BagContainer; +import com.trunksbomb.bagtabs.bag.InventoryBag; +import com.trunksbomb.bagtabs.menu.BagMenu; +import java.util.ArrayList; +import java.util.List; +import java.util.OptionalInt; +import net.minecraft.core.component.DataComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.SimpleMenuProvider; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.DyedItemColor; +import net.minecraft.world.level.Level; + +public class BagItem extends Item implements InventoryBag { + public static final int SLOT_COUNT = 27; + public static final int DEFAULT_COLOR = 0x9E7B4F; + + public BagItem(Properties properties) { + super(properties); + } + + public static List createCreativeStacks() { + List stacks = new ArrayList<>(); + stacks.add(createColoredStack(DEFAULT_COLOR)); + + for (DyeColor dyeColor : DyeColor.values()) { + stacks.add(createColoredStack(dyeColor.getTextureDiffuseColor() & 0xFFFFFF)); + } + + return stacks; + } + + public static ItemStack createColoredStack(int color) { + ItemStack stack = BagTabs.BAG.get().getDefaultInstance(); + stack.set(DataComponents.DYED_COLOR, new DyedItemColor(color, true)); + return stack; + } + + @Override + public InteractionResultHolder use(Level level, Player player, InteractionHand usedHand) { + ItemStack stack = player.getItemInHand(usedHand); + if (!level.isClientSide && player instanceof ServerPlayer serverPlayer) { + this.openFromInventory(serverPlayer, usedHand == InteractionHand.MAIN_HAND ? serverPlayer.getInventory().selected : Inventory.SLOT_OFFHAND); + } + + return InteractionResultHolder.sidedSuccess(stack, level.isClientSide); + } + + @Override + public void openFromInventory(ServerPlayer player, int slot) { + ItemStack stack = player.getInventory().getItem(slot); + if (!(stack.getItem() instanceof BagItem)) { + return; + } + + Component title = stack.getHoverName(); + OptionalInt windowId = player.openMenu( + new SimpleMenuProvider((containerId, playerInventory, ignoredPlayer) -> new BagMenu( + containerId, + playerInventory, + new BagContainer(player, slot), + slot + ), title), + buf -> buf.writeVarInt(slot) + ); + + if (windowId.isEmpty()) { + return; + } + } + + @Override + public boolean canFitInsideContainerItems() { + return false; + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/menu/BagMenu.java b/src/main/java/com/trunksbomb/bagtabs/menu/BagMenu.java new file mode 100644 index 0000000..330da9b --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/menu/BagMenu.java @@ -0,0 +1,102 @@ +package com.trunksbomb.bagtabs.menu; + +import com.trunksbomb.bagtabs.BagTabs; +import com.trunksbomb.bagtabs.bag.BagContainer; +import com.trunksbomb.bagtabs.bag.InventoryBag; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.world.Container; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; + +public class BagMenu extends AbstractContainerMenu { + private static final int BAG_ROWS = 3; + private static final int BAG_COLUMNS = 9; + private static final int BAG_SLOT_COUNT = BAG_ROWS * BAG_COLUMNS; + private static final int BAG_SLOT_START_Y = 18; + private static final int PLAYER_INV_START_Y = 85; + private static final int HOTBAR_Y = 143; + private final Container container; + private final int bagSlot; + + public static BagMenu fromNetwork(int containerId, Inventory playerInventory, RegistryFriendlyByteBuf extraData) { + int slot = extraData.readVarInt(); + return new BagMenu(containerId, playerInventory, new BagContainer(playerInventory.player, slot), slot); + } + + public BagMenu(int containerId, Inventory playerInventory, Container container, int bagSlot) { + super(BagTabs.BAG_MENU.get(), containerId); + checkContainerSize(container, BAG_SLOT_COUNT); + this.container = container; + this.bagSlot = bagSlot; + container.startOpen(playerInventory.player); + + for (int row = 0; row < BAG_ROWS; row++) { + for (int column = 0; column < BAG_COLUMNS; column++) { + int slotIndex = column + row * BAG_COLUMNS; + this.addSlot(new Slot(container, slotIndex, 8 + column * 18, BAG_SLOT_START_Y + row * 18) { + @Override + public boolean mayPlace(ItemStack stack) { + return container.canPlaceItem(this.getSlotIndex(), stack) && !(stack.getItem() instanceof InventoryBag); + } + }); + } + } + + for (int row = 0; row < 3; row++) { + for (int column = 0; column < 9; column++) { + int slotIndex = column + row * 9 + 9; + this.addSlot(new Slot(playerInventory, slotIndex, 8 + column * 18, PLAYER_INV_START_Y + row * 18)); + } + } + + for (int column = 0; column < 9; column++) { + this.addSlot(new Slot(playerInventory, column, 8 + column * 18, HOTBAR_Y)); + } + } + + public int getBagSlot() { + return this.bagSlot; + } + + @Override + public boolean stillValid(Player player) { + return this.container.stillValid(player); + } + + @Override + public ItemStack quickMoveStack(Player player, int index) { + ItemStack copied = ItemStack.EMPTY; + Slot slot = this.slots.get(index); + if (slot == null || !slot.hasItem()) { + return ItemStack.EMPTY; + } + + ItemStack stack = slot.getItem(); + copied = stack.copy(); + + if (index < BAG_SLOT_COUNT) { + if (!this.moveItemStackTo(stack, BAG_SLOT_COUNT, this.slots.size(), true)) { + return ItemStack.EMPTY; + } + } else if (!this.moveItemStackTo(stack, 0, BAG_SLOT_COUNT, false)) { + return ItemStack.EMPTY; + } + + if (stack.isEmpty()) { + slot.setByPlayer(ItemStack.EMPTY); + } else { + slot.setChanged(); + } + + return copied; + } + + @Override + public void removed(Player player) { + super.removed(player); + this.container.stopOpen(player); + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/network/BagTabsNetwork.java b/src/main/java/com/trunksbomb/bagtabs/network/BagTabsNetwork.java new file mode 100644 index 0000000..58251e4 --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/network/BagTabsNetwork.java @@ -0,0 +1,12 @@ +package com.trunksbomb.bagtabs.network; + +import net.neoforged.neoforge.network.registration.PayloadRegistrar; + +public final class BagTabsNetwork { + private BagTabsNetwork() { + } + + public static void register(PayloadRegistrar registrar) { + registrar.playToServer(OpenBagPayload.TYPE, OpenBagPayload.STREAM_CODEC, OpenBagPayload::handle); + } +} diff --git a/src/main/java/com/trunksbomb/bagtabs/network/OpenBagPayload.java b/src/main/java/com/trunksbomb/bagtabs/network/OpenBagPayload.java new file mode 100644 index 0000000..6920c87 --- /dev/null +++ b/src/main/java/com/trunksbomb/bagtabs/network/OpenBagPayload.java @@ -0,0 +1,40 @@ +package com.trunksbomb.bagtabs.network; + +import com.trunksbomb.bagtabs.BagTabs; +import com.trunksbomb.bagtabs.bag.InventoryBag; +import net.minecraft.network.RegistryFriendlyByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.network.handling.IPayloadContext; + +public record OpenBagPayload(int slot) implements CustomPacketPayload { + public static final Type TYPE = new Type<>(BagTabs.id("open_bag")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.VAR_INT, + OpenBagPayload::slot, + OpenBagPayload::new + ); + + @Override + public Type type() { + return TYPE; + } + + public static void handle(OpenBagPayload payload, IPayloadContext context) { + if (!(context.player() instanceof ServerPlayer serverPlayer)) { + return; + } + + if (payload.slot() < 0 || payload.slot() >= serverPlayer.getInventory().getContainerSize()) { + return; + } + + ItemStack stack = serverPlayer.getInventory().getItem(payload.slot()); + if (stack.getItem() instanceof InventoryBag inventoryBag) { + inventoryBag.openFromInventory(serverPlayer, payload.slot()); + } + } +} diff --git a/src/main/resources/assets/bagtabs/lang/en_us.json b/src/main/resources/assets/bagtabs/lang/en_us.json new file mode 100644 index 0000000..648c34b --- /dev/null +++ b/src/main/resources/assets/bagtabs/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "item.bagtabs.bag": "Traveler's Bag", + "itemGroup.bagtabs": "Bag Tabs", + "container.bagtabs.bag": "Bag", + "bagtabs.tooltip.click_to_open": "Open from your inventory tabs" +} diff --git a/src/main/resources/assets/bagtabs/models/item/bag.json b/src/main/resources/assets/bagtabs/models/item/bag.json new file mode 100644 index 0000000..6ac3d82 --- /dev/null +++ b/src/main/resources/assets/bagtabs/models/item/bag.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "bagtabs:item/bag", + "layer1": "bagtabs:item/bag_overlay" + } +} diff --git a/src/main/resources/assets/bagtabs/textures/gui/bag_tabs_base.png b/src/main/resources/assets/bagtabs/textures/gui/bag_tabs_base.png new file mode 100644 index 0000000..68d02de Binary files /dev/null and b/src/main/resources/assets/bagtabs/textures/gui/bag_tabs_base.png differ diff --git a/src/main/resources/assets/bagtabs/textures/gui/bag_tabs_overlay.png b/src/main/resources/assets/bagtabs/textures/gui/bag_tabs_overlay.png new file mode 100644 index 0000000..d71787b Binary files /dev/null and b/src/main/resources/assets/bagtabs/textures/gui/bag_tabs_overlay.png differ diff --git a/src/main/resources/assets/bagtabs/textures/item/bag.png b/src/main/resources/assets/bagtabs/textures/item/bag.png new file mode 100644 index 0000000..db91d21 Binary files /dev/null and b/src/main/resources/assets/bagtabs/textures/item/bag.png differ diff --git a/src/main/resources/assets/bagtabs/textures/item/bag_overlay.png b/src/main/resources/assets/bagtabs/textures/item/bag_overlay.png new file mode 100644 index 0000000..f96d881 Binary files /dev/null and b/src/main/resources/assets/bagtabs/textures/item/bag_overlay.png differ diff --git a/src/main/resources/data/bagtabs/recipes/bag.json b/src/main/resources/data/bagtabs/recipes/bag.json new file mode 100644 index 0000000..c1ac260 --- /dev/null +++ b/src/main/resources/data/bagtabs/recipes/bag.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "LLL", + "LCL", + "LLL" + ], + "key": { + "L": { + "item": "minecraft:leather" + }, + "C": { + "item": "minecraft:chest" + } + }, + "result": { + "id": "bagtabs:bag" + } +} diff --git a/src/main/resources/data/minecraft/tags/item/dyeable.json b/src/main/resources/data/minecraft/tags/item/dyeable.json new file mode 100644 index 0000000..27221bb --- /dev/null +++ b/src/main/resources/data/minecraft/tags/item/dyeable.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "bagtabs:bag" + ] +} 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..7922f4b --- /dev/null +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -0,0 +1,95 @@ +# This is an example neoforge.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="javafml" #mandatory + +# A version range to match for said mod loader - for regular FML @Mod it will be the FML version. This is currently 2. +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.neoforged.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="examplemod.png" #optional + +# A text field displayed in the mod UI +#credits="" #optional + +# The authors of the mod, displayed in the mod UI (optional) +authors="trunksbomb" + +# The description text for the mod (multi line!) (#mandatory) +description=''' +Tabs in the player inventory for all the bags and backpacks you're holding. +''' + +# 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},)" #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" + +# 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,)"