"+EnoughMemoryClient.getWarningMessage()[1]+"
", JLabel.CENTER); + JLabel message = new JLabel(""+ LoadSupportClient.getWarningMessage()[1]+"
", JLabel.CENTER); JButton exitButton = new JButton("OK"); exitButton.addActionListener(e -> { window.dispose(); - minecraftClient.scheduleStop(); + minecraftClient.stop(); }); window.setLayout(new BorderLayout()); @@ -50,10 +51,9 @@ public class EMWindow { }); } } catch (RuntimeException e) { - EnoughMemory.logger.error(String.valueOf(e)); + LoadSupport.logger.error(String.valueOf(e)); } } - @Environment(EnvType.CLIENT) public static class BlockedScreen extends Screen { protected BlockedScreen() { @@ -74,8 +74,8 @@ public class EMWindow { public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); - String title = EnoughMemoryClient.getWarningMessage()[0]; - String body = EnoughMemoryClient.getWarningMessage()[1]; + String title = LoadSupportClient.getWarningMessage()[0]; + String body = LoadSupportClient.getWarningMessage()[1]; int lineHeight = textRenderer.fontHeight + 5; int maxTextWidth = width - 40; @@ -94,6 +94,5 @@ public class EMWindow { context.drawCenteredTextWithShadow(textRenderer, line, width / 2, bodyStartY + (i * lineHeight), 0xffffff); } } - } } diff --git a/fabric/src/client/java/com/vaporvee/loadsupport/LoadNotifier.java b/fabric/src/client/java/com/vaporvee/loadsupport/LoadNotifier.java new file mode 100644 index 0000000..c80584e --- /dev/null +++ b/fabric/src/client/java/com/vaporvee/loadsupport/LoadNotifier.java @@ -0,0 +1,16 @@ +package com.vaporvee.loadsupport; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.sound.PositionedSoundInstance; +import net.minecraft.sound.SoundEvents; + +public class LoadNotifier { + static boolean wasPlayed = false; + public static void notifySound(MinecraftClient client){ + if(LoadSupportClient.config.startSound && !wasPlayed) { + wasPlayed = true; + client.getSoundManager().play( + PositionedSoundInstance.master(SoundEvents.UI_TOAST_CHALLENGE_COMPLETE, 1.0F) // Use any sound event you like + ); + } + } +} diff --git a/fabric/src/client/java/com/vaporvee/loadsupport/LoadSupportClient.java b/fabric/src/client/java/com/vaporvee/loadsupport/LoadSupportClient.java new file mode 100644 index 0000000..74931c8 --- /dev/null +++ b/fabric/src/client/java/com/vaporvee/loadsupport/LoadSupportClient.java @@ -0,0 +1,38 @@ +package com.vaporvee.loadsupport; + +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.AccessibilityOnboardingScreen; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.TitleScreen; + +public class LoadSupportClient implements ClientModInitializer { + public static LSConfig config; + private static float allocatedMemoryInGB; + @Override + public void onInitializeClient() { + AutoConfig.register(LSConfig.class, Toml4jConfigSerializer::new); + config = AutoConfig.getConfigHolder(LSConfig.class).getConfig(); + allocatedMemoryInGB = Runtime.getRuntime().totalMemory() / 1073741824f; // Hardcoded value for GB + LoadSupport.logger.info(String.format("Allocated Memory: %.1f GB", allocatedMemoryInGB)); + ScreenEvents.BEFORE_INIT.register(LoadSupportClient::beforeWindowInit); + } + + public static String[] getWarningMessage(){ + return new String[]{config.errorTitle, config.errorDescription + .replace("{minMemory}", String.valueOf(config.minMemory)) + .replace("{currentMemory}", String.format("%.1f", allocatedMemoryInGB))}; + }; + private static void beforeWindowInit(MinecraftClient minecraftClient, Screen screen, int i, int i1) { + if(config.minMemory > allocatedMemoryInGB){ + System.setProperty("java.awt.headless", "false"); // Hacky stupid thing but it works I guess... + LSWindow.createWindow(minecraftClient, screen); + } + if (screen instanceof TitleScreen || screen instanceof AccessibilityOnboardingScreen){ + LoadNotifier.notifySound(minecraftClient); + } + } +} \ No newline at end of file diff --git a/fabric/src/main/java/com/vaporvee/enoughmemory/EnoughMemory.java b/fabric/src/main/java/com/vaporvee/loadsupport/LoadSupport.java similarity index 58% rename from fabric/src/main/java/com/vaporvee/enoughmemory/EnoughMemory.java rename to fabric/src/main/java/com/vaporvee/loadsupport/LoadSupport.java index 814abce..d90466f 100644 --- a/fabric/src/main/java/com/vaporvee/enoughmemory/EnoughMemory.java +++ b/fabric/src/main/java/com/vaporvee/loadsupport/LoadSupport.java @@ -1,4 +1,4 @@ -package com.vaporvee.enoughmemory; +package com.vaporvee.loadsupport; import net.fabricmc.api.EnvType; import net.fabricmc.api.ModInitializer; @@ -7,10 +7,10 @@ import net.fabricmc.loader.api.FabricLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class EnoughMemory implements ModInitializer { - public static final String MOD_ID = "enoughmemory"; +public class LoadSupport implements ModInitializer { + public static final String MOD_ID = "loadsupport"; - public static final Logger logger = LoggerFactory.getLogger("EnoughMemory"); + public static final Logger logger = LoggerFactory.getLogger("Load Support"); @Override public void onInitialize() { @@ -18,6 +18,6 @@ public class EnoughMemory implements ModInitializer { logger.info(MOD_ID + " is a client mod only!"); return; } - logger.info("Loading EnoughMemory mod."); + logger.info("Loading Load Support mod."); } } \ No newline at end of file diff --git a/fabric/src/main/resources/assets/enoughmemory/icon.png b/fabric/src/main/resources/assets/loadsupport/icon.png similarity index 100% rename from fabric/src/main/resources/assets/enoughmemory/icon.png rename to fabric/src/main/resources/assets/loadsupport/icon.png diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 20bfa60..1435052 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -1,46 +1,42 @@ { - "schemaVersion": 1, - "id": "enoughmemory", - "version": "${version}", - "name": "Enough Memory", - "description": "It will show the user when they have set too less Java Memory. The amount of required memory can be adjusted with the config.", - "authors": [ - { - "name": "vaporvee", - "contact": { - "homepage" : "https://vaporvee.com" - } - } - ], - "contact": { - "sources": "https://github.com/vaporvee/EnoughMemory", - "issues": "https://github.com/vaporvee/EnoughMemory/issues" - }, - "custom": { - "modmenu": { - "links": { - "modmenu.discord": "https://discord.gg/StMHnsC9s2" - } - } - }, - "license": "Apache License 2.0", - "icon": "assets/enoughmemory/icon.png", - "environment": "*", - "entrypoints": { - "main": [ - "com.vaporvee.enoughmemory.EnoughMemory" - ], - "client": [ - "com.vaporvee.enoughmemory.EnoughMemoryClient" - ] - }, - "depends": { - "fabricloader": ">=0.16.5", - "minecraft": "~1.21.1", - "java": ">=21", - "fabric-api": "*" - }, - "suggests": { - "another-mod": "*" - } -} \ No newline at end of file + "schemaVersion": 1, + "id": "loadsupport", + "version": "${version}", + "name": "Load Support", + "description": "Shows when the user has to less Java memory allocated, and plays a sound when the game has loaded.", + "authors": [ + { + "name": "vaporvee", + "contact": { + "homepage": "https://vaporvee.com" + } + } + ], + "contact": { + "sources": "https://github.com/vaporvee/EnoughMemory", + "issues": "https://github.com/vaporvee/EnoughMemory/issues" + }, + "custom": { + "modmenu": { + "links": { + "modmenu.discord": "https://discord.gg/StMHnsC9s2" + } + } + }, + "license": "Apache License 2.0", + "icon": "assets/loadsupport/icon.png", + "environment": "*", + "entrypoints": { + "main": ["com.vaporvee.loadsupport.LoadSupport"], + "client": ["com.vaporvee.loadsupport.LoadSupportClient"] + }, + "depends": { + "fabricloader": ">=0.16.5", + "minecraft": "~1.21.1", + "java": ">=21", + "fabric-api": "*" + }, + "suggests": { + "another-mod": "*" + } +} diff --git a/fabric/src/main/resources/enoughmemory.mixins.json b/fabric/src/main/resources/loadsupport.mixins.json similarity index 67% rename from fabric/src/main/resources/enoughmemory.mixins.json rename to fabric/src/main/resources/loadsupport.mixins.json index c4871d6..8fbaf89 100644 --- a/fabric/src/main/resources/enoughmemory.mixins.json +++ b/fabric/src/main/resources/loadsupport.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.vaporvee.enoughmemory.mixin", + "package": "com.vaporvee.loadsupport.mixin", "compatibilityLevel": "JAVA_21", "injectors": { "defaultRequire": 1 diff --git a/neoforge/.gitattributes b/neoforge/.gitattributes new file mode 100644 index 0000000..f811f6a --- /dev/null +++ b/neoforge/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/cache text eol=lf +src/generated/**/*.json text eol=lf diff --git a/neoforge/.gitignore b/neoforge/.gitignore index 5756d48..31d2550 100644 --- a/neoforge/.gitignore +++ b/neoforge/.gitignore @@ -1,36 +1,26 @@ -# gradle - -.gradle/ -build/ -out/ -classes/ - # eclipse - +bin *.launch - -# idea - -fabric/.idea/ -*.iml -*.ipr -*.iws - -# vscode - -.settings/ -.vscode/ -bin/ +.settings +.metadata .classpath .project -# macos +# idea +out +*.ipr +*.iws +*.iml +.idea -*.DS_Store +# gradle +build +.gradle -# java +# other +eclipse +run +runs +run-data -hs_err_*.log -replay_*.log -*.hprof -*.jfr +repo \ No newline at end of file diff --git a/neoforge/README.md b/neoforge/README.md new file mode 100644 index 0000000..b421122 --- /dev/null +++ b/neoforge/README.md @@ -0,0 +1,25 @@ + +Installation information +======= + +This template repository can be directly cloned to get you started with a new +mod. Simply create a new repository cloned from this one, by following the +instructions provided by [GitHub](https://docs.github.com/en/repositories/creating-and-managing-repositories/creating-a-repository-from-a-template). + +Once you have your clone, simply open the repository in the IDE of your choice. The usual recommendation for an IDE is either IntelliJ IDEA or Eclipse. + +If at any point you are missing libraries in your IDE, or you've run into problems you can +run `gradlew --refresh-dependencies` to refresh the local cache. `gradlew clean` to reset everything +{this does not affect your code} and then start the process again. + +Mapping Names: +============ +By default, the MDK is configured to use the official mapping names from Mojang for methods and fields +in the Minecraft codebase. These names are covered by a specific license. All modders should be aware of this +license. For the latest license text, refer to the mapping file itself, or the reference copy here: +https://github.com/NeoForged/NeoForm/blob/main/Mojang.md + +Additional Resources: +========== +Community Documentation: https://docs.neoforged.net/ +NeoForged Discord: https://discord.neoforged.net/ diff --git a/neoforge/TEMPLATE_LICENSE.txt b/neoforge/TEMPLATE_LICENSE.txt new file mode 100644 index 0000000..e69de29 diff --git a/neoforge/build.gradle b/neoforge/build.gradle new file mode 100644 index 0000000..d874053 --- /dev/null +++ b/neoforge/build.gradle @@ -0,0 +1,180 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'net.neoforged.moddev' version '1.0.20' +} + +tasks.named('wrapper', Wrapper).configure { + // Define wrapper values here so as to not have to always do so when updating gradlew.properties. + // Switching this to Wrapper.DistributionType.ALL will download the full gradle sources that comes with + // documentation attached on cursor hover of gradle classes and methods. However, this comes with increased + // file size for Gradle. If you do switch this to ALL, run the Gradle wrapper task twice afterwards. + // (Verify by checking gradle/wrapper/gradle-wrapper.properties to see if distributionUrl now points to `-all`) + distributionType = Wrapper.DistributionType.BIN +} + +version = mod_version +group = mod_group_id + +repositories { + mavenLocal() + maven { + url "https://maven.su5ed.dev/releases" + } + maven { + url "https://maven.shedaniel.me/" + } +} + +base { + archivesName = mod_id +} + +// Mojang ships Java 21 to end users starting in 1.20.5, so mods should target Java 21. +java.toolchain.languageVersion = JavaLanguageVersion.of(21) + +neoForge { + // Specify the version of NeoForge to use. + version = project.neo_version + + parchment { + mappingsVersion = project.parchment_mappings_version + minecraftVersion = project.parchment_minecraft_version + } + + // This line is optional. Access Transformers are automatically detected + // accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + client() + + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + server { + server() + programArgument '--nogui' + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + type = "gameTestServer" + systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id + } + + data { + data() + + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + // gameDirectory = project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } + + // applies to all the run configs above + configureEach { + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + systemProperty 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + logLevel = org.slf4j.event.Level.DEBUG + } + } + + mods { + // define mod <-> source bindings + // these are used to tell the game which sources are for which mod + // mostly optional in a single mod project + // but multi mod projects should define one per mod + "${mod_id}" { + sourceSet(sourceSets.main) + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +// Sets up a dependency configuration called 'localRuntime'. +// This configuration should be used instead of 'runtimeOnly' to declare +// a dependency that will be present for runtime testing but that is +// "optional", meaning it will not be pulled by dependents of this mod. +configurations { + runtimeClasspath.extendsFrom localRuntime +} + +dependencies { + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html + + implementation "org.sinytra.forgified-fabric-api:forgified-fabric-api:0.104.0+2.0.14+1.21.1" + implementation "me.shedaniel.cloth:cloth-config-neoforge:15.0.140" +} + +// This block of code expands all declared replace properties in the specified resource targets. +// A missing property will result in an error. Properties are expanded using ${} Groovy notation. +var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) { + var replaceProperties = [ + minecraft_version : minecraft_version, + minecraft_version_range: minecraft_version_range, + neo_version : neo_version, + neo_version_range : neo_version_range, + loader_version_range : loader_version_range, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + mod_authors : mod_authors, + mod_description : mod_description + ] + inputs.properties replaceProperties + expand replaceProperties + from "src/main/templates" + into "build/generated/sources/modMetadata" +} +// Include the output of "generateModMetadata" as an input directory for the build +// this works with both building through Gradle and the IDE. +sourceSets.main.resources.srcDir generateModMetadata +// To avoid having to run "generateModMetadata" manually, make it run on every project reload +neoForge.ideSyncTask generateModMetadata + +// Example configuration to allow publishing using the maven-publish plugin +publishing { + publications { + register('mavenJava', MavenPublication) { + from components.java + } + } + repositories { + maven { + url "file://${project.projectDir}/repo" + } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + +// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties new file mode 100644 index 0000000..c5ad1f7 --- /dev/null +++ b/neoforge/gradle.properties @@ -0,0 +1,45 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +org.gradle.jvmargs=-Xmx1G +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true + +#read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment +# you can also find the latest versions at: https://parchmentmc.org/docs/getting-started +parchment_minecraft_version=1.21 +parchment_mappings_version=2024.07.28 +# Environment Properties +# You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge +# The Minecraft version must agree with the Neo version to get a valid artifact +minecraft_version=1.21.1 +# The Minecraft version range can use any release version of Minecraft as bounds. +# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly +# as they do not follow standard versioning conventions. +minecraft_version_range=[1.21.1, 1.22) +# The Neo version must agree with the Minecraft version to get a valid artifact +neo_version=21.1.64 +# The Neo version range can use any version of Neo as bounds +neo_version_range=[21.1.0,) +# The loader version range can only use the major version of FML as bounds +loader_version_range=[4,) + +## Mod Properties + +# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} +# Must match the String constant located in the main mod class annotated with @Mod. +mod_id=loadsupport +# The human-readable display name for the mod. +mod_name=Load Support +# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. +mod_license=Apache License 2.0 +# The mod version. See https://semver.org/ +mod_version=1.0.0 +# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. +# This should match the base package used for the mod sources. +# See https://maven.apache.org/guides/mini/guide-naming-conventions.html +mod_group_id=com.vaporvee.loadsupport +# The authors of the mod. This is a simple text string that is used for display purposes in the mod list. +mod_authors=vaporvee +# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. +mod_description=Shows when the user has to less Java memory allocated, and plays a sound when the game has loaded. diff --git a/neoforge/gradle/wrapper/gradle-wrapper.jar b/neoforge/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..2c35211 Binary files /dev/null and b/neoforge/gradle/wrapper/gradle-wrapper.jar differ diff --git a/neoforge/gradle/wrapper/gradle-wrapper.properties b/neoforge/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..09523c0 --- /dev/null +++ b/neoforge/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/neoforge/gradlew b/neoforge/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/neoforge/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/neoforge/gradlew.bat b/neoforge/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/neoforge/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/neoforge/settings.gradle b/neoforge/settings.gradle new file mode 100644 index 0000000..ada876e --- /dev/null +++ b/neoforge/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/fabric/src/client/java/com/vaporvee/enoughmemory/EMConfig.java b/neoforge/src/main/java/com/vaporvee/loadsupport/LSConfig.java similarity index 50% rename from fabric/src/client/java/com/vaporvee/enoughmemory/EMConfig.java rename to neoforge/src/main/java/com/vaporvee/loadsupport/LSConfig.java index b245c09..7187192 100644 --- a/fabric/src/client/java/com/vaporvee/enoughmemory/EMConfig.java +++ b/neoforge/src/main/java/com/vaporvee/loadsupport/LSConfig.java @@ -1,11 +1,12 @@ -package com.vaporvee.enoughmemory; +package com.vaporvee.loadsupport; import me.shedaniel.autoconfig.ConfigData; import me.shedaniel.autoconfig.annotation.Config; -@Config(name = EnoughMemory.MOD_ID) -public class EMConfig implements ConfigData { +@Config(name = LoadSupport.MODID) +public class LSConfig implements ConfigData { + boolean startSound = true; float minMemory = 4.0f; String errorTitle = "Error: Not enough Java memory!"; - String errorDescription = "Please allocate at least {minMemory} GB of Java memory to your Minecraft Instance!"; + String errorDescription = "Please allocate at least {minMemory} GB of Java memory to your Minecraft Instance! You have currently {currentMemory} GB allocated."; } diff --git a/neoforge/src/main/java/com/vaporvee/loadsupport/LSWindow.java b/neoforge/src/main/java/com/vaporvee/loadsupport/LSWindow.java new file mode 100644 index 0000000..6800e86 --- /dev/null +++ b/neoforge/src/main/java/com/vaporvee/loadsupport/LSWindow.java @@ -0,0 +1,96 @@ +package com.vaporvee.loadsupport; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.client.gui.screens.AccessibilityOnboardingScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.network.chat.Component; +import net.minecraft.client.gui.components.Button; +import net.minecraft.util.FormattedCharSequence; + + +import javax.swing.*; +import java.awt.*; +import java.util.List; + + +public class LSWindow { + static boolean windowOpen = false; + private static JFrame window; + + public static void createWindow(Minecraft minecraftClient, Screen screen) { + if(screen instanceof TitleScreen || screen instanceof AccessibilityOnboardingScreen){ + minecraftClient.setScreen(new BlockedScreen()); + if(window != null){ + window.dispose(); + } + return; + } + try { + if (!windowOpen) { + windowOpen = true; + SwingUtilities.invokeLater(() -> { + window = new JFrame(LoadSupport.getWarningMessage()[0]); + window.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + window.setSize(400, 200); + window.setLocationRelativeTo(null); + + JLabel message = new JLabel(""+ LoadSupport.getWarningMessage()[1]+"
", JLabel.CENTER); + JButton exitButton = new JButton("OK"); + + exitButton.addActionListener(e -> { + window.dispose(); + minecraftClient.stop(); + }); + + window.setLayout(new BorderLayout()); + window.add(message, BorderLayout.CENTER); + window.add(exitButton, BorderLayout.SOUTH); + window.setVisible(true); + }); + } + } catch (RuntimeException e) { + LoadSupport.logger.error(String.valueOf(e)); + } + } + public static class BlockedScreen extends Screen { + + protected BlockedScreen() { + super(Component.literal("BlockedScreen")); + } + + @Override + protected void init() { + Button closeButton = Button.builder(Component.literal("Quit Game"), button -> Minecraft.getInstance().stop()) + .bounds(this.width / 2 - 100, this.height - 35, 200, 20) + .build(); + + this.addRenderableWidget(closeButton); + } + + @Override + public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { + super.render(graphics, mouseX, mouseY, delta); + + String title = LoadSupport.getWarningMessage()[0]; + String body = LoadSupport.getWarningMessage()[1]; + + int lineHeight = this.font.lineHeight + 5; + int maxTextWidth = this.width - 40; + + List