From 26e375c1858656c8c7c3b5cae6713cbdacdab055 Mon Sep 17 00:00:00 2001 From: MORIMORI0317 Date: Sun, 5 Dec 2021 18:17:23 +0900 Subject: [PATCH] 1.18 --- .github/workflows/builder.yml | 69 ++--- build.gradle | 6 +- gradle.properties | 21 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 257 +++++++++++------- .../mus/ClientConfig.java | 2 +- .../mus/ClientHandler.java | 18 +- .../mus/LoadingTexture.java | 2 +- .../mus/MemoryUsageManager.java | 4 +- .../mus/MemoryUsageOverlay.java | 2 +- .../mus/MemoryUsageScreen.java | 6 +- .../mus/mixin/LoadingOverlayMixin.java | 8 +- src/main/resources/META-INF/mods.toml | 5 +- .../resources/memoryusagescreen.mixins.json | 4 +- src/main/resources/pack.mcmeta | 8 +- 15 files changed, 239 insertions(+), 175 deletions(-) rename src/main/java/net/{morimori => morimori0317}/mus/ClientConfig.java (97%) rename src/main/java/net/{morimori => morimori0317}/mus/ClientHandler.java (77%) rename src/main/java/net/{morimori => morimori0317}/mus/LoadingTexture.java (98%) rename src/main/java/net/{morimori => morimori0317}/mus/MemoryUsageManager.java (98%) rename src/main/java/net/{morimori => morimori0317}/mus/MemoryUsageOverlay.java (99%) rename src/main/java/net/{morimori => morimori0317}/mus/MemoryUsageScreen.java (93%) rename src/main/java/net/{morimori => morimori0317}/mus/mixin/LoadingOverlayMixin.java (90%) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 60433d9..536baa0 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -8,36 +8,37 @@ on: jobs: build: - runs-on: windows-latest + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up JDK 16 - uses: actions/setup-java@v1 - with: - java-version: 16 - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew build curseforge publishModrinth --stacktrace - env: - curesforgeapikey: ${{secrets.CURESFORGEAPIKEY}} - modrinthapikey: ${{secrets.MODRINTH}} - - name: Zip create - run: | - cd build/libs - zip release *.* - - name: Upload artifact - uses: actions/upload-artifact@v1 - with: - name: GMRG-Release - path: build/libs - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build publish curseforge publishModrinth --stacktrace --no-daemon + env: + curesforgeapikey: ${{secrets.CURESFORGEAPIKEY}} + modrinthapikey: ${{secrets.MODRINTH}} + mavenpassword: ${{secrets.MAVEN}} + - name: Zip create + run: | + cd build/libs + zip release *.* + - name: Upload artifact + uses: actions/upload-artifact@v1 + with: + name: GMRG-Release + path: build/libs + - name: Create Release + id: create_release + uses: actions/create-release@v1 + env: GITHUB_TOKEN: ${{ secrets.GITHUBTOKEN }} - with: + with: tag_name: ${{ github.ref }} release_name: MemoryUsageScreen - ${{ github.ref }} body: | @@ -45,13 +46,13 @@ jobs: Build by ${{ github.actor }} draft: false prerelease: false - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUBTOKEN }} - with: + - name: Upload Release Asset + id: upload-release-asset + uses: actions/upload-release-asset@v1.0.1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUBTOKEN }} + with: upload_url: ${{ steps.create_release.outputs.upload_url }} asset_path: ./build/libs/release.zip asset_name: MemoryUsageScreen.zip - asset_content_type: application/zip + asset_content_type: application/zip \ No newline at end of file diff --git a/build.gradle b/build.gradle index 02767df..413e532 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ -apply from: "https://raw.githubusercontent.com/TeamFelnull/GradleTemplate/main/minecraft/1.17.1/forge_mixin.gradle" +apply from: "https://raw.githubusercontent.com/TeamFelnull/GradleTemplate/main/minecraft/1.18/forge_mixin.gradle" apply from: "https://raw.githubusercontent.com/TeamFelnull/GradleTemplate/main/minecraft/upload.gradle" +apply from: "https://raw.githubusercontent.com/TeamFelnull/GradleTemplate/main/minecraft/publishing.gradle" buildscript { repositories { @@ -16,3 +17,6 @@ buildscript { } } +minecraft { + //accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 6414ee9..d4fd22b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false #----------------------------- -mc_version=1.17.1 -fg_version=1.17.1-37.0.70 +mc_version=1.18 +fg_version=1.18-38.0.14 #----------------------------- mod_name=MemoryUsageScreen mod_id=memoryusagescreen -mod_version=1.3 -mod_group=net.morimori +mod_version=1.4 +mod_group=net.morimori0317 mod_vendor=MORIMORI0317 mod_implevendor=MORIMORI0317 #----------------------------- -jei_version=1.17.1:8.0.0.16 +jei_version= #----------------------------- #modmenu_version=2.0.0-beta.7 #cloth_config_version= @@ -21,7 +21,14 @@ curesforge_id=500009 modrinth_id=n9mFA0ax release_type=release loader_type=Forge -support_versions=1.17.1 +support_versions=1.18 required_mods= optional_mods= -embedded_mods= \ No newline at end of file +embedded_mods= +#----------------------------- +maven_description=Very Memory Usage Bar +maven_license_name=GNU Lesser General Public License v3.0 +maven_license_url=https://www.gnu.org/licenses/lgpl-3.0.txt +maven_developer_name=MORIMORI0317 +maven_developer_id=MORIMORI0317 +maven_password= \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..e750102 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index b4f908a..c53aefa 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env bash +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # 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"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +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 - ;; +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 @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -106,78 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# 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" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # 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 +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 - 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\"" + 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 - i=`expr $i + 1` + # 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 - 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 -ARGV=("$@") -eval set -- $DEFAULT_JVM_OPTS +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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. +# -IFS=$' -' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)" -IFS=$' -' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' -exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}" +exec "$JAVACMD" "$@" diff --git a/src/main/java/net/morimori/mus/ClientConfig.java b/src/main/java/net/morimori0317/mus/ClientConfig.java similarity index 97% rename from src/main/java/net/morimori/mus/ClientConfig.java rename to src/main/java/net/morimori0317/mus/ClientConfig.java index 1fda9ec..f255054 100644 --- a/src/main/java/net/morimori/mus/ClientConfig.java +++ b/src/main/java/net/morimori0317/mus/ClientConfig.java @@ -1,4 +1,4 @@ -package net.morimori.mus; +package net.morimori0317.mus; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.fml.ModLoadingContext; diff --git a/src/main/java/net/morimori/mus/ClientHandler.java b/src/main/java/net/morimori0317/mus/ClientHandler.java similarity index 77% rename from src/main/java/net/morimori/mus/ClientHandler.java rename to src/main/java/net/morimori0317/mus/ClientHandler.java index ab074c1..59d05b6 100644 --- a/src/main/java/net/morimori/mus/ClientHandler.java +++ b/src/main/java/net/morimori0317/mus/ClientHandler.java @@ -1,17 +1,17 @@ -package net.morimori.mus; +package net.morimori0317.mus; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.gui.screens.ConnectScreen; import net.minecraft.client.gui.screens.LevelLoadingScreen; import net.minecraft.client.gui.screens.ProgressScreen; import net.minecraft.client.gui.screens.Screen; -import net.minecraftforge.client.event.GuiScreenEvent; +import net.minecraftforge.client.event.ScreenEvent; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; public class ClientHandler { @SubscribeEvent - public static void onKeyPress(GuiScreenEvent.KeyboardKeyPressedEvent e) { + public static void onKeyPress(ScreenEvent.KeyboardKeyPressedEvent e) { MemoryUsageManager.getInstance().onGUIKeyPress(e.getKeyCode()); } @@ -28,16 +28,16 @@ public static void onRender(TickEvent.RenderTickEvent e) { } @SubscribeEvent - public static void onGuiRender(GuiScreenEvent.DrawScreenEvent e) { - Screen screen = e.getGui(); + public static void onGuiRender(ScreenEvent.DrawScreenEvent e) { + Screen screen = e.getScreen(); if (screen instanceof ConnectScreen || screen instanceof LevelLoadingScreen || screen instanceof ProgressScreen) - MemoryUsageManager.getInstance().onWorldLoadingRender(e.getMatrixStack()); + MemoryUsageManager.getInstance().onWorldLoadingRender(e.getPoseStack()); } @SubscribeEvent - public static void onGuiInit(GuiScreenEvent.InitGuiEvent e) { - Screen screen = e.getGui(); + public static void onGuiInit(ScreenEvent.InitScreenEvent e) { + Screen screen = e.getScreen(); if (screen instanceof ConnectScreen || screen instanceof LevelLoadingScreen || screen instanceof ProgressScreen) MemoryUsageManager.getInstance().onWorldLoadingReset(); } -} +} \ No newline at end of file diff --git a/src/main/java/net/morimori/mus/LoadingTexture.java b/src/main/java/net/morimori0317/mus/LoadingTexture.java similarity index 98% rename from src/main/java/net/morimori/mus/LoadingTexture.java rename to src/main/java/net/morimori0317/mus/LoadingTexture.java index 695d40a..6e32c03 100644 --- a/src/main/java/net/morimori/mus/LoadingTexture.java +++ b/src/main/java/net/morimori0317/mus/LoadingTexture.java @@ -1,4 +1,4 @@ -package net.morimori.mus; +package net.morimori0317.mus; import com.mojang.blaze3d.platform.NativeImage; diff --git a/src/main/java/net/morimori/mus/MemoryUsageManager.java b/src/main/java/net/morimori0317/mus/MemoryUsageManager.java similarity index 98% rename from src/main/java/net/morimori/mus/MemoryUsageManager.java rename to src/main/java/net/morimori0317/mus/MemoryUsageManager.java index 9f53374..4cf3f25 100644 --- a/src/main/java/net/morimori/mus/MemoryUsageManager.java +++ b/src/main/java/net/morimori0317/mus/MemoryUsageManager.java @@ -1,4 +1,4 @@ -package net.morimori.mus; +package net.morimori0317.mus; import com.mojang.blaze3d.vertex.PoseStack; @@ -57,4 +57,4 @@ public void onLoadingRender(PoseStack poseStack, float alpha, boolean useFont, b if (MemoryUsageScreen.isConfigEnableInitLoadingScreen() && !enableShowMemoryUsage) overlay.render(poseStack, alpha, useFont, bloackGrond); } -} +} \ No newline at end of file diff --git a/src/main/java/net/morimori/mus/MemoryUsageOverlay.java b/src/main/java/net/morimori0317/mus/MemoryUsageOverlay.java similarity index 99% rename from src/main/java/net/morimori/mus/MemoryUsageOverlay.java rename to src/main/java/net/morimori0317/mus/MemoryUsageOverlay.java index 555ae1a..8b0d772 100644 --- a/src/main/java/net/morimori/mus/MemoryUsageOverlay.java +++ b/src/main/java/net/morimori0317/mus/MemoryUsageOverlay.java @@ -1,4 +1,4 @@ -package net.morimori.mus; +package net.morimori0317.mus; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/main/java/net/morimori/mus/MemoryUsageScreen.java b/src/main/java/net/morimori0317/mus/MemoryUsageScreen.java similarity index 93% rename from src/main/java/net/morimori/mus/MemoryUsageScreen.java rename to src/main/java/net/morimori0317/mus/MemoryUsageScreen.java index 704410f..31d6263 100644 --- a/src/main/java/net/morimori/mus/MemoryUsageScreen.java +++ b/src/main/java/net/morimori0317/mus/MemoryUsageScreen.java @@ -1,11 +1,11 @@ -package net.morimori.mus; +package net.morimori0317.mus; import net.minecraft.client.KeyMapping; +import net.minecraftforge.client.ClientRegistry; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.fmlclient.registry.ClientRegistry; import org.lwjgl.glfw.GLFW; @Mod(MemoryUsageScreen.MODID) @@ -35,4 +35,4 @@ public static boolean isConfigEnableWorldLoadingScreen() { public static boolean isConfigEnableToggleMode() { return ClientConfig.enableToggleMode.get(); } -} +} \ No newline at end of file diff --git a/src/main/java/net/morimori/mus/mixin/LoadingOverlayMixin.java b/src/main/java/net/morimori0317/mus/mixin/LoadingOverlayMixin.java similarity index 90% rename from src/main/java/net/morimori/mus/mixin/LoadingOverlayMixin.java rename to src/main/java/net/morimori0317/mus/mixin/LoadingOverlayMixin.java index 52d8161..422357f 100644 --- a/src/main/java/net/morimori/mus/mixin/LoadingOverlayMixin.java +++ b/src/main/java/net/morimori0317/mus/mixin/LoadingOverlayMixin.java @@ -1,4 +1,4 @@ -package net.morimori.mus.mixin; +package net.morimori0317.mus.mixin; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.Util; @@ -6,9 +6,9 @@ import net.minecraft.client.gui.screens.LoadingOverlay; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.Mth; -import net.morimori.mus.LoadingTexture; -import net.morimori.mus.MemoryUsageManager; -import net.morimori.mus.MemoryUsageScreen; +import net.morimori0317.mus.LoadingTexture; +import net.morimori0317.mus.MemoryUsageManager; +import net.morimori0317.mus.MemoryUsageScreen; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 86e6e39..f3698c7 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[37,)" +loaderVersion="[38,)" license="GNU LGPLv3" [[mods]] modId="memoryusagescreen" @@ -7,4 +7,5 @@ version="${file.jarVersion}" displayName="Memory Usage Screen" logoFile="icon.png" authors="MORIMORI0317" -description="This mod displays a memory usage bar\nThe Ikisugi MOD..." + +description="This mod displays a memory usage bar\nThe Ikisugi MOD..." \ No newline at end of file diff --git a/src/main/resources/memoryusagescreen.mixins.json b/src/main/resources/memoryusagescreen.mixins.json index 1fe74b0..4f767dd 100644 --- a/src/main/resources/memoryusagescreen.mixins.json +++ b/src/main/resources/memoryusagescreen.mixins.json @@ -1,8 +1,8 @@ { "required": true, "minVersion": "0.8", - "package": "net.morimori.mus.mixin", - "compatibilityLevel": "JAVA_16", + "package": "net.morimori0317.mus.mixin", + "compatibilityLevel": "JAVA_17", "client": [ "LoadingOverlayMixin" ], diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 54d661c..bbacf75 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { - "pack": { - "description": "memoryusagescreen resources", - "pack_format": 7 - } + "pack": { + "description": "memoryusagescreen resources", + "pack_format": 8 + } }