From 3e1614412076ee5ca3d8fa06399d96b518e7e3a7 Mon Sep 17 00:00:00 2001 From: P3pp3rF1y Date: Mon, 23 Dec 2024 10:05:59 +0100 Subject: [PATCH] Initial version --- .gitignore | 33 ++ build.gradle | 385 ++++++++++++++++ gradle.properties | 39 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 164 +++++++ gradlew.bat | 90 ++++ settings.gradle | 11 + .../SophisticatedStorageInMotion.java | 37 ++ .../client/ClientEventHandler.java | 16 + .../client/StorageMinecartItemRenderer.java | 57 +++ .../client/StorageMinecartRenderer.java | 141 ++++++ .../client/gui/BackToMovingStorageTab.java | 26 ++ .../client/gui/MovingLimitedBarrelScreen.java | 46 ++ .../MovingLimitedBarrelSettingsScreen.java | 42 ++ .../client/gui/MovingStorageScreen.java | 22 + .../gui/MovingStorageSettingsScreen.java | 33 ++ .../gui/MovingStorageSettingsTabControl.java | 17 + .../client/gui/package-info.java | 8 + .../client/package-info.java | 8 + .../gui/MovingLimitedBarrelContainerMenu.java | 28 ++ ...ingLimitedBarrelSettingsContainerMenu.java | 16 + .../gui/MovingStorageContainerMenu.java | 169 +++++++ .../MovingStorageSettingsContainerMenu.java | 88 ++++ .../common/gui/package-info.java | 8 + .../data/MovingStorageData.java | 97 ++++ .../data/package-info.java | 8 + .../entity/EntityStorageHolder.java | 270 +++++++++++ .../entity/IMovingStorageEntity.java | 16 + .../entity/MovingStorageWrapper.java | 436 ++++++++++++++++++ .../entity/StorageMinecart.java | 131 ++++++ .../entity/package-info.java | 8 + .../init/ModDataComponents.java | 35 ++ .../init/ModEntities.java | 45 ++ .../init/ModEntitiesClient.java | 28 ++ .../init/ModItems.java | 43 ++ .../init/ModPayloads.java | 18 + .../init/package-info.java | 8 + .../item/StorageMinecartItem.java | 86 ++++ .../item/package-info.java | 8 + .../network/MovingStorageContentsPayload.java | 32 ++ .../OpenMovingStorageInventoryPayload.java | 30 ++ .../network/package-info.java | 8 + .../package-info.java | 8 + .../resources/META-INF/accesstransformer.cfg | 0 .../lang/en_us.json | 5 + .../models/item/storage_minecart.json | 35 ++ .../templates/META-INF/neoforge.mods.toml | 46 ++ 48 files changed, 2892 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/SophisticatedStorageInMotion.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/ClientEventHandler.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/StorageMinecartItemRenderer.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/StorageMinecartRenderer.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/BackToMovingStorageTab.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingLimitedBarrelScreen.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingLimitedBarrelSettingsScreen.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageScreen.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageSettingsScreen.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageSettingsTabControl.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/package-info.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/package-info.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingLimitedBarrelContainerMenu.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingLimitedBarrelSettingsContainerMenu.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingStorageContainerMenu.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingStorageSettingsContainerMenu.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/package-info.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/data/MovingStorageData.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/data/package-info.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/EntityStorageHolder.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/IMovingStorageEntity.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/MovingStorageWrapper.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/StorageMinecart.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/package-info.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModDataComponents.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModEntities.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModEntitiesClient.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModItems.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModPayloads.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/package-info.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/StorageMinecartItem.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/package-info.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/MovingStorageContentsPayload.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/OpenMovingStorageInventoryPayload.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/package-info.java create mode 100644 src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/package-info.java create mode 100644 src/main/resources/META-INF/accesstransformer.cfg create mode 100644 src/main/resources/assets/sophisticatedstorageinmotion/lang/en_us.json create mode 100644 src/main/resources/assets/sophisticatedstorageinmotion/models/item/storage_minecart.json create mode 100644 src/main/templates/META-INF/neoforge.mods.toml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cf5ec74 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +# exclude all +/* + +# include important folders +# need gradle +!gradle/ +!bintray/ +!gradlew +!gradlew.bat +!build.gradle +!build.properties +!gradle.properties +!settings.gradle +!.github/ + +# include markdowns +!README.md +!LICENSE +!COPYING.txt + +# include sourcecode +!src/ +src/generated/resources/.cache + +# include git important files +!.gitmodules +!.gitignore + +# code format to reduce noise in git commits +!codeformat/ + +# include web files +!web/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..397eb44 --- /dev/null +++ b/build.gradle @@ -0,0 +1,385 @@ +plugins { + id 'java-library' + id 'idea' + id 'maven-publish' + id 'net.neoforged.moddev' version '1.0.14' + id "org.sonarqube" version "5.0.0.4638" + id "net.darkhax.curseforgegradle" version "1.1.15" + id "com.modrinth.minotaur" version "2.+" +} + +idea { + module { + downloadJavadoc = true + downloadSources = true + } +} + +version = "${project.minecraft_version}-${project.mod_version}.${getBuildNumber()}${getStable()}" +group = mod_group_id + +repositories { + mavenCentral() + maven { url "https://maven.tterrag.com/" } + maven { url = "https://modmaven.dev/" } + maven { url "https://minecraft.curseforge.com/api/maven/"} + maven { + url "https://www.cursemaven.com" + content { + includeGroup "curse.maven" + } + } + maven { url "https://maven.blamejared.com/" } + maven { + name = "GHPCore" + url = uri("https://maven.pkg.github.com/p3pp3rf1y/sophisticatedcore") + credentials { + username = System.getenv("USERNAME") + password = System.getenv("READ_PACKAGES_TOKEN") + } + content { + includeGroupByRegex "sophisticatedcore.*" + } + } + maven { + name = "GHPStorage" + url = uri("https://maven.pkg.github.com/p3pp3rf1y/sophisticatedstorage") + credentials { + username = System.getenv("USERNAME") + password = System.getenv("READ_PACKAGES_TOKEN") + } + content { + includeGroupByRegex "sophisticatedstorage.*" + } + } + maven { + url = "https://maven.octo-studios.com/#/releases" + content { + includeGroup 'top.theillusivec4.curios' + } + } +} + +base { + archivesName = mod_id +} + +java.toolchain.languageVersion = JavaLanguageVersion.of(21) + +neoForge { + version = project.neo_version + + parchment { + mappingsVersion = project.parchment_mappings_version + minecraftVersion = project.parchment_minecraft_version + } + + accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg') + + runs { + configureEach { + systemProperty 'forge.logging.markers', 'REGISTRIES' + systemProperty 'forge.logging.console.level', 'debug' + systemProperty 'mixin.env.disableRefMap', 'true' + } + + client { + client() + } + + client2 { + client() + + programArguments.addAll '--username', 'Dev2' + } + + server { + server() + programArgument '--nogui' + } + + data { + data() + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } + } + + mods { + "${mod_id}" { + sourceSet(sourceSets.main) + } + if (findProject(':SophisticatedCore') != null) { + "sophisticatedcore" { + sourceSet(project(':SophisticatedCore').sourceSets.main) + } + } + if (findProject(':SophisticatedStorage') != null) { + "sophisticatedcore" { + sourceSet(project(':SophisticatedStorage').sourceSets.main) + } + } + } + + unitTest { + enable() + testedMod = mods."${mod_id}" + } +} + +sourceSets.main.resources { + srcDir 'src/generated/resources' +} + +configurations { + runtimeClasspath.extendsFrom localRuntime +} + +dependencies { + compileOnly "mezz.jei:jei-${jei_mc_version}-api:${jei_version}" + localRuntime "mezz.jei:jei-${jei_mc_version}:${jei_version}" + + if (findProject(':SophisticatedCore') != null) { + dependencies.implementation project(':SophisticatedCore') + } else { + dependencies.implementation("sophisticatedcore:sophisticatedcore:${sc_version}") { + transitive = false + } + dependencies.testImplementation("sophisticatedcore:sophisticatedcore:${sc_version}") { + transitive = false + } + } + if (findProject(':SophisticatedStorage') != null) { + dependencies.implementation project(':SophisticatedStorage') + } else { + dependencies.implementation("sophisticatedstorage:sophisticatedstorage:${ss_version}") { + transitive = false + } + dependencies.testImplementation("sophisticatedstorage:sophisticatedstorage:${ss_version}") { + transitive = false + } + } +} + +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_issue_tracker_url: mod_issue_tracker_url, mod_logo_file: mod_logo_file, mod_credits: mod_credits, + mod_authors : mod_authors, mod_description: mod_description, mod_display_url: mod_display_url, + mod_full_version : "${project.mod_version}.${getBuildNumber()}${getStable()}", + jei_version_range : jei_version_range, + ss_version :"[" + ss_version.substring(ss_version.indexOf("-") + 1, ss_version.lastIndexOf(',')) + ",)" + ] + 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 + +test { + useJUnitPlatform() + testLogging { + events "passed", "skipped", "failed" + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' +} + +jar { + manifest { + attributes(["Specification-Title" : project.mod_id, + "Specification-Vendor" : project.mod_id, + "Specification-Version" : "1", + "Implementation-Title" : project.name, + "Implementation-Version" : "${version}", + "Implementation-Vendor" : project.mod_id, + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],) + } +} + + +static def getBuildNumber() { + if (System.getenv("GITHUB_RUN_NUMBER") != null) { + return System.getenv("GITHUB_RUN_NUMBER").toString() + } + return "" +} + +static def getStable() { + if (System.getenv("GITHUB_REF") == null || System.getenv("GITHUB_REF").endsWith("-dev")) { + return "-SNAPSHOT" + } + return "" +} + +publishing { + repositories { + maven { + name = "GitHubPackages" + url = uri("${github_package_url}") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } + publications { + gpr(MavenPublication) { + artifactId = mod_id + from(components.java) + } + } +} + +sonarqube { + properties { + property "sonar.projectName", "${mod_id}" + property "sonar.projectKey", "${sonar_project_key}" + } +} + +task generateChangelog { + doLast { + def changelog = new StringBuilder() + + // Function to remove characters with Unicode code points 129 or higher + def removeHighUnicodeChars = { text -> + text.codePoints() + .filter { codePoint -> codePoint <= 0x007F } // Keep only ASCII characters (U+0000 to U+007F) + .collect { codePoint -> new String(Character.toChars(codePoint)) } + .join('') + } + + // Function to format commit messages with nesting + def formatMultilineMessage = { message -> + // Split message by lines, trim whitespace, and create formatted list + def lines = message.split('\n') + def formattedMessage = lines[0].trim() // First line as top-level list item + if (lines.size() > 1) { + formattedMessage += "\n" + lines[1..-1].collect { line -> + // Trim the line and remove leading dash if present + def trimmedLine = line.trim() + if (trimmedLine.startsWith('-')) { + trimmedLine = trimmedLine.substring(1).trim() + } + " - ${trimmedLine}" // Nested list for additional lines + }.join('\n') + } + return formattedMessage + } + + // Function to remove [DEV] section from commit message + def removeDevSection = { message -> + def devIndex = message.indexOf('[DEV]') + if (devIndex != -1) { + return message.substring(0, devIndex).trim() + } + return message + } + + // Get the latest commit hash + def latestCommitHash = "git rev-parse HEAD".execute().text.trim() + + // Check if the latest commit is a merge commit + def parentCommits = "git rev-list --parents -n 1 ${latestCommitHash}".execute().text.split() + logger.info("Parent commits: ${parentCommits}") + + def commitMessages = [] + if (parentCommits.size() > 2) { // Merge commit has more than 2 parents + def firstParent = parentCommits[1] + def secondParent = parentCommits[2] + def gitLogCommand = [ + "bash", "-c", "git log --pretty=format:%B ${firstParent}..${secondParent}" + ] + commitMessages = gitLogCommand.execute().text.split('\n\n') // Split by two newlines for each commit + logger.info("Merge commit, ran git log command: ${gitLogCommand.join(' ')} and got ${commitMessages}") + } else { + // Single commit log + commitMessages = "git log -1 --pretty=%B".execute().text.split('\n\n') + // Split by two newlines for each commit + logger.info("Single commit, ran git log command: git log -1 --pretty=%B and got ${commitMessages}"); + } + + def features = [] + def fixes = [] + commitMessages.each { commitMessage -> + commitMessage = removeHighUnicodeChars(commitMessage) // Remove high Unicode characters + commitMessage = removeDevSection(commitMessage) // Remove [DEV] section + + if (commitMessage.startsWith('feat: ')) { + features.add(commitMessage.replaceFirst('feat: ', '').trim()) + } else if (commitMessage.startsWith('fix: ')) { + fixes.add(commitMessage.replaceFirst('fix: ', '').trim()) + } + } + + if (features) { + changelog.append("### Features\n") + features.each { feature -> changelog.append("- ${formatMultilineMessage(feature)}\n") } + } + + if (fixes) { + changelog.append("### Fixes\n") + fixes.each { fix -> changelog.append("- ${formatMultilineMessage(fix)}\n") } + } + + // Store the changelog in a project property or an environment variable + logger.info("Compiled changelog: " + changelog.toString()) + project.ext.changelog = changelog.toString() + } + project.ext.changelog = "" +} + +task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { + dependsOn 'generateChangelog' + + apiToken = System.getenv("CURSEFORGE_TOKEN") + def mainFile = upload(project.curseforge_id, file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) + mainFile.changelogType = 'markdown' + mainFile.changelog = {project.ext.changelog} + mainFile.addModLoader('NeoForge') + mainFile.releaseType = "${release_type}" + "${release_versions}".split(',').each { + mainFile.addGameVersion("${it}") + } + mainFile.addRequirement('sophisticated-core') + mainFile.addOptional('jei') + mainFile.addOptional('crafting-tweaks') + onlyIf { !project.ext.changelog.isEmpty() } +} + +modrinth { + token = System.getenv("MODRINTH_TOKEN") + projectId = "${modrinth_project_id}" + versionType = "${release_type}" + uploadFile = jar + gameVersions = "${release_versions}".split(',').collect {e -> e} + loaders = ["neoforge"] + dependencies { + required.project "sophisticated-core" + optional.project "jei" + optional.project "crafting-tweaks" + } + changelog = provider { + project.ext.changelog + } +} +tasks.modrinth { + dependsOn(tasks.generateChangelog) + onlyIf { !project.ext.changelog.isEmpty() } +} + +task printVersionName { + println "version:" + project.version +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..d32bbce --- /dev/null +++ b/gradle.properties @@ -0,0 +1,39 @@ +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false +org.gradle.debug=false + +parchment_minecraft_version=1.21 +parchment_mappings_version=2024.11.10 +minecraft_version=1.21.1 +minecraft_version_range=[1.21.1,1.21.2) +neo_version=21.1.80 +neo_version_range=[21.1.0,) +loader_version_range=[4,) + +mod_id=sophisticatedstorageinmotion +mod_name=Sophisticated Storage In Motion +mod_license=GNU General Public License v3.0 +mod_version=0.0.1 +mod_group_id=sophisticatedstorageinmotion +mod_authors=P3pp3rF1y +mod_description=Sophisticated Storage on moving entities. +mod_credits=Created by P3pp3rF1y. +mod_logo_file=logo.png +mod_display_url=https://www.curseforge.com/minecraft/mc-mods/sophisticated-storage-in-motion +mod_issue_tracker_url=https://github.com/P3pp3rF1y/SophisticatedStorageInMotion/issues +sonar_project_key=sophisticatedstorageinmotion:SophisticatedStorageInMotion +github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedStorageInMotion + +jei_mc_version=1.21.1-neoforge +jei_version=19.12.0.131 +# first JEI version with Object UID support +jei_version_range=[19.9.0,) +ss_version=[1.21.1-1.0.1,1.22) + +#publish +#TODO add curseforge_id +curseforge_id=0 +release_type=release +release_versions=1.21.1 +#TODO add modrinth_project_id +modrinth_project_id=n/a \ 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 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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 + +@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= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +: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 %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/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/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/SophisticatedStorageInMotion.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/SophisticatedStorageInMotion.java new file mode 100644 index 0000000..89fb2ec --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/SophisticatedStorageInMotion.java @@ -0,0 +1,37 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion; + +import net.minecraft.resources.ResourceLocation; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.common.Mod; +import net.p3pp3rf1y.sophisticatedstorageinmotion.client.ClientEventHandler; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.*; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +@Mod(SophisticatedStorageInMotion.MOD_ID) +public class SophisticatedStorageInMotion { + public static final String MOD_ID = "sophisticatedstorageinmotion"; + public static final Logger LOGGER = LogManager.getLogger(MOD_ID); + + @SuppressWarnings("java:S1118") //needs to be public for mod to work + public SophisticatedStorageInMotion(IEventBus modBus, Dist dist, ModContainer container) { + ModItems.registerHandlers(modBus); + ModEntities.registerHandlers(modBus); + ModDataComponents.register(modBus); + if (dist == Dist.CLIENT) { + ClientEventHandler.registerHandlers(modBus); + ModEntitiesClient.registerHandlers(modBus); //TODO move this to client event handler + } + modBus.addListener(ModPayloads::registerPayloads); + } + + public static ResourceLocation getRL(String regName) { + return ResourceLocation.parse(getRegistryName(regName)); + } + + public static String getRegistryName(String regName) { + return MOD_ID + ":" + regName; + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/ClientEventHandler.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/ClientEventHandler.java new file mode 100644 index 0000000..f78e392 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/ClientEventHandler.java @@ -0,0 +1,16 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.client; + +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModItems; + +public class ClientEventHandler{ + + public static void registerHandlers(IEventBus modBus) { + modBus.addListener(ClientEventHandler::registerClientExtensions); + } + + private static void registerClientExtensions(RegisterClientExtensionsEvent event) { + event.registerItem(StorageMinecartItemRenderer.getItemRenderProperties(), ModItems.STORAGE_MINECART.get()); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/StorageMinecartItemRenderer.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/StorageMinecartItemRenderer.java new file mode 100644 index 0000000..28c0eaf --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/StorageMinecartItemRenderer.java @@ -0,0 +1,57 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.client; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.geom.EntityModelSet; +import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher; +import net.minecraft.world.item.ItemDisplayContext; +import net.minecraft.world.item.ItemStack; +import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.StorageMinecart; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModEntities; + +import javax.annotation.Nullable; + +public class StorageMinecartItemRenderer extends BlockEntityWithoutLevelRenderer { + @Nullable + private static StorageMinecart MINECART = null; + public StorageMinecartItemRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher, EntityModelSet entityModelSet) { + super(blockEntityRenderDispatcher, entityModelSet); + } + + public static IClientItemExtensions getItemRenderProperties() { + return new IClientItemExtensions() { + @Override + public BlockEntityWithoutLevelRenderer getCustomRenderer() { + return new StorageMinecartItemRenderer(Minecraft.getInstance().getBlockEntityRenderDispatcher(), Minecraft.getInstance().getEntityModels()); + } + }; + } + + @Override + public void renderByItem(ItemStack stack, ItemDisplayContext displayContext, PoseStack poseStack, MultiBufferSource buffer, int packedLight, int packedOverlay) { + super.renderByItem(stack, displayContext, poseStack, buffer, packedLight, packedOverlay); + Minecraft mc = Minecraft.getInstance(); + if (mc.level == null) { + return; + } + + StorageMinecart minecart = getStorageMinecart(mc); + minecart.getStorageHolder().setStorageItemFrom(stack); + + poseStack.pushPose(); + poseStack.translate(0.5, 0, 0.5); + mc.getEntityRenderDispatcher().render(minecart, 0, 0, 0, 0, 0, poseStack, buffer, packedLight); + poseStack.popPose(); + } + + private static StorageMinecart getStorageMinecart(Minecraft mc) { + if (MINECART == null) { + MINECART = new StorageMinecart(ModEntities.STORAGE_MINECART.get(), mc.level); + } + + return MINECART; + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/StorageMinecartRenderer.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/StorageMinecartRenderer.java new file mode 100644 index 0000000..0e28c09 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/StorageMinecartRenderer.java @@ -0,0 +1,141 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.client; + +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.Minecraft; +import net.minecraft.client.model.geom.ModelLayers; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.block.BlockRenderDispatcher; +import net.minecraft.client.renderer.blockentity.BlockEntityRenderer; +import net.minecraft.client.renderer.entity.EntityRendererProvider; +import net.minecraft.client.renderer.entity.MinecartRenderer; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.ColorResolver; +import net.minecraft.world.level.LightLayer; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.lighting.LevelLightEngine; +import net.minecraft.world.level.material.FluidState; +import net.neoforged.neoforge.client.RenderTypeHelper; +import net.neoforged.neoforge.client.model.data.ModelData; +import net.p3pp3rf1y.sophisticatedstorage.block.BarrelBlockEntity; +import net.p3pp3rf1y.sophisticatedstorage.block.ShulkerBoxBlockEntity; +import net.p3pp3rf1y.sophisticatedstorage.block.StorageBlockEntity; +import net.p3pp3rf1y.sophisticatedstorage.client.render.BarrelBakedModelBase; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.StorageMinecart; +import org.jetbrains.annotations.Nullable; + +public class StorageMinecartRenderer extends MinecartRenderer { + public StorageMinecartRenderer(EntityRendererProvider.Context context) { + super(context, ModelLayers.MINECART); + } + + @Override + protected void renderMinecartContents(StorageMinecart entity, float partialTicks, BlockState state, PoseStack poseStack, MultiBufferSource buffer, int packedLight) { + StorageBlockEntity renderBlockEntity = entity.getStorageHolder().getRenderBlockEntity(); + + Minecraft minecraft = Minecraft.getInstance(); + + BlockAndTintGetter wrappedLevel = new StaticBlockEntityTintGetter(minecraft.level, renderBlockEntity, packedLight); //TODO try to optimize not to create a new instance all the time, perhaps level keyed cache for these and then only setting blockentity in the render call + + poseStack.pushPose(); + double yOffset = 0; + if (renderBlockEntity instanceof BarrelBlockEntity || renderBlockEntity instanceof ShulkerBoxBlockEntity) { + yOffset -= 2 / 16D; + } + poseStack.translate(0, yOffset, 0); + if (renderBlockEntity instanceof BarrelBlockEntity barrel) { + BlockRenderDispatcher blockRenderer = minecraft.getBlockRenderer(); + BakedModel bakedModel = blockRenderer.getBlockModel(barrel.getBlockState()); + ModelData modelData = BarrelBakedModelBase.getModelDataFromBlockEntity(barrel); + for (RenderType renderType : bakedModel.getRenderTypes(state, RandomSource.create(42L), modelData)) { + VertexConsumer vertexConsumer = buffer.getBuffer(RenderTypeHelper.getEntityRenderType(renderType, false)); + RandomSource randomsource = RandomSource.create(); + randomsource.setSeed(42L); + blockRenderer.getModelRenderer().tesselateWithoutAO(wrappedLevel, bakedModel, barrel.getBlockState(), BlockPos.ZERO, poseStack, vertexConsumer, false, randomsource, state.getSeed(BlockPos.ZERO), OverlayTexture.NO_OVERLAY, modelData, renderType); + } + } + + BlockEntityRenderer renderer = minecraft.getBlockEntityRenderDispatcher().getRenderer(renderBlockEntity); + if (renderer != null) { + renderer.render(renderBlockEntity, partialTicks, poseStack, buffer, packedLight, OverlayTexture.NO_OVERLAY); + } + poseStack.popPose(); + } + + private static class StaticBlockEntityTintGetter implements BlockAndTintGetter { + private final BlockAndTintGetter level; + private final BlockEntity blockEntity; + private final int packedLight; + + public StaticBlockEntityTintGetter(BlockAndTintGetter level, BlockEntity blockEntity, int packedLight) { + this.level = level; + this.blockEntity = blockEntity; + this.packedLight = packedLight; + } + + @Override + public float getShade(Direction direction, boolean b) { + return level.getShade(direction, b); + } + + @Override + public LevelLightEngine getLightEngine() { + return level.getLightEngine(); + } + + @Override + public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) { + return level.getBlockTint(blockPos, colorResolver); + } + + @Nullable + @Override + public BlockEntity getBlockEntity(BlockPos blockPos) { + return blockPos == BlockPos.ZERO ? blockEntity : level.getBlockEntity(blockPos); + } + + @Override + public BlockState getBlockState(BlockPos blockPos) { + return blockPos == BlockPos.ZERO ? blockEntity.getBlockState() : level.getBlockState(blockPos); + } + + @Override + public FluidState getFluidState(BlockPos blockPos) { + return level.getFluidState(blockPos); + } + + @Override + public int getHeight() { + return level.getHeight(); + } + + @Override + public int getMinBuildHeight() { + return level.getMinBuildHeight(); + } + + @Override + public int getLightEmission(BlockPos pos) { + return 0; + } + + @Override + public int getBrightness(LightLayer lightType, BlockPos blockPos) { + return lightType == LightLayer.SKY ? packedLight >> 20 : packedLight >> 4 & 15; + } + + @Override + public int getRawBrightness(BlockPos blockPos, int amount) { + int skyValue = packedLight >> 20; + int blockValue = packedLight >> 4 & 15; + return Math.max(blockValue, skyValue - amount); + } + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/BackToMovingStorageTab.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/BackToMovingStorageTab.java new file mode 100644 index 0000000..a696b50 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/BackToMovingStorageTab.java @@ -0,0 +1,26 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui; + +import net.minecraft.network.chat.Component; +import net.neoforged.neoforge.network.PacketDistributor; +import net.p3pp3rf1y.sophisticatedcore.client.gui.Tab; +import net.p3pp3rf1y.sophisticatedcore.client.gui.controls.ImageButton; +import net.p3pp3rf1y.sophisticatedcore.client.gui.utils.*; +import net.p3pp3rf1y.sophisticatedstorage.client.gui.StorageTranslationHelper; +import net.p3pp3rf1y.sophisticatedstorageinmotion.network.OpenMovingStorageInventoryPayload; + +public class BackToMovingStorageTab extends Tab { + private static final TextureBlitData ICON = new TextureBlitData(GuiHelper.ICONS, Dimension.SQUARE_256, new UV(64, 80), Dimension.SQUARE_16); + + private final int entityId; + + protected BackToMovingStorageTab(Position position, int entityId) { + super(position, Component.translatable(StorageTranslationHelper.INSTANCE.translGui("back_to_storage.tooltip")), + onTabIconClicked -> new ImageButton(new Position(position.x() + 1, position.y() + 4), Dimension.SQUARE_16, ICON, onTabIconClicked)); + this.entityId = entityId; + } + + @Override + protected void onTabIconClicked(int button) { + PacketDistributor.sendToServer(new OpenMovingStorageInventoryPayload(entityId)); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingLimitedBarrelScreen.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingLimitedBarrelScreen.java new file mode 100644 index 0000000..fef7b8f --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingLimitedBarrelScreen.java @@ -0,0 +1,46 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; +import net.p3pp3rf1y.sophisticatedstorage.client.gui.LimitedBarrelScreen; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingStorageContainerMenu; + +public class MovingLimitedBarrelScreen extends MovingStorageScreen { + public static final int STORAGE_SLOTS_HEIGHT = 82; + + public MovingLimitedBarrelScreen(MovingStorageContainerMenu menu, Inventory playerInventory, Component title) { + super(menu, playerInventory, title); + } + + @Override + protected void drawSlotBg(GuiGraphics guiGraphics, int x, int y, int visibleSlotsCount) { + LimitedBarrelScreen.drawSlotBg(this, guiGraphics, x, y, getMenu().getNumberOfStorageInventorySlots()); + } + + @Override + protected void renderLabels(GuiGraphics guiGraphics, int mouseX, int mouseY) { + super.renderLabels(guiGraphics, mouseX, mouseY); + LimitedBarrelScreen.renderBars(font, imageWidth, getMenu(), guiGraphics, getMenu()::getSlotFillPercentage); + } + + @Override + protected int getStorageInventoryHeight(int displayableNumberOfRows) { + return STORAGE_SLOTS_HEIGHT; + } + + @Override + protected void updateStorageSlotsPositions() { + LimitedBarrelScreen.updateSlotPositions(getMenu(), getMenu().getNumberOfStorageInventorySlots(), imageWidth); + } + + @Override + protected boolean shouldShowSortButtons() { + return false; + } + + @Override + protected void addSearchBox() { + // No search box for limited barrels + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingLimitedBarrelSettingsScreen.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingLimitedBarrelSettingsScreen.java new file mode 100644 index 0000000..c3ef397 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingLimitedBarrelSettingsScreen.java @@ -0,0 +1,42 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui; + +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; +import net.p3pp3rf1y.sophisticatedcore.client.gui.utils.Position; +import net.p3pp3rf1y.sophisticatedcore.common.gui.SettingsContainerMenu; +import net.p3pp3rf1y.sophisticatedcore.settings.StorageSettingsTabControlBase; +import net.p3pp3rf1y.sophisticatedcore.settings.itemdisplay.ItemDisplaySettingsCategory; +import net.p3pp3rf1y.sophisticatedcore.settings.nosort.NoSortSettingsCategory; +import net.p3pp3rf1y.sophisticatedstorage.client.gui.LimitedBarrelScreen; + +public class MovingLimitedBarrelSettingsScreen extends MovingStorageSettingsScreen { + public MovingLimitedBarrelSettingsScreen(SettingsContainerMenu screenContainer, Inventory inv, Component title) { + super(screenContainer, inv, title); + } + + @Override + protected int getStorageInventoryHeight(int displayableNumberOfRows) { + return LimitedBarrelScreen.STORAGE_SLOTS_HEIGHT; + } + + @Override + protected void updateStorageSlotsPositions() { + LimitedBarrelScreen.updateSlotPositions(getMenu(), getMenu().getNumberOfStorageInventorySlots(), imageWidth); + } + + @Override + protected void drawSlotBg(GuiGraphics guiGraphics, int x, int y, int visibleSlotsCount) { + LimitedBarrelScreen.drawSlotBg(this, guiGraphics, x, y, getMenu().getNumberOfStorageInventorySlots()); + } + + @Override + protected StorageSettingsTabControlBase initializeTabControl() { + return new MovingStorageSettingsTabControl(this, new Position(leftPos + imageWidth, topPos + 4)) { + @Override + protected boolean isSettingsCategoryDisabled(String categoryName) { + return categoryName.equals(ItemDisplaySettingsCategory.NAME) || categoryName.equals(NoSortSettingsCategory.NAME); + } + }; + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageScreen.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageScreen.java new file mode 100644 index 0000000..14a5b82 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageScreen.java @@ -0,0 +1,22 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; +import net.p3pp3rf1y.sophisticatedcore.client.gui.StorageScreenBase; +import net.p3pp3rf1y.sophisticatedstorage.client.gui.StorageTranslationHelper; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingStorageContainerMenu; + +public class MovingStorageScreen extends StorageScreenBase { + public static MovingStorageScreen constructScreen(MovingStorageContainerMenu screenContainer, Inventory inv, Component title) { + return new MovingStorageScreen(screenContainer, inv, title); + } + + protected MovingStorageScreen(MovingStorageContainerMenu menu, Inventory playerInventory, Component title) { + super(menu, playerInventory, title); + } + + @Override + protected String getStorageSettingsTabTooltip() { + return StorageTranslationHelper.INSTANCE.translGui("settings.tooltip"); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageSettingsScreen.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageSettingsScreen.java new file mode 100644 index 0000000..d8dbdcd --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageSettingsScreen.java @@ -0,0 +1,33 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui; + +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Inventory; +import net.neoforged.neoforge.network.PacketDistributor; +import net.p3pp3rf1y.sophisticatedcore.client.gui.utils.Position; +import net.p3pp3rf1y.sophisticatedcore.common.gui.SettingsContainerMenu; +import net.p3pp3rf1y.sophisticatedcore.settings.StorageSettingsTabControlBase; +import net.p3pp3rf1y.sophisticatedstorage.client.gui.StorageSettingsScreen; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingStorageSettingsContainerMenu; +import net.p3pp3rf1y.sophisticatedstorageinmotion.network.OpenMovingStorageInventoryPayload; + +public class MovingStorageSettingsScreen extends StorageSettingsScreen { + private final int entityId; + public MovingStorageSettingsScreen(SettingsContainerMenu screenContainer, Inventory inv, Component title) { + super(screenContainer, inv, title); + this.entityId = screenContainer instanceof MovingStorageSettingsContainerMenu menu ? menu.getEntityId() : -1; + } + + @Override + protected StorageSettingsTabControlBase initializeTabControl() { + return new MovingStorageSettingsTabControl(this, new Position(leftPos + imageWidth, topPos + 4)); + } + + @Override + protected void sendStorageInventoryScreenOpenMessage() { + PacketDistributor.sendToServer(new OpenMovingStorageInventoryPayload(entityId)); + } + + public static MovingStorageSettingsScreen constructScreen(SettingsContainerMenu screenContainer, Inventory inventory, Component title) { + return new MovingStorageSettingsScreen(screenContainer, inventory, title); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageSettingsTabControl.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageSettingsTabControl.java new file mode 100644 index 0000000..dc0995a --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/MovingStorageSettingsTabControl.java @@ -0,0 +1,17 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui; + +import net.p3pp3rf1y.sophisticatedcore.client.gui.Tab; +import net.p3pp3rf1y.sophisticatedcore.client.gui.utils.Position; +import net.p3pp3rf1y.sophisticatedstorage.client.gui.StorageSettingsTabControl; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingStorageSettingsContainerMenu; + +public class MovingStorageSettingsTabControl extends StorageSettingsTabControl { + protected MovingStorageSettingsTabControl(MovingStorageSettingsScreen screen, Position position) { + super(screen, position); + } + + @Override + protected Tab instantiateReturnBackTab() { + return new BackToMovingStorageTab(new Position(x, getTopY()), screen.getMenu() instanceof MovingStorageSettingsContainerMenu menu ? menu.getEntityId() : -1); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/package-info.java new file mode 100644 index 0000000..b48540c --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/gui/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/package-info.java new file mode 100644 index 0000000..3246872 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedstorageinmotion.client; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingLimitedBarrelContainerMenu.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingLimitedBarrelContainerMenu.java new file mode 100644 index 0000000..5ced00f --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingLimitedBarrelContainerMenu.java @@ -0,0 +1,28 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui; + +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModEntities; + +import java.util.List; + +public class MovingLimitedBarrelContainerMenu extends MovingStorageContainerMenu { + public MovingLimitedBarrelContainerMenu(int containerId, Player player, int entityId) { + super(ModEntities.MOVING_LIMITED_BARREL_CONTAINER_TYPE.get(), containerId, player, entityId); + } + + public static MovingLimitedBarrelContainerMenu fromBuffer(int windowId, Inventory playerInventory, FriendlyByteBuf buffer) { + return new MovingLimitedBarrelContainerMenu(windowId, playerInventory.player, buffer.readInt()); + } + + @Override + protected MovingStorageSettingsContainerMenu instantiateSettingsContainerMenu(int windowId, Player player, int entityId) { + return new MovingLimitedBarrelSettingsContainerMenu(windowId, player, entityId); + } + + @Override + public List getSlotOverlayColors(int slot) { + return List.of(); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingLimitedBarrelSettingsContainerMenu.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingLimitedBarrelSettingsContainerMenu.java new file mode 100644 index 0000000..8883bd6 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingLimitedBarrelSettingsContainerMenu.java @@ -0,0 +1,16 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui; + +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModEntities; + +public class MovingLimitedBarrelSettingsContainerMenu extends MovingStorageSettingsContainerMenu { + protected MovingLimitedBarrelSettingsContainerMenu(int windowId, Player player, int entityId) { + super(ModEntities.MOVING_LIMITED_BARREL_SETTINGS_CONTAINER_TYPE.get(), windowId, player, entityId); + } + + public static MovingLimitedBarrelSettingsContainerMenu fromBuffer(int windowId, Inventory playerInventory, FriendlyByteBuf buffer) { + return new MovingLimitedBarrelSettingsContainerMenu(windowId, playerInventory.player, buffer.readInt()); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingStorageContainerMenu.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingStorageContainerMenu.java new file mode 100644 index 0000000..42f2f92 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingStorageContainerMenu.java @@ -0,0 +1,169 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui; + +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.network.chat.Component; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.level.Level; +import net.neoforged.neoforge.network.PacketDistributor; +import net.p3pp3rf1y.sophisticatedcore.api.IStorageWrapper; +import net.p3pp3rf1y.sophisticatedcore.common.gui.ISyncedContainer; +import net.p3pp3rf1y.sophisticatedcore.common.gui.SophisticatedMenuProvider; +import net.p3pp3rf1y.sophisticatedcore.common.gui.StorageContainerMenuBase; +import net.p3pp3rf1y.sophisticatedcore.settings.itemdisplay.ItemDisplaySettingsCategory; +import net.p3pp3rf1y.sophisticatedcore.upgrades.UpgradeHandler; +import net.p3pp3rf1y.sophisticatedcore.util.NoopStorageWrapper; +import net.p3pp3rf1y.sophisticatedstorage.client.gui.StorageTranslationHelper; +import net.p3pp3rf1y.sophisticatedstorageinmotion.data.MovingStorageData; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.IMovingStorageEntity; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.MovingStorageWrapper; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.StorageMinecart; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModEntities; +import net.p3pp3rf1y.sophisticatedstorageinmotion.network.MovingStorageContentsPayload; + +import javax.annotation.Nullable; +import java.lang.ref.WeakReference; +import java.util.List; +import java.util.Optional; + +public class MovingStorageContainerMenu extends StorageContainerMenuBase implements ISyncedContainer { + protected final WeakReference storageEntity; + + @Nullable + private CompoundTag lastSettingsNbt = null; + + public MovingStorageContainerMenu(int containerId, Player player, int entityId) { + this(ModEntities.MOVING_STORAGE_CONTAINER_TYPE.get(), containerId, player, entityId); + } + + public MovingStorageContainerMenu(MenuType menuType, int containerId, Player player, int entityId) { + super(menuType, containerId, player, getWrapper(player.level(), entityId), NoopStorageWrapper.INSTANCE, -1, false); + if (!(player.level().getEntity(entityId) instanceof IMovingStorageEntity movingStorageEntity)) { + throw new IllegalArgumentException("Incorrect entity with id " + entityId + " expected to find IMovingStorageEntity"); + } + storageEntity = new WeakReference<>(movingStorageEntity); + movingStorageEntity.getStorageHolder().startOpen(player); + } + + public Optional getStorageEntity() { + return Optional.ofNullable(storageEntity.get()); + } + + @Override + public void removed(Player player) { + super.removed(player); + getStorageEntity().ifPresent(storageEntity -> storageEntity.getStorageHolder().stopOpen(player)); + } + + private static IStorageWrapper getWrapper(Level level, int entityId) { + if (!(level.getEntity(entityId) instanceof StorageMinecart storageMinecart)) { + return NoopStorageWrapper.INSTANCE; + } + + return storageMinecart.getStorageHolder().getStorageWrapper(); + } + + public static MovingStorageContainerMenu fromBuffer(int windowId, Inventory playerInventory, FriendlyByteBuf buffer) { + return new MovingStorageContainerMenu(windowId, playerInventory.player, buffer.readInt()); + } + + @Override + public Optional getBlockPosition() { + return Optional.empty(); + } + + @Override + protected StorageContainerMenuBase.StorageUpgradeSlot instantiateUpgradeSlot(UpgradeHandler upgradeHandler, int slotIndex) { + return new StorageUpgradeSlot(upgradeHandler, slotIndex) { + @Override + protected void onUpgradeChanged() { + if (player.level().isClientSide()) { + return; + } + storageWrapper.getSettingsHandler().getTypeCategory(ItemDisplaySettingsCategory.class).itemsChanged(); + } + }; + } + + @Override + public void openSettings() { + if (isClientSide()) { + sendToServer(data -> data.putString(ACTION_TAG, "openSettings")); + return; + } + getStorageEntity().ifPresent(entity -> + player.openMenu(new SophisticatedMenuProvider((w, p, pl) -> instantiateSettingsContainerMenu(w, pl, entity.getId()), + Component.translatable(StorageTranslationHelper.INSTANCE.translGui("settings.title")), false), buffer -> buffer.writeInt(entity.getId())) + ); + } + + protected MovingStorageSettingsContainerMenu instantiateSettingsContainerMenu(int windowId, Player player, int entityId) { + return new MovingStorageSettingsContainerMenu(windowId, player, entityId); + } + + @Override + protected boolean storageItemHasChanged() { + return false; //the stack is only used for internal tracking in moving entities so it can't be swapped away by a player + } + + @Override + public boolean detectSettingsChangeAndReload() { + if (player.level().isClientSide) { + return storageWrapper.getContentsUuid().map(uuid -> { + MovingStorageData storage = MovingStorageData.get(uuid); + if (storage.removeUpdatedStorageSettingsFlag(uuid)) { + storageWrapper.getSettingsHandler().reloadFrom(storage.getContents().getCompound(MovingStorageWrapper.SETTINGS_TAG)); + return true; + } + return false; + }).orElse(false); + } + return false; + } + + @Override + public boolean stillValid(Player player) { + return getStorageEntity().map(se -> player.distanceToSqr(se.position()) <= 64.0D).orElse(false); //TODO if packing is allowed check if not packed here + } + + /* TODO base on storage wrapper in stack + public float getSlotFillPercentage(int slot) { + return storageBlockEntity.getSlotFillPercentage(slot); + } +*/ + + @Override + protected void sendStorageSettingsToClient() { + if (player.level().isClientSide) { + return; + } + + if (lastSettingsNbt == null || !lastSettingsNbt.equals(storageWrapper.getSettingsHandler().getNbt())) { + lastSettingsNbt = storageWrapper.getSettingsHandler().getNbt().copy(); + + storageWrapper.getContentsUuid().ifPresent(uuid -> { + CompoundTag settingsContents = new CompoundTag(); + CompoundTag settingsNbt = storageWrapper.getSettingsHandler().getNbt(); + if (!settingsNbt.isEmpty()) { + settingsContents.put(MovingStorageWrapper.SETTINGS_TAG, settingsNbt); + if (player instanceof ServerPlayer serverPlayer) { + PacketDistributor.sendToPlayer(serverPlayer, new MovingStorageContentsPayload(uuid, settingsContents)); + } + } + }); + } + } + + public float getSlotFillPercentage(int slot) { + IMovingStorageEntity entity = storageEntity.get(); + if (entity == null) { + return 0; + } + List slotFillRatios = entity.getStorageHolder().getStorageWrapper().getRenderInfo().getItemDisplayRenderInfo().getSlotFillRatios(); + return slot > -1 && slot < slotFillRatios.size() ? slotFillRatios.get(slot) : 0; + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingStorageSettingsContainerMenu.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingStorageSettingsContainerMenu.java new file mode 100644 index 0000000..b46c9d4 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/MovingStorageSettingsContainerMenu.java @@ -0,0 +1,88 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui; + +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.level.Level; +import net.neoforged.neoforge.network.PacketDistributor; +import net.p3pp3rf1y.sophisticatedcore.api.IStorageWrapper; +import net.p3pp3rf1y.sophisticatedcore.common.gui.SettingsContainerMenu; +import net.p3pp3rf1y.sophisticatedcore.util.NoopStorageWrapper; +import net.p3pp3rf1y.sophisticatedstorageinmotion.data.MovingStorageData; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.MovingStorageWrapper; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.StorageMinecart; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModEntities; +import net.p3pp3rf1y.sophisticatedstorageinmotion.network.MovingStorageContentsPayload; + +public class MovingStorageSettingsContainerMenu extends SettingsContainerMenu { + private final int entityId; + private CompoundTag lastSettingsNbt = null; + + protected MovingStorageSettingsContainerMenu(int windowId, Player player, int entityId) { + this(ModEntities.MOVING_STORAGE_SETTINGS_CONTAINER_TYPE.get(), windowId, player, entityId); + } + + protected MovingStorageSettingsContainerMenu(MenuType menuType, int windowId, Player player, int entityId) { + super(menuType, windowId, player, getWrapper(player.level(), entityId)); + this.entityId = entityId; + } + + private static IStorageWrapper getWrapper(Level level, int entityId) { + if (!(level.getEntity(entityId) instanceof StorageMinecart storageMinecart)) { + return NoopStorageWrapper.INSTANCE; + } + + return storageMinecart.getStorageHolder().getStorageWrapper(); + } + + @Override + public void detectSettingsChangeAndReload() { + if (player.level().isClientSide) { + storageWrapper.getContentsUuid().ifPresent(uuid -> { + MovingStorageData storage = MovingStorageData.get(uuid); + if (storage.removeUpdatedStorageSettingsFlag(uuid)) { + storageWrapper.getSettingsHandler().reloadFrom(storage.getContents().getCompound(MovingStorageWrapper.SETTINGS_TAG)); + } + }); + } + } + + public static MovingStorageSettingsContainerMenu fromBuffer(int windowId, Inventory playerInventory, FriendlyByteBuf buffer) { + return new MovingStorageSettingsContainerMenu(windowId, playerInventory.player, buffer.readInt()); + } + + public int getEntityId() { + return entityId; + } + + private void sendStorageSettingsToClient() { + if (player.level().isClientSide) { + return; + } + + if (lastSettingsNbt == null || !lastSettingsNbt.equals(storageWrapper.getSettingsHandler().getNbt())) { + lastSettingsNbt = storageWrapper.getSettingsHandler().getNbt().copy(); + + storageWrapper.getContentsUuid().ifPresent(uuid -> { + CompoundTag settingsContents = new CompoundTag(); + CompoundTag settingsNbt = storageWrapper.getSettingsHandler().getNbt(); + if (!settingsNbt.isEmpty()) { + settingsContents.put(MovingStorageWrapper.SETTINGS_TAG, settingsNbt); + if (player instanceof ServerPlayer serverPlayer) { + PacketDistributor.sendToPlayer(serverPlayer, new MovingStorageContentsPayload(uuid, settingsContents)); + } + } + }); + } + } + + @Override + public void broadcastChanges() { + super.broadcastChanges(); + + sendStorageSettingsToClient(); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/package-info.java new file mode 100644 index 0000000..be1c7df --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/gui/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/data/MovingStorageData.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/data/MovingStorageData.java new file mode 100644 index 0000000..92270bc --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/data/MovingStorageData.java @@ -0,0 +1,97 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.data; + +import net.minecraft.core.HolderLookup; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.saveddata.SavedData; +import net.minecraft.world.level.storage.DimensionDataStorage; +import net.neoforged.fml.util.thread.SidedThreadGroups; +import net.neoforged.neoforge.server.ServerLifecycleHooks; +import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.MovingStorageWrapper; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.*; + +public class MovingStorageData extends SavedData { + private static final String SAVED_DATA_PREFIX = SophisticatedStorageInMotion.MOD_ID + "/"; + + private CompoundTag movingStorageContents = new CompoundTag(); + + private boolean toRemove = false; + private static final Map clientStorageCopy = new HashMap<>(); //TODO maybe change to cache so that deleted ones get removed? + private final Set updatedStorageSettingsFlags = new HashSet<>(); + + private MovingStorageData() { + } + + public static MovingStorageData get(UUID storageId) { + if (Thread.currentThread().getThreadGroup() == SidedThreadGroups.SERVER) { + MinecraftServer server = ServerLifecycleHooks.getCurrentServer(); + if (server != null) { + ServerLevel overworld = server.getLevel(Level.OVERWORLD); + //noinspection ConstantConditions - by this time overworld is loaded + DimensionDataStorage storage = overworld.getDataStorage(); + return storage.computeIfAbsent(new Factory<>(MovingStorageData::new, MovingStorageData::load), SAVED_DATA_PREFIX + storageId); + } + } + return clientStorageCopy.computeIfAbsent(storageId, id -> new MovingStorageData()); + } + + public static MovingStorageData load(CompoundTag nbt, HolderLookup.Provider registries) { + MovingStorageData storageData = new MovingStorageData(); + storageData.movingStorageContents = nbt; + return storageData; + } + + @Override + public CompoundTag save(CompoundTag compound, HolderLookup.Provider registries) { + if (movingStorageContents != null) { + return movingStorageContents; + } + return new CompoundTag(); + } + + public void removeStorageContents(UUID backpackUuid) { + toRemove = true; + setDirty(); + } + + @Override + public void save(File file, HolderLookup.Provider registries) { + if (toRemove) { + file.delete(); + } else { + try { + Files.createDirectories(file.toPath().getParent()); + } catch (IOException e) { + SophisticatedStorageInMotion.LOGGER.error("Failed to create directories for moving storage data", e); + } + super.save(file, registries); + } + } + + public void setContents(UUID storageUuid, CompoundTag contents) { + for (String key : contents.getAllKeys()) { + //noinspection ConstantConditions - the key is one of the tag keys so there's no reason it wouldn't exist here + movingStorageContents.put(key, contents.get(key)); + + if (key.equals(MovingStorageWrapper.SETTINGS_TAG)) { + updatedStorageSettingsFlags.add(storageUuid); + } + } + setDirty(); + } + + public CompoundTag getContents() { + return movingStorageContents; + } + + public boolean removeUpdatedStorageSettingsFlag(UUID backpackUuid) { + return updatedStorageSettingsFlags.remove(backpackUuid); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/data/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/data/package-info.java new file mode 100644 index 0000000..ca5f412 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/data/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedstorageinmotion.data; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/EntityStorageHolder.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/EntityStorageHolder.java new file mode 100644 index 0000000..7e2055a --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/EntityStorageHolder.java @@ -0,0 +1,270 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.entity; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.HolderLookup; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.monster.piglin.PiglinAi; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.block.state.properties.WoodType; +import net.minecraft.world.level.gameevent.GameEvent; +import net.p3pp3rf1y.sophisticatedcore.api.IStorageWrapper; +import net.p3pp3rf1y.sophisticatedcore.common.gui.SophisticatedMenuProvider; +import net.p3pp3rf1y.sophisticatedcore.init.ModCoreDataComponents; +import net.p3pp3rf1y.sophisticatedcore.renderdata.RenderInfo; +import net.p3pp3rf1y.sophisticatedcore.upgrades.ITickableUpgrade; +import net.p3pp3rf1y.sophisticatedcore.util.NoopStorageWrapper; +import net.p3pp3rf1y.sophisticatedcore.util.SimpleItemContent; +import net.p3pp3rf1y.sophisticatedstorage.block.*; +import net.p3pp3rf1y.sophisticatedstorage.init.ModBlocks; +import net.p3pp3rf1y.sophisticatedstorage.item.BarrelBlockItem; +import net.p3pp3rf1y.sophisticatedstorage.item.StorageBlockItem; +import net.p3pp3rf1y.sophisticatedstorage.item.WoodStorageBlockItem; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingLimitedBarrelContainerMenu; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingStorageContainerMenu; +import net.p3pp3rf1y.sophisticatedstorageinmotion.data.MovingStorageData; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModDataComponents; + +import javax.annotation.Nullable; +import java.util.Map; +import java.util.UUID; + +public class EntityStorageHolder { + private final T entity; + + @Nullable + private StorageBlockEntity renderBlockEntity = null; + + private IStorageWrapper storageWrapper = NoopStorageWrapper.INSTANCE; + + public EntityStorageHolder(T entity) { + this.entity = entity; + } + + public static boolean areUpgradesVisible(ItemStack storageItem) { + return storageItem.getOrDefault(ModDataComponents.UPGRADES_VISIBLE, false); + } + + public void setStorageItemFrom(ItemStack stack) { + SimpleItemContent storageItemContents = stack.get(ModDataComponents.STORAGE_ITEM.get()); + if (storageItemContents == null) { + ItemStack barrel = new ItemStack(ModBlocks.BARREL_ITEM.get()); + WoodStorageBlockItem.setWoodType(barrel, WoodType.SPRUCE); + setStorageItem(barrel); + } else { + ItemStack storageItem = storageItemContents.copy(); + setStorageItem(storageItem); + if (isLimitedBarrel(storageItem)) { + LimitedBarrelBlock.setupDefaultSettings(getStorageWrapper(), storageWrapper instanceof MovingStorageWrapper movingStorageWrapper ? movingStorageWrapper.getNumberOfInventorySlots() : storageWrapper.getInventoryHandler().getSlots()); + } + } + } + + public CompoundTag saveData(HolderLookup.Provider registries) { + CompoundTag ret = new CompoundTag(); + ItemStack storageItem = entity.getStorageItem(); + if (!storageItem.isEmpty()) { + ret.put("storageItem", storageItem.save(registries, new CompoundTag())); + } + return ret; + } + + public void readData(HolderLookup.Provider registries, CompoundTag tag) { + if (tag.contains("storageItem")) { + setStorageItem(ItemStack.parseOptional(registries, tag.getCompound("storageItem"))); + } + } + + public void setStorageItem(ItemStack storageItem) { + entity.setStorageItem(storageItem); + storageWrapper = NoopStorageWrapper.INSTANCE; //reset storage wrapper to force update when it's next requested + renderBlockEntity = null; + } + + public void updateStorageWrapper() { + ItemStack storageItem = entity.getStorageItem(); + UUID id = storageItem.get(ModCoreDataComponents.STORAGE_UUID); + if (id == null) { + id = UUID.randomUUID(); + storageItem.set(ModCoreDataComponents.STORAGE_UUID, id); + setStorageItem(storageItem); + } + + storageWrapper = MovingStorageWrapper.fromStack(storageItem, this::onContentsChanged, this::onStackChanged, entity.level()); + } + + public IStorageWrapper getStorageWrapper() { + if (!entity.getStorageItem().isEmpty() && storageWrapper == NoopStorageWrapper.INSTANCE) { + updateStorageWrapper(); + } + + return storageWrapper; + } + + private void setRenderBlockEntity(StorageBlockEntity storageBlockEntity) { + this.renderBlockEntity = storageBlockEntity; + } + + private void onStackChanged() { + entity.setStorageItem(getStorageWrapper().getWrappedStorageStack()); + renderBlockEntity = null; + } + + private void onContentsChanged() { + if (entity.level().isClientSide()) { + return; + } + + ItemStack storageItem = entity.getStorageItem(); + @Nullable UUID storageId = storageItem.get(ModCoreDataComponents.STORAGE_UUID); + if (storageId == null) { + return; + } + MovingStorageData.get(storageId).setDirty(); + } + + public void dropAllItems() { + //TODO implement + } + + public void startOpen(Player player) { + entity.gameEvent(GameEvent.CONTAINER_OPEN, player); + PiglinAi.angerNearbyPiglins(player, true); + + //TODO implement openers tracking? Would require stopOpen override in that case as well + } + + public void stopOpen(Player player) { + //noop + } + + public void tick() { + if (entity.level().isClientSide()) { + return; + } + getStorageWrapper().getUpgradeHandler().getWrappersThatImplement(ITickableUpgrade.class).forEach(upgrade -> upgrade.tick(entity, entity.level(), entity.blockPosition())); + } + + public static boolean isLocked(ItemStack stack) { + return stack.getOrDefault(ModDataComponents.LOCKED, false); + } + + public static boolean isLockVisible(ItemStack storageItem) { + return storageItem.getOrDefault(ModDataComponents.LOCK_VISIBLE, true); + } + + public static CompoundTag getRenderInfoNbt(ItemStack storageItem) { + return storageItem.getOrDefault(ModCoreDataComponents.RENDER_INFO_TAG, CustomData.EMPTY).copyTag(); + } + + public StorageBlockEntity getRenderBlockEntity() { + if (renderBlockEntity == null) { + ItemStack storageItem = entity.getStorageItem(); + if (storageItem.getItem() instanceof BlockItem blockItem) { + if (blockItem.getBlock() instanceof ChestBlock) { + renderBlockEntity = new ChestBlockEntity(BlockPos.ZERO, blockItem.getBlock().defaultBlockState()); + } else if (blockItem.getBlock() instanceof LimitedBarrelBlock) { + renderBlockEntity = new LimitedBarrelBlockEntity(BlockPos.ZERO, + blockItem.getBlock().defaultBlockState() + .setValue(LimitedBarrelBlock.HORIZONTAL_FACING, Direction.NORTH) + .setValue(LimitedBarrelBlock.VERTICAL_FACING, VerticalFacing.UP) + ); + } else if (blockItem.getBlock() instanceof BarrelBlock) { + renderBlockEntity = new BarrelBlockEntity(BlockPos.ZERO, + blockItem.getBlock().defaultBlockState() + .setValue(BarrelBlock.FACING, Direction.UP) + ); + } else if (blockItem.getBlock() instanceof ShulkerBoxBlock) { + renderBlockEntity = new ShulkerBoxBlockEntity(BlockPos.ZERO, blockItem.getBlock().defaultBlockState()); + } + + if (renderBlockEntity != null) { + if (renderBlockEntity.isLocked() != EntityStorageHolder.isLocked(storageItem)) { + renderBlockEntity.toggleLock(); + } + if (renderBlockEntity.shouldShowLock() != EntityStorageHolder.isLockVisible(storageItem)) { + renderBlockEntity.toggleLockVisibility(); + } + if (renderBlockEntity.shouldShowTier() != StorageBlockItem.showsTier(storageItem)) { + renderBlockEntity.toggleTierVisiblity(); + } + renderBlockEntity.getStorageWrapper().getRenderInfo().deserializeFrom(EntityStorageHolder.getRenderInfoNbt(storageItem)); + if (renderBlockEntity.shouldShowUpgrades() != EntityStorageHolder.areUpgradesVisible(storageItem)) { + renderBlockEntity.toggleUpgradesVisiblity(); + } + if (storageItem.getItem() instanceof ITintableBlockItem tintableBlockItem) { + renderBlockEntity.getStorageWrapper().setMainColor(tintableBlockItem.getMainColor(storageItem).orElse(-1)); + renderBlockEntity.getStorageWrapper().setAccentColor(tintableBlockItem.getAccentColor(storageItem).orElse(-1)); + } + if (renderBlockEntity instanceof WoodStorageBlockEntity woodStorage) { + WoodStorageBlockItem.getWoodType(storageItem).ifPresent(woodType -> { + if (woodStorage.getWoodType() != WoodStorageBlockItem.getWoodType(storageItem)) { + woodStorage.setWoodType(woodType); + } + }); + boolean isPacked = WoodStorageBlockItem.isPacked(storageItem); + if (woodStorage.isPacked() != isPacked) { + woodStorage.setPacked(isPacked); + } + } + if (renderBlockEntity instanceof BarrelBlockEntity barrel) { + Map materials = BarrelBlockItem.getMaterials(storageItem); + if (!barrel.getMaterials().equals(materials)) { + barrel.setMaterials(materials); + } + barrel.setDynamicRenderTracker(new IDynamicRenderTracker() { + @Override + public boolean isDynamicRenderer() { + return true; + } + + @Override + public boolean isFullyDynamicRenderer() { + return true; + } + + @Override + public void onRenderInfoUpdated(RenderInfo ri) { + //noop + } + }); + } + } + } + + if (renderBlockEntity == null) { + renderBlockEntity = new ChestBlockEntity(BlockPos.ZERO, ModBlocks.CHEST.get().defaultBlockState()); + } + setRenderBlockEntity(renderBlockEntity); + } + return renderBlockEntity; + } + + public void onStorageItemSynced() { + renderBlockEntity = null; + storageWrapper = NoopStorageWrapper.INSTANCE; + } + + public InteractionResult openContainerMenu(Player player, IMovingStorageEntity storageEntity) { + ItemStack storageItem = storageEntity.getStorageItem(); + + player.openMenu(new SophisticatedMenuProvider((w, p, pl) -> { + if (isLimitedBarrel(storageItem)) { + return new MovingLimitedBarrelContainerMenu(w, pl, storageEntity.getId()); + } else { + return new MovingStorageContainerMenu(w, pl, storageEntity.getId()); + } + }, storageItem.getDisplayName(), false), buffer -> buffer.writeInt(storageEntity.getId())); + return player.level().isClientSide ? InteractionResult.SUCCESS : InteractionResult.CONSUME; + } + + public static boolean isLimitedBarrel(ItemStack storageItem) { + return storageItem.getItem() instanceof BlockItem blockItem && blockItem.getBlock() instanceof LimitedBarrelBlock; + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/IMovingStorageEntity.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/IMovingStorageEntity.java new file mode 100644 index 0000000..14a45ef --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/IMovingStorageEntity.java @@ -0,0 +1,16 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.entity; + +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.phys.Vec3; + +public interface IMovingStorageEntity { + Vec3 position(); + + int getId(); + + ItemStack getStorageItem(); + + void setStorageItem(ItemStack storageItem); + + EntityStorageHolder getStorageHolder(); +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/MovingStorageWrapper.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/MovingStorageWrapper.java new file mode 100644 index 0000000..67b9736 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/MovingStorageWrapper.java @@ -0,0 +1,436 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.entity; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.component.CustomData; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.p3pp3rf1y.sophisticatedcore.api.IStorageWrapper; +import net.p3pp3rf1y.sophisticatedcore.common.gui.SortBy; +import net.p3pp3rf1y.sophisticatedcore.init.ModCoreDataComponents; +import net.p3pp3rf1y.sophisticatedcore.inventory.*; +import net.p3pp3rf1y.sophisticatedcore.renderdata.RenderInfo; +import net.p3pp3rf1y.sophisticatedcore.settings.SettingsHandler; +import net.p3pp3rf1y.sophisticatedcore.settings.itemdisplay.ItemDisplaySettingsCategory; +import net.p3pp3rf1y.sophisticatedcore.settings.memory.MemorySettingsCategory; +import net.p3pp3rf1y.sophisticatedcore.settings.nosort.NoSortSettingsCategory; +import net.p3pp3rf1y.sophisticatedcore.upgrades.IUpgradeWrapper; +import net.p3pp3rf1y.sophisticatedcore.upgrades.UpgradeHandler; +import net.p3pp3rf1y.sophisticatedcore.upgrades.stack.StackUpgradeItem; +import net.p3pp3rf1y.sophisticatedcore.upgrades.voiding.VoidUpgradeWrapper; +import net.p3pp3rf1y.sophisticatedcore.util.BlockItemBase; +import net.p3pp3rf1y.sophisticatedcore.util.InventorySorter; +import net.p3pp3rf1y.sophisticatedcore.util.NoopStorageWrapper; +import net.p3pp3rf1y.sophisticatedstorage.Config; +import net.p3pp3rf1y.sophisticatedstorage.SophisticatedStorage; +import net.p3pp3rf1y.sophisticatedstorage.block.*; +import net.p3pp3rf1y.sophisticatedstorage.init.ModItems; +import net.p3pp3rf1y.sophisticatedstorage.item.BarrelBlockItem; +import net.p3pp3rf1y.sophisticatedstorage.item.ShulkerBoxItem; +import net.p3pp3rf1y.sophisticatedstorage.item.StorageBlockItem; +import net.p3pp3rf1y.sophisticatedstorage.settings.StorageSettingsHandler; +import net.p3pp3rf1y.sophisticatedstorageinmotion.data.MovingStorageData; + +import javax.annotation.Nullable; +import java.util.*; +import java.util.function.Consumer; + +public class MovingStorageWrapper implements IStorageWrapper { + public static final String SETTINGS_TAG = "settings"; + private final Runnable stackChangeHandler; + private final ItemStack storageStack; + private final Runnable contentsChangeHandler; + + @Nullable + private InventoryHandler inventoryHandler = null; + @Nullable + private InventoryIOHandler inventoryIOHandler = null; + @Nullable + private UpgradeHandler upgradeHandler = null; + + @Nullable + private SettingsHandler settingsHandler; + private final RenderInfo renderInfo; + + private final Map, Consumer> upgradeDefaultsHandlers = new HashMap<>(); + + + private MovingStorageWrapper(ItemStack storageStack, Runnable onContentsChanged, Runnable onStackChanged, Level level) { + this.storageStack = storageStack; + contentsChangeHandler = onContentsChanged; + stackChangeHandler = onStackChanged; + renderInfo = new MovingStorageRenderInfo(storageStack); + MovingStorageData.get(getContentsUuid().orElseGet(this::getNewUuid)); + + if (EntityStorageHolder.isLimitedBarrel(storageStack)) { + registerUpgradeDefaultsHandler(VoidUpgradeWrapper.class, LimitedBarrelBlockEntity.VOID_UPGRADE_VOIDING_OVERFLOW_OF_EVERYTHING_BY_DEFAULT); + } + } + + private static int getNumberOfDisplayItems(ItemStack stack) { + return stack.getItem() instanceof BarrelBlockItem ? 4 : 1; + } + + public static MovingStorageWrapper fromStack(ItemStack stack, Runnable onContentsChanged, Runnable onStackChanged, Level level) { + MovingStorageWrapper movingStorageWrapper = StorageWrapperRepository.getStorageWrapper(stack, MovingStorageWrapper.class, s -> new MovingStorageWrapper(s, onContentsChanged, onStackChanged, level)); + UUID uuid = stack.get(ModCoreDataComponents.STORAGE_UUID); + if (uuid != null) { + movingStorageWrapper.setContentsUuid(uuid); //setting here because client side the uuid isn't in contentsnbt before this data is synced from server and it would create a new one otherwise + } + + return movingStorageWrapper; + } + + private UUID getNewUuid() { + UUID newUuid = UUID.randomUUID(); + setContentsUuid(newUuid); + return newUuid; + } + + @Override + public void setContentsChangeHandler(Runnable contentsChangeHandler) { + //noop + } + + @Override + public int getNumberOfSlotRows() { + int itemInventorySlots = getNumberOfInventorySlots(); + return (int) Math.ceil(itemInventorySlots <= 81 ? (double) itemInventorySlots / 9 : (double) itemInventorySlots / 12); + } + + @Override + public ITrackedContentsItemHandler getInventoryForUpgradeProcessing() { + return getInventoryHandler(); + } + + @Override + public InventoryHandler getInventoryHandler() { + if (inventoryHandler == null) { + initInventoryHandler(); + } + return inventoryHandler; + } + + private void initInventoryHandler() { + inventoryHandler = new InventoryHandler(getNumberOfInventorySlots(), this, getContentsNbt(), contentsChangeHandler, StackUpgradeItem.getInventorySlotLimit(this), Config.SERVER.stackUpgrade) { + @Override + protected boolean isAllowed(ItemStack stack) { + return isAllowedInStorage(stack); + } + }; + inventoryHandler.addListener(getSettingsHandler().getTypeCategory(ItemDisplaySettingsCategory.class)::itemChanged); + inventoryHandler.setShouldInsertIntoEmpty(this::emptyInventorySlotsAcceptItems); + inventoryHandler.onInit(); + } + + private boolean emptyInventorySlotsAcceptItems() { + return !EntityStorageHolder.isLocked(storageStack) || allowsEmptySlotsMatchingItemInsertsWhenLocked(); + } + + private boolean allowsEmptySlotsMatchingItemInsertsWhenLocked() { + return true; //TODO add check for limited barrel and in that case return false + } + + public int getNumberOfInventorySlots() { + Integer numberOfInventorySlots = storageStack.get(ModCoreDataComponents.NUMBER_OF_INVENTORY_SLOTS); + if (numberOfInventorySlots != null) { + return numberOfInventorySlots; + } + numberOfInventorySlots = getDefaultNumberOfInventorySlots(); + storageStack.set(ModCoreDataComponents.NUMBER_OF_INVENTORY_SLOTS, numberOfInventorySlots); + stackChangeHandler.run(); + + return numberOfInventorySlots; + } + + @Override + public ITrackedContentsItemHandler getInventoryForInputOutput() { + if (inventoryIOHandler == null) { + inventoryIOHandler = new InventoryIOHandler(this); + } + return inventoryIOHandler.getFilteredItemHandler(); + } + + @Override + public SettingsHandler getSettingsHandler() { + if (settingsHandler == null) { + if (getContentsUuid().isPresent()) { + CompoundTag contentsNbt = getContentsNbt(); + if (!contentsNbt.contains(SETTINGS_TAG)) { + contentsNbt.put(SETTINGS_TAG, new CompoundTag()); + } + settingsHandler = new StorageSettingsHandler(contentsNbt.getCompound(SETTINGS_TAG), contentsChangeHandler, this::getInventoryHandler, () -> renderInfo) { + @Override + protected int getNumberOfDisplayItems() { + return MovingStorageWrapper.getNumberOfDisplayItems(storageStack); + } + + @Override + protected void saveCategoryNbt(CompoundTag settingsNbt, String categoryName, CompoundTag tag) { + super.saveCategoryNbt(settingsNbt, categoryName, tag); + contentsChangeHandler.run(); + if (categoryName.equals(ItemDisplaySettingsCategory.NAME)) { + stackChangeHandler.run(); + } + } + }; + } else { + settingsHandler = NoopStorageWrapper.INSTANCE.getSettingsHandler(); + } + } + return settingsHandler; + } + + @Override + public UpgradeHandler getUpgradeHandler() { + if (upgradeHandler == null) { + upgradeHandler = new UpgradeHandler(getNumberOfUpgradeSlots(), this, getContentsNbt(), contentsChangeHandler, () -> { + if (inventoryHandler != null) { + inventoryHandler.clearListeners(); + inventoryHandler.setBaseSlotLimit(StackUpgradeItem.getInventorySlotLimit(this)); + } + getInventoryHandler().addListener(getSettingsHandler().getTypeCategory(ItemDisplaySettingsCategory.class)::itemChanged); + inventoryIOHandler = null; + }) { + @Override + public boolean isItemValid(int slot, ItemStack stack) { + return super.isItemValid(slot, stack) && (stack.isEmpty() || SophisticatedStorage.MOD_ID.equals(BuiltInRegistries.ITEM.getKey(stack.getItem()).getNamespace()) || stack.is(ModItems.STORAGE_UPGRADE_TAG)); + } + }; + upgradeDefaultsHandlers.forEach(this::registerUpgradeDefaultsHandlerInUpgradeHandler); + } + return upgradeHandler; + } + + private void registerUpgradeDefaultsHandlerInUpgradeHandler(Class wrapperClass, Consumer defaultsHandler) { + //noinspection DataFlowIssue, unchecked - only called after upgradeHandler is initialized + upgradeHandler.registerUpgradeDefaultsHandler(wrapperClass, (Consumer) defaultsHandler); + } + + public int getNumberOfUpgradeSlots() { + @Nullable Integer numberOfUpgradeSlots = storageStack.get(ModCoreDataComponents.NUMBER_OF_UPGRADE_SLOTS); + if (numberOfUpgradeSlots != null) { + return numberOfUpgradeSlots; + } + numberOfUpgradeSlots = getDefaultNumberOfUpgradeSlots(); + storageStack.set(ModCoreDataComponents.NUMBER_OF_UPGRADE_SLOTS, numberOfUpgradeSlots); + stackChangeHandler.run(); + + return numberOfUpgradeSlots; + } + + @Override + public Optional getContentsUuid() { + return Optional.ofNullable(storageStack.get(ModCoreDataComponents.STORAGE_UUID)); + } + + private CompoundTag getContentsNbt() { + return MovingStorageData.get(getContentsUuid().orElseGet(this::getNewUuid)).getContents(); + } + + @Override + public int getMainColor() { + return StorageBlockItem.getMainColorFromStack(storageStack).orElse(-1); + } + + @Override + public int getAccentColor() { + return StorageBlockItem.getAccentColorFromStack(storageStack).orElse(-1); + } + + @Override + public Optional getOpenTabId() { + return Optional.ofNullable(storageStack.get(ModCoreDataComponents.OPEN_TAB_ID)); + } + + @Override + public void setOpenTabId(int openTabId) { + storageStack.set(ModCoreDataComponents.OPEN_TAB_ID, openTabId); + stackChangeHandler.run(); + } + + @Override + public void removeOpenTabId() { + storageStack.remove(ModCoreDataComponents.OPEN_TAB_ID); + stackChangeHandler.run(); + } + + @Override + public void setColors(int mainColor, int accentColor) { + storageStack.set(ModCoreDataComponents.MAIN_COLOR, mainColor); + storageStack.set(ModCoreDataComponents.ACCENT_COLOR, accentColor); + stackChangeHandler.run(); + } + + @Override + public void setSortBy(SortBy sortBy) { + storageStack.set(ModCoreDataComponents.SORT_BY, sortBy); + stackChangeHandler.run(); + } + + @Override + public SortBy getSortBy() { + return storageStack.getOrDefault(ModCoreDataComponents.SORT_BY, SortBy.NAME); + } + + @Override + public void sort() { + Set slotIndexesExcludedFromSort = new HashSet<>(); + slotIndexesExcludedFromSort.addAll(getSettingsHandler().getTypeCategory(NoSortSettingsCategory.class).getNoSortSlots()); + slotIndexesExcludedFromSort.addAll(getSettingsHandler().getTypeCategory(MemorySettingsCategory.class).getSlotIndexes()); + slotIndexesExcludedFromSort.addAll(getInventoryHandler().getNoSortSlots()); + InventorySorter.sortHandler(getInventoryHandler(), getComparator(), slotIndexesExcludedFromSort); + } + + private Comparator> getComparator() { + return switch (getSortBy()) { + case COUNT -> InventorySorter.BY_COUNT; + case TAGS -> InventorySorter.BY_TAGS; + case NAME -> InventorySorter.BY_NAME; + case MOD -> InventorySorter.BY_MOD; + }; + } + + @Override + public void onContentsNbtUpdated() { + inventoryHandler = null; + upgradeHandler = null; + refreshInventoryForUpgradeProcessing(); + } + + @Override + public void refreshInventoryForUpgradeProcessing() { + refreshInventoryForInputOutput(); + } + + @Override + public void refreshInventoryForInputOutput() { + inventoryIOHandler = null; + } + + @Override + public void setPersistent(boolean persistent) { + //noop + } + + @Override + public void fillWithLoot(Player playerEntity) { + //noop + } + + @Override + public RenderInfo getRenderInfo() { + return renderInfo; + } + + @Override + public void setColumnsTaken(int columnsTaken, boolean hasChanged) { + //noop - would require a change if there ever was support for this in storage which is not a plan + } + + @Override + public int getColumnsTaken() { + return 0; + } + + public void setContentsUuid(UUID contentsUuid) { + storageStack.set(ModCoreDataComponents.STORAGE_UUID, contentsUuid); + onContentsNbtUpdated(); + } + + public int getDefaultNumberOfInventorySlots() { + return storageStack.getItem() instanceof BlockItemBase blockItem && blockItem.getBlock() instanceof IStorageBlock storageBlock ? storageBlock.getNumberOfInventorySlots() : 0; + } + + private int getDefaultNumberOfUpgradeSlots() { + return storageStack.getItem() instanceof BlockItemBase blockItem && blockItem.getBlock() instanceof IStorageBlock storageBlock ? storageBlock.getNumberOfUpgradeSlots() : 0; + } + + private boolean isAllowedInStorage(ItemStack stack) { + if (!(storageStack.getItem() instanceof ShulkerBoxItem)) { + return true; + } + + Block block = Block.byItem(stack.getItem()); + return !(block instanceof ShulkerBoxBlock) && !(block instanceof net.minecraft.world.level.block.ShulkerBoxBlock) && !Config.SERVER.shulkerBoxDisallowedItems.isItemDisallowed(stack.getItem()); + } + + @Override + public String getStorageType() { + Item storageItem = storageStack.getItem(); + if (!(storageItem instanceof BlockItem blockItem)) { + return "undefined"; + } + + if (blockItem.getBlock() instanceof ChestBlock) { + return ChestBlockEntity.STORAGE_TYPE; + } else if (blockItem.getBlock() instanceof ShulkerBoxBlock) { + return ShulkerBoxBlockEntity.STORAGE_TYPE; + } else if (blockItem.getBlock() instanceof BarrelBlock) { + return BarrelBlockEntity.STORAGE_TYPE; + } else if (blockItem.getBlock() instanceof LimitedBarrelBlock) { + return LimitedBarrelBlockEntity.STORAGE_TYPE; + } + + return "undefined"; + } + + @Override + public Component getDisplayName() { + return storageStack.getDisplayName(); + } + + public void changeSize(int additionalInventorySlots, int additionalUpgradeSlots) { + setNumberOfInventorySlots(getNumberOfInventorySlots() + additionalInventorySlots); + getInventoryHandler().changeSlots(additionalInventorySlots); + + setNumberOfUpgradeSlots(getNumberOfUpgradeSlots() + additionalUpgradeSlots); + getUpgradeHandler().increaseSize(additionalUpgradeSlots); + } + + public void setNumberOfInventorySlots(int numberOfInventorySlots) { + storageStack.set(ModCoreDataComponents.NUMBER_OF_INVENTORY_SLOTS, numberOfInventorySlots); + stackChangeHandler.run(); + } + + public void setNumberOfUpgradeSlots(int numberOfUpgradeSlots) { + storageStack.set(ModCoreDataComponents.NUMBER_OF_UPGRADE_SLOTS, numberOfUpgradeSlots); + stackChangeHandler.run(); + } + + //TODO need this to be called for limited barrels when initialized - probably check for item in fromStack method here? + public void registerUpgradeDefaultsHandler(Class upgradeClass, Consumer defaultsHandler) { + upgradeDefaultsHandlers.put(upgradeClass, defaultsHandler); + } + + @Override + public ItemStack getWrappedStorageStack() { + return storageStack; + } + + @Override + public int getBaseStackSizeMultiplier() { + return storageStack.getItem() instanceof BlockItem blockItem && blockItem.getBlock() instanceof IStorageBlock storageBlock ? storageBlock.getBaseStackSizeMultiplier() : 1; + } + + private class MovingStorageRenderInfo extends RenderInfo { + public MovingStorageRenderInfo(ItemStack storageStack) { + super(() -> MovingStorageWrapper.this.stackChangeHandler, EntityStorageHolder.isLimitedBarrel(storageStack)); + deserialize(); + } + + @Override + protected void serializeRenderInfo(CompoundTag renderInfo) { + MovingStorageWrapper.this.storageStack.set(ModCoreDataComponents.RENDER_INFO_TAG, CustomData.of(renderInfo)); + } + + @Override + protected Optional getRenderInfoTag() { + return Optional.ofNullable(MovingStorageWrapper.this.storageStack.get(ModCoreDataComponents.RENDER_INFO_TAG.get())).map(CustomData::copyTag); } + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/StorageMinecart.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/StorageMinecart.java new file mode 100644 index 0000000..3e3fd03 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/StorageMinecart.java @@ -0,0 +1,131 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.entity; + +import net.minecraft.core.component.DataComponents; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.Component; +import net.minecraft.network.syncher.EntityDataAccessor; +import net.minecraft.network.syncher.EntityDataSerializers; +import net.minecraft.network.syncher.SynchedEntityData; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.vehicle.MinecartChest; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.GameRules; +import net.minecraft.world.level.Level; +import net.p3pp3rf1y.sophisticatedcore.util.SimpleItemContent; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModDataComponents; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModEntities; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModItems; +import org.jetbrains.annotations.Nullable; + +import java.util.Optional; + +public class StorageMinecart extends MinecartChest implements IMovingStorageEntity { + private static final EntityDataAccessor> DATA_CUSTOM_NAME = SynchedEntityData.defineId(StorageMinecart.class, EntityDataSerializers.OPTIONAL_COMPONENT); + static final EntityDataAccessor DATA_STORAGE_ITEM = SynchedEntityData.defineId(StorageMinecart.class, EntityDataSerializers.ITEM_STACK); + + private final EntityStorageHolder entityStorageHolder; + + public StorageMinecart(EntityType entityType, Level level) { + super(entityType, level); + entityStorageHolder = new EntityStorageHolder<>(this); + } + + private StorageMinecart(Level level) { + this(ModEntities.STORAGE_MINECART.get(), level); + } + + + @Override + protected void defineSynchedData(SynchedEntityData.Builder builder) { + super.defineSynchedData(builder); + builder.define(DATA_STORAGE_ITEM, ItemStack.EMPTY); + builder.define(DATA_CUSTOM_NAME, Optional.empty()); + } + + @Override + public ItemStack getStorageItem() { + return this.entityData.get(DATA_STORAGE_ITEM); + } + + @Override + public void setStorageItem(ItemStack storageItem) { + this.entityData.set(DATA_STORAGE_ITEM, storageItem.copy()); + } + + @Override + public EntityStorageHolder getStorageHolder() { + return entityStorageHolder; + } + + public StorageMinecart(Level level, double x, double y, double z) { + this(level); + this.setPos(x, y, z); + this.xo = x; + this.yo = y; + this.zo = z; + } + + @Override + public void destroy(DamageSource source) { + this.kill(); + if (level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) { + ItemStack drop = new ItemStack(ModItems.STORAGE_MINECART.get()); + drop.set(ModDataComponents.STORAGE_ITEM, SimpleItemContent.copyOf(getStorageItem())); + drop.set(DataComponents.CUSTOM_NAME, getCustomName()); + spawnAtLocation(drop); + entityStorageHolder.dropAllItems(); + } + } + + + @Override + protected void addAdditionalSaveData(CompoundTag tag) { + super.addAdditionalSaveData(tag); + tag.put("storageHolder", entityStorageHolder.saveData(level().registryAccess())); + } + + + @Override + protected void readAdditionalSaveData(CompoundTag tag) { + super.readAdditionalSaveData(tag); + entityStorageHolder.readData(level().registryAccess(), tag.getCompound("storageHolder")); + } + + @Override + public void tick() { + super.tick(); + entityStorageHolder.tick(); + } + + @Override + public void onSyncedDataUpdated(EntityDataAccessor key) { + super.onSyncedDataUpdated(key); + if (key == DATA_STORAGE_ITEM && level().isClientSide()) { + entityStorageHolder.onStorageItemSynced(); + } + } + + @Override + public void setCustomName(@Nullable Component customName) { + entityData.set(DATA_CUSTOM_NAME, Optional.ofNullable(customName)); + } + + @Override + public Component getCustomName() { + return entityData.get(DATA_CUSTOM_NAME).orElseGet(() -> getStorageItem().getHoverName()); + } + + @Override + public InteractionResult interact(Player player, InteractionHand hand) { + return getStorageHolder().openContainerMenu(player, this); + } + + @Override + public InteractionResult interactWithContainerVehicle(Player player) { + return super.interactWithContainerVehicle(player); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/package-info.java new file mode 100644 index 0000000..6977eca --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/entity/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedstorageinmotion.entity; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModDataComponents.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModDataComponents.java new file mode 100644 index 0000000..2f7cdc4 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModDataComponents.java @@ -0,0 +1,35 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.init; + +import com.mojang.serialization.Codec; +import net.minecraft.core.component.DataComponentType; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.network.codec.ByteBufCodecs; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; +import net.p3pp3rf1y.sophisticatedcore.util.SimpleItemContent; +import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion; + +import java.util.function.Supplier; + +public class ModDataComponents { + private ModDataComponents() { + } + + private static final DeferredRegister> DATA_COMPONENT_TYPES = DeferredRegister.create(BuiltInRegistries.DATA_COMPONENT_TYPE, SophisticatedStorageInMotion.MOD_ID); + + public static final Supplier> STORAGE_ITEM = DATA_COMPONENT_TYPES.register("storage_item", + () -> new DataComponentType.Builder().persistent(SimpleItemContent.CODEC).networkSynchronized(SimpleItemContent.STREAM_CODEC).build()); + + public static final Supplier> LOCKED = DATA_COMPONENT_TYPES.register("locked", + () -> new DataComponentType.Builder().persistent(Codec.BOOL).networkSynchronized(ByteBufCodecs.BOOL).build()); + + public static final Supplier> LOCK_VISIBLE = DATA_COMPONENT_TYPES.register("lock_visible", + () -> new DataComponentType.Builder().persistent(Codec.BOOL).networkSynchronized(ByteBufCodecs.BOOL).build()); + + public static final Supplier> UPGRADES_VISIBLE = DATA_COMPONENT_TYPES.register("upgrades_visible", + () -> new DataComponentType.Builder().persistent(Codec.BOOL).networkSynchronized(ByteBufCodecs.BOOL).build()); + + public static void register(IEventBus modBus) { + DATA_COMPONENT_TYPES.register(modBus); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModEntities.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModEntities.java new file mode 100644 index 0000000..9c890e2 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModEntities.java @@ -0,0 +1,45 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.init; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.MobCategory; +import net.minecraft.world.inventory.MenuType; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; +import net.neoforged.neoforge.registries.DeferredRegister; +import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingLimitedBarrelContainerMenu; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingLimitedBarrelSettingsContainerMenu; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingStorageContainerMenu; +import net.p3pp3rf1y.sophisticatedstorageinmotion.common.gui.MovingStorageSettingsContainerMenu; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.StorageMinecart; + +import java.util.function.Supplier; + +public class ModEntities { + private ModEntities() { + } + + private static final DeferredRegister> MENU_TYPES = DeferredRegister.create(BuiltInRegistries.MENU, SophisticatedStorageInMotion.MOD_ID); + + public static final DeferredRegister> ENTITY_TYPES = DeferredRegister.create(BuiltInRegistries.ENTITY_TYPE, SophisticatedStorageInMotion.MOD_ID); + + public static final Supplier> STORAGE_MINECART = ENTITY_TYPES.register("storage_minecart", () -> EntityType.Builder.of((EntityType.EntityFactory) StorageMinecart::new, MobCategory.MISC).sized(0.98F, 0.7F).clientTrackingRange(8).passengerAttachments(0.1875F).build(SophisticatedStorageInMotion.MOD_ID + ":storage_minecart")); + + public static final Supplier> MOVING_STORAGE_CONTAINER_TYPE = MENU_TYPES.register("moving_storage", + () -> IMenuTypeExtension.create(MovingStorageContainerMenu::fromBuffer)); + + public static final Supplier> MOVING_STORAGE_SETTINGS_CONTAINER_TYPE = MENU_TYPES.register("moving_storage_settings", + () -> IMenuTypeExtension.create(MovingStorageSettingsContainerMenu::fromBuffer)); + + public static final Supplier> MOVING_LIMITED_BARREL_CONTAINER_TYPE = MENU_TYPES.register("moving_limited_barrel", + () -> IMenuTypeExtension.create(MovingLimitedBarrelContainerMenu::fromBuffer)); + + public static final Supplier> MOVING_LIMITED_BARREL_SETTINGS_CONTAINER_TYPE = MENU_TYPES.register("moving_limited_barrel_settings", + () -> IMenuTypeExtension.create(MovingLimitedBarrelSettingsContainerMenu::fromBuffer)); + + public static void registerHandlers(IEventBus modBus) { + ENTITY_TYPES.register(modBus); + MENU_TYPES.register(modBus); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModEntitiesClient.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModEntitiesClient.java new file mode 100644 index 0000000..cd3b85b --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModEntitiesClient.java @@ -0,0 +1,28 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.init; + +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.client.event.EntityRenderersEvent; +import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent; +import net.p3pp3rf1y.sophisticatedstorageinmotion.client.StorageMinecartRenderer; +import net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui.MovingLimitedBarrelScreen; +import net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui.MovingLimitedBarrelSettingsScreen; +import net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui.MovingStorageScreen; +import net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui.MovingStorageSettingsScreen; + +public class ModEntitiesClient { + public static void registerHandlers(IEventBus modBus) { + modBus.addListener(ModEntitiesClient::registerEntityRenderers); + modBus.addListener(ModEntitiesClient::onMenuScreenRegister); + } + + private static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderers event) { + event.registerEntityRenderer(ModEntities.STORAGE_MINECART.get(), StorageMinecartRenderer::new); + } + + private static void onMenuScreenRegister(RegisterMenuScreensEvent event) { + event.register(ModEntities.MOVING_STORAGE_CONTAINER_TYPE.get(), MovingStorageScreen::constructScreen); + event.register(ModEntities.MOVING_STORAGE_SETTINGS_CONTAINER_TYPE.get(), MovingStorageSettingsScreen::constructScreen); + event.register(ModEntities.MOVING_LIMITED_BARREL_CONTAINER_TYPE.get(), MovingLimitedBarrelScreen::new); + event.register(ModEntities.MOVING_LIMITED_BARREL_SETTINGS_CONTAINER_TYPE.get(), MovingLimitedBarrelSettingsScreen::new); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModItems.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModItems.java new file mode 100644 index 0000000..8dc7628 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModItems.java @@ -0,0 +1,43 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.init; + +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.attachment.AttachmentType; +import net.neoforged.neoforge.registries.DeferredRegister; +import net.neoforged.neoforge.registries.NeoForgeRegistries; +import net.p3pp3rf1y.sophisticatedcore.util.ItemBase; +import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion; +import net.p3pp3rf1y.sophisticatedstorageinmotion.item.StorageMinecartItem; + +import java.util.function.Supplier; + +public class ModItems { + private ModItems() { + } + + public static final DeferredRegister ITEMS = DeferredRegister.create(BuiltInRegistries.ITEM, SophisticatedStorageInMotion.MOD_ID); + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB.location(), SophisticatedStorageInMotion.MOD_ID); + + public static final Supplier STORAGE_MINECART = ITEMS.register("storage_minecart", StorageMinecartItem::new); + + private static final DeferredRegister> ATTACHMENT_TYPES = DeferredRegister.create(NeoForgeRegistries.Keys.ATTACHMENT_TYPES, SophisticatedStorageInMotion.MOD_ID); + + public static Supplier CREATIVE_TAB = CREATIVE_MODE_TABS.register("main", () -> + CreativeModeTab.builder().icon(() -> new ItemStack(STORAGE_MINECART.get())) + .title(Component.translatable("itemGroup.sophisticatedstorageinmotion")) + .displayItems((featureFlags, output) -> { + ITEMS.getEntries().stream().filter(i -> i.get() instanceof ItemBase).forEach(i -> ((ItemBase) i.get()).addCreativeTabItems(output::accept)); + }) + .build()); + + public static void registerHandlers(IEventBus modBus) { + ITEMS.register(modBus); + CREATIVE_MODE_TABS.register(modBus); + ATTACHMENT_TYPES.register(modBus); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModPayloads.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModPayloads.java new file mode 100644 index 0000000..f22eb35 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModPayloads.java @@ -0,0 +1,18 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.init; + +import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent; +import net.neoforged.neoforge.network.registration.PayloadRegistrar; +import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion; +import net.p3pp3rf1y.sophisticatedstorageinmotion.network.MovingStorageContentsPayload; +import net.p3pp3rf1y.sophisticatedstorageinmotion.network.OpenMovingStorageInventoryPayload; + +public class ModPayloads { + private ModPayloads() { + } + + public static void registerPayloads(final RegisterPayloadHandlersEvent event) { + final PayloadRegistrar registrar = event.registrar(SophisticatedStorageInMotion.MOD_ID).versioned("1.0"); + registrar.playToServer(OpenMovingStorageInventoryPayload.TYPE, OpenMovingStorageInventoryPayload.STREAM_CODEC, OpenMovingStorageInventoryPayload::handlePayload); + registrar.playToClient(MovingStorageContentsPayload.TYPE, MovingStorageContentsPayload.STREAM_CODEC, MovingStorageContentsPayload::handlePayload); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/package-info.java new file mode 100644 index 0000000..7ab50e5 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedstorageinmotion.init; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/StorageMinecartItem.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/StorageMinecartItem.java new file mode 100644 index 0000000..3691724 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/StorageMinecartItem.java @@ -0,0 +1,86 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.BaseRailBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.RailShape; +import net.minecraft.world.level.block.state.properties.WoodType; +import net.minecraft.world.level.gameevent.GameEvent; +import net.p3pp3rf1y.sophisticatedcore.Config; +import net.p3pp3rf1y.sophisticatedcore.util.ItemBase; +import net.p3pp3rf1y.sophisticatedcore.util.SimpleItemContent; +import net.p3pp3rf1y.sophisticatedstorage.block.ITintableBlockItem; +import net.p3pp3rf1y.sophisticatedstorage.init.ModBlocks; +import net.p3pp3rf1y.sophisticatedstorage.item.WoodStorageBlockItem; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.StorageMinecart; +import net.p3pp3rf1y.sophisticatedstorageinmotion.init.ModDataComponents; + +import java.util.function.Consumer; + +public class StorageMinecartItem extends ItemBase { + public StorageMinecartItem() { + super(new Properties().stacksTo(1)); + } + + @Override + public void addCreativeTabItems(Consumer itemConsumer) { + if (Config.COMMON.enabledItems.isItemEnabled(this)) { + itemConsumer.accept(createWithStorage(WoodStorageBlockItem.setWoodType(new ItemStack(ModBlocks.BARREL_ITEM.get()), WoodType.SPRUCE))); + ItemStack limitedIStack = new ItemStack(ModBlocks.LIMITED_GOLD_BARREL_1_ITEM.get()); + if (limitedIStack.getItem() instanceof ITintableBlockItem tintableBlockItem) { + tintableBlockItem.setAccentColor(limitedIStack, 0xFF_EEEEEE); + tintableBlockItem.setMainColor(limitedIStack, 0xFF_222222); + } + itemConsumer.accept(createWithStorage(limitedIStack)); + itemConsumer.accept(createWithStorage(WoodStorageBlockItem.setWoodType(new ItemStack(ModBlocks.LIMITED_COPPER_BARREL_2.get()), WoodType.BIRCH))); + itemConsumer.accept(createWithStorage(WoodStorageBlockItem.setWoodType(new ItemStack(ModBlocks.LIMITED_IRON_BARREL_3.get()), WoodType.ACACIA))); + itemConsumer.accept(createWithStorage(WoodStorageBlockItem.setWoodType(new ItemStack(ModBlocks.LIMITED_DIAMOND_BARREL_4.get()), WoodType.CRIMSON))); + itemConsumer.accept(createWithStorage(WoodStorageBlockItem.setWoodType(new ItemStack(ModBlocks.NETHERITE_CHEST_ITEM.get()), WoodType.BAMBOO))); + itemConsumer.accept(createWithStorage(new ItemStack(ModBlocks.IRON_SHULKER_BOX_ITEM.get()))); + } + } + + + private ItemStack createWithStorage(ItemStack storageStack) { + ItemStack stack = new ItemStack(this); + stack.set(ModDataComponents.STORAGE_ITEM, SimpleItemContent.copyOf(storageStack)); + return stack; + } + + @Override + public InteractionResult useOn(UseOnContext context) { + Level level = context.getLevel(); + BlockPos blockpos = context.getClickedPos(); + BlockState blockstate = level.getBlockState(blockpos); + if (!blockstate.is(BlockTags.RAILS)) { + return InteractionResult.FAIL; + } else { + ItemStack stack = context.getItemInHand(); + if (level instanceof ServerLevel serverlevel) { + RailShape railshape = blockstate.getBlock() instanceof BaseRailBlock baseRailBlock ? baseRailBlock.getRailDirection(blockstate, level, blockpos, null) : RailShape.NORTH_SOUTH; + double ascendingOffset = 0.0; + if (railshape.isAscending()) { + ascendingOffset = 0.5; + } + + StorageMinecart minecart = new StorageMinecart(level, blockpos.getX() + 0.5, blockpos.getY() + 0.0625 + ascendingOffset, blockpos.getZ() + 0.5); + minecart.getStorageHolder().setStorageItemFrom(stack); + EntityType.createDefaultStackConfig(serverlevel, stack, context.getPlayer()).accept(minecart); + + serverlevel.addFreshEntity(minecart); + serverlevel.gameEvent(GameEvent.ENTITY_PLACE, blockpos, GameEvent.Context.of(context.getPlayer(), serverlevel.getBlockState(blockpos.below()))); + } + + stack.shrink(1); + return InteractionResult.sidedSuccess(level.isClientSide); + } + } + +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/package-info.java new file mode 100644 index 0000000..2b36021 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/item/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedstorageinmotion.item; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/MovingStorageContentsPayload.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/MovingStorageContentsPayload.java new file mode 100644 index 0000000..b1a2e25 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/MovingStorageContentsPayload.java @@ -0,0 +1,32 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.core.UUIDUtil; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.neoforged.neoforge.network.handling.IPayloadContext; +import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion; +import net.p3pp3rf1y.sophisticatedstorageinmotion.data.MovingStorageData; + +import java.util.UUID; + +public record MovingStorageContentsPayload(UUID storageUuid, CompoundTag contents) implements CustomPacketPayload { + public static final Type TYPE = new Type<>(SophisticatedStorageInMotion.getRL("storage_contents")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + UUIDUtil.STREAM_CODEC, + MovingStorageContentsPayload::storageUuid, + ByteBufCodecs.COMPOUND_TAG, + MovingStorageContentsPayload::contents, + MovingStorageContentsPayload::new); + + @Override + public Type type() { + return TYPE; + } + + public static void handlePayload(MovingStorageContentsPayload payload, IPayloadContext context) { + MovingStorageData.get(payload.storageUuid).setContents(payload.storageUuid, payload.contents); + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/OpenMovingStorageInventoryPayload.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/OpenMovingStorageInventoryPayload.java new file mode 100644 index 0000000..04d5efc --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/OpenMovingStorageInventoryPayload.java @@ -0,0 +1,30 @@ +package net.p3pp3rf1y.sophisticatedstorageinmotion.network; + +import io.netty.buffer.ByteBuf; +import net.minecraft.network.codec.ByteBufCodecs; +import net.minecraft.network.codec.StreamCodec; +import net.minecraft.network.protocol.common.custom.CustomPacketPayload; +import net.minecraft.world.entity.player.Player; +import net.neoforged.neoforge.network.handling.IPayloadContext; +import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion; +import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.IMovingStorageEntity; + +public record OpenMovingStorageInventoryPayload(int entityId) implements CustomPacketPayload { + public static final Type TYPE = new Type<>(SophisticatedStorageInMotion.getRL("open_storage_inventory")); + public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + ByteBufCodecs.INT, + OpenMovingStorageInventoryPayload::entityId, + OpenMovingStorageInventoryPayload::new); + + @Override + public Type type() { + return TYPE; + } + + public static void handlePayload(OpenMovingStorageInventoryPayload payload, IPayloadContext context) { + Player player = context.player(); + if (player.level().getEntity(payload.entityId()) instanceof IMovingStorageEntity storageEntity) { + storageEntity.getStorageHolder().openContainerMenu(player, storageEntity); + } + } +} diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/package-info.java new file mode 100644 index 0000000..735f7e2 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedstorageinmotion.network; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/package-info.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/package-info.java new file mode 100644 index 0000000..c6232d4 --- /dev/null +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/package-info.java @@ -0,0 +1,8 @@ +// Auto generated package-info by MCP + +@ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault +package net.p3pp3rf1y.sophisticatedstorageinmotion; + +import net.minecraft.MethodsReturnNonnullByDefault; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/assets/sophisticatedstorageinmotion/lang/en_us.json b/src/main/resources/assets/sophisticatedstorageinmotion/lang/en_us.json new file mode 100644 index 0000000..46e4eb6 --- /dev/null +++ b/src/main/resources/assets/sophisticatedstorageinmotion/lang/en_us.json @@ -0,0 +1,5 @@ +{ + "itemGroup.sophisticatedstorageinmotion": "Sophisticated Storage In Motion", + "item.sophisticatedstorageinmotion.storage_minecart": "Storage Minecart", + "entity.sophisticatedstorageinmotion.storage_minecart": "Storage Minecart" +} \ No newline at end of file diff --git a/src/main/resources/assets/sophisticatedstorageinmotion/models/item/storage_minecart.json b/src/main/resources/assets/sophisticatedstorageinmotion/models/item/storage_minecart.json new file mode 100644 index 0000000..e3dda70 --- /dev/null +++ b/src/main/resources/assets/sophisticatedstorageinmotion/models/item/storage_minecart.json @@ -0,0 +1,35 @@ +{ + "parent": "builtin/entity", + "display": { + "gui": { + "rotation": [ 30, 45, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "ground": { + "rotation": [ 0, 0, 0 ], + "translation": [ 0, 3, 0], + "scale":[ 0.25, 0.25, 0.25 ] + }, + "head": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 1, 1, 1] + }, + "fixed": { + "rotation": [ 0, 180, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.5, 0.5, 0.5 ] + }, + "thirdperson_righthand": { + "rotation": [ 75, 315, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "firstperson_righthand": { + "rotation": [ 0, 315, 0 ], + "translation": [ 0, 0, 0], + "scale": [ 0.4, 0.4, 0.4 ] + } + } +} \ 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..117bd7a --- /dev/null +++ b/src/main/templates/META-INF/neoforge.mods.toml @@ -0,0 +1,46 @@ +modLoader="javafml" #mandatory +loaderVersion="${loader_version_range}" #mandatory + +license="${mod_license}" +issueTrackerURL="${mod_issue_tracker_url}" + +[[mods]] +modId="${mod_id}" +version="${mod_version}" +displayName="${mod_name}" +displayURL="${mod_display_url}" +logoFile="${mod_logo_file}" +credits="${mod_credits}" +authors="${mod_authors}" +description='''${mod_description}''' + +[[accessTransformers]] +file="META-INF/accesstransformer.cfg" + +[[dependencies.${mod_id}]] +modId="sophisticatedstorage" +type="required" +versionRange="${ss_version}" +ordering="NONE" +side="BOTH" + +[[dependencies.${mod_id}]] +modId="jei" +type="optional" +versionRange="${jei_version_range}" +ordering="NONE" +side="CLIENT" + +[[dependencies.${mod_id}]] +modId="neoforge" +type="required" +versionRange="${neo_version_range}" +ordering="NONE" +side="BOTH" + +[[dependencies.${mod_id}]] +modId="minecraft" +type="required" +versionRange="${minecraft_version_range}" +ordering="NONE" +side="BOTH"