diff --git a/data/splash.png b/data/splash.png deleted file mode 100644 index f0e3a9a..0000000 Binary files a/data/splash.png and /dev/null differ diff --git a/dracut/vmklive/adduser.sh b/dracut/vmklive/adduser.sh index 9385472..17c3c3f 100644 --- a/dracut/vmklive/adduser.sh +++ b/dracut/vmklive/adduser.sh @@ -36,9 +36,11 @@ if [ -f ${NEWROOT}/etc/sudoers ]; then echo "${USERNAME} ALL=(ALL:ALL) NOPASSWD: ALL" > "${NEWROOT}/etc/sudoers.d/99-void-live" fi -echo "${USERNAME} minceraftos = (root) NOPASSWD: /usr/bin/poweroff" > "${NEWROOT}/etc/sudoers.d/99-void-live" -echo "${USERNAME} minceraftos = (root) NOPASSWD: /usr/sbin/startx" > "${NEWROOT}/etc/sudoers.d/99-void-live" -echo "${USERNAME} minceraftos = (root) NOPASSWD: /usr/bin/plymouth" > "${NEWROOT}/etc/sudoers.d/99-void-live" +echo "${USERNAME} minceraftos = (root) NOPASSWD: /usr/bin/poweroff +${USERNAME} minceraftos = (root) NOPASSWD: /usr/bin/reboot +${USERNAME} minceraftos = (root) NOPASSWD: /usr/sbin/startx +${USERNAME} minceraftos = (root) NOPASSWD: /usr/bin/plymouth" > "${NEWROOT}/etc/sudoers.d/99-void-live" + if [ -d ${NEWROOT}/etc/polkit-1 ]; then # If polkit is installed allow users in the wheel group to run anything. cat > ${NEWROOT}/etc/polkit-1/rules.d/void-live.rules <<_EOF diff --git a/mine-data/instance.cfg b/mine-data/instance.cfg index 89e1fbe..0d65060 100755 --- a/mine-data/instance.cfg +++ b/mine-data/instance.cfg @@ -1,19 +1,14 @@ -AutoCloseConsole=false ForgeVersion= InstanceType=OneSix IntendedVersion= JavaArchitecture=64 -JavaPath=java JavaTimestamp=1739886872000 JavaVersion=21.0.7 JoinServerOnLaunch=true JoinServerOnLaunchAddress= JoinSingleplayerWorldOnLaunch=false -JoinSingleplayerWorldOnLaunchName= JoinWorldOnLaunch=false -JvmArgs= LWJGLVersion= -LaunchMaximized=false LiteloaderVersion= LogPrePostOutput=true MCLaunchMethod=LauncherPart @@ -23,30 +18,15 @@ ManagedPackName= ManagedPackType= ManagedPackVersionID= ManagedPackVersionName= -MaxMemAlloc=1024 -MinMemAlloc=512 -MinecraftWinHeight=480 -MinecraftWinWidth=854 OverrideCommands=false OverrideConsole=false OverrideGameTime=false -OverrideJava=false OverrideJavaArgs=false -OverrideJavaLocation=true +OverrideJavaLocation=false OverrideMCLaunchMethod=false OverrideMemory=false OverrideNativeWorkarounds=false OverrideWindow=false -PermGen=128 -PostExitCommand= -PreLaunchCommand= -RecordGameTime=true -ShowConsole=false -ShowConsoleOnError=true -ShowGameTime=true -UseNativeGLFW=false -UseNativeOpenAL=false -WrapperCommand= iconKey=default lastLaunchTime=1741917662496 lastTimePlayed=108 diff --git a/mine-data/mmc-pack.json b/mine-data/mmc-pack.json index b2759f3..0f7a567 100755 --- a/mine-data/mmc-pack.json +++ b/mine-data/mmc-pack.json @@ -6,6 +6,31 @@ "important": true, "uid": "net.minecraft", "version": "1.21.4" + }, + { + "cachedName": "Intermediary Mappings", + "cachedRequires": [ + { + "equals": "1.21.4", + "uid": "net.minecraft" + } + ], + "cachedVersion": "1.21.4", + "cachedVolatile": true, + "dependencyOnly": true, + "uid": "net.fabricmc.intermediary", + "version": "1.21.4" + }, + { + "cachedName": "Fabric Loader", + "cachedRequires": [ + { + "uid": "net.fabricmc.intermediary" + } + ], + "cachedVersion": "0.16.10", + "uid": "net.fabricmc.fabric-loader", + "version": "0.16.10" } ], "formatVersion": 1 diff --git a/mkmine.sh b/mkmine.sh index e228438..b293bf0 100755 --- a/mkmine.sh +++ b/mkmine.sh @@ -70,7 +70,7 @@ function create_mine_dir { wrap_pwd copy_mine_data wrap_pwd build_mods rm -rf data/mine/instances/default/.minecraft/mods - cp mods/build data/mine/instances/default/.minecraft/mods + cp -r mods/build data/mine/instances/default/.minecraft/mods wrap_pwd build_ultimmc cp -a ultimmc/build/. data/mine chmod 777 data/mine -R diff --git a/mods/build-all.sh b/mods/build-all.sh old mode 100644 new mode 100755 index 4d0a6c5..ba51640 --- a/mods/build-all.sh +++ b/mods/build-all.sh @@ -1,3 +1,16 @@ #!/bin/bash -echo "TODO" +echo "Reset build directory" +rm -rf build +mkdir build + +for dir in */; do + if [ "$dir" != "build/" ]; then + echo "Building $dir mod..." + cd "$dir" + ./build.sh + cd .. + fi +done + +cp fabric-api*.jar build/ diff --git a/mods/desktop-integrations/.gitignore b/mods/desktop-integrations/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/mods/desktop-integrations/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/mods/desktop-integrations/build.gradle b/mods/desktop-integrations/build.gradle new file mode 100644 index 0000000..e7a4405 --- /dev/null +++ b/mods/desktop-integrations/build.gradle @@ -0,0 +1,90 @@ +plugins { + id 'fabric-loom' version '1.10-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +loom { + splitEnvironmentSourceSets() + + mods { + "desktop-integrations" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } + +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "net.minecraft:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": inputs.properties.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 21 +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 +} + +jar { + inputs.property "archivesName", project.base.archivesName + + from("LICENSE") { + rename { "${it}_${inputs.properties.archivesName}"} + } +} + +// configure the maven publication +publishing { + publications { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/build.sh b/mods/desktop-integrations/build.sh new file mode 100755 index 0000000..1f419af --- /dev/null +++ b/mods/desktop-integrations/build.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +export JAVA_HOME=/usr/lib/jvm/openjdk21 +cp ../../version src/main/resources +./gradlew build +mv build/libs/*.jar build +mv build/*-sources.jar build/libs +mv build/*.jar ../build \ No newline at end of file diff --git a/mods/desktop-integrations/gradle.properties b/mods/desktop-integrations/gradle.properties new file mode 100644 index 0000000..26ed83b --- /dev/null +++ b/mods/desktop-integrations/gradle.properties @@ -0,0 +1,17 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.8 +loader_version=0.16.10 + +# Mod Properties +mod_version=1.0.0 +maven_group=ru.themixray +archives_base_name=desktop-integrations + +# Dependencies +fabric_version=0.118.5+1.21.4 \ No newline at end of file diff --git a/mods/desktop-integrations/gradle/wrapper/gradle-wrapper.jar b/mods/desktop-integrations/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/mods/desktop-integrations/gradle/wrapper/gradle-wrapper.jar differ diff --git a/mods/desktop-integrations/gradle/wrapper/gradle-wrapper.properties b/mods/desktop-integrations/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e18bc25 --- /dev/null +++ b/mods/desktop-integrations/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/mods/desktop-integrations/gradlew b/mods/desktop-integrations/gradlew new file mode 100755 index 0000000..f3b75f3 --- /dev/null +++ b/mods/desktop-integrations/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$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/mods/desktop-integrations/gradlew.bat b/mods/desktop-integrations/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/mods/desktop-integrations/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/mods/desktop-integrations/settings.gradle b/mods/desktop-integrations/settings.gradle new file mode 100644 index 0000000..75c4d72 --- /dev/null +++ b/mods/desktop-integrations/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/client/java/ru/themixray/DesktopIntegrationsClient.java b/mods/desktop-integrations/src/client/java/ru/themixray/DesktopIntegrationsClient.java new file mode 100644 index 0000000..fb6a063 --- /dev/null +++ b/mods/desktop-integrations/src/client/java/ru/themixray/DesktopIntegrationsClient.java @@ -0,0 +1,10 @@ +package ru.themixray; + +import net.fabricmc.api.ClientModInitializer; + +public class DesktopIntegrationsClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + // This entrypoint is suitable for setting up client-specific logic, such as rendering. + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/client/java/ru/themixray/mixin/client/ClientMixin.java b/mods/desktop-integrations/src/client/java/ru/themixray/mixin/client/ClientMixin.java new file mode 100644 index 0000000..1a92bb6 --- /dev/null +++ b/mods/desktop-integrations/src/client/java/ru/themixray/mixin/client/ClientMixin.java @@ -0,0 +1,22 @@ +package ru.themixray.mixin.client; + +import net.minecraft.client.MinecraftClient; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.io.IOException; + +@Mixin(MinecraftClient.class) +public class ClientMixin { + @Inject(at = @At("HEAD"), method = "scheduleStop") + private void init(CallbackInfo info) { + Runtime rt = Runtime.getRuntime(); + try { + Process pr = rt.exec("sudo poweroff"); + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/client/java/ru/themixray/mixin/client/TitleScreenMixin.java b/mods/desktop-integrations/src/client/java/ru/themixray/mixin/client/TitleScreenMixin.java new file mode 100644 index 0000000..a9a01d9 --- /dev/null +++ b/mods/desktop-integrations/src/client/java/ru/themixray/mixin/client/TitleScreenMixin.java @@ -0,0 +1,116 @@ +package ru.themixray.mixin.client; + +import net.minecraft.SharedConstants; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.*; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.SplashTextRenderer; +import net.minecraft.client.gui.screen.TitleScreen; +import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; +import net.minecraft.client.gui.screen.multiplayer.MultiplayerWarningScreen; +import net.minecraft.client.gui.screen.option.OptionsScreen; +import net.minecraft.client.gui.screen.world.SelectWorldScreen; +import net.minecraft.client.gui.tooltip.Tooltip; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.realms.gui.screen.RealmsMainScreen; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.text.Text; +import net.minecraft.util.Util; +import net.minecraft.util.math.MathHelper; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import ru.themixray.DesktopIntegrations; + +import java.io.IOException; +import java.lang.reflect.Field; + +@Mixin(TitleScreen.class) +public abstract class TitleScreenMixin extends Screen { + @Shadow protected abstract void setWidgetAlpha(float alpha); + + @Shadow protected abstract boolean isRealmsNotificationsGuiDisplayed(); + + @Shadow private long backgroundFadeStart; + + @Shadow private boolean doBackgroundFade; + + @Shadow private float backgroundAlpha; + + @Shadow @Final private LogoDrawer logoDrawer; + + @Shadow private @Nullable SplashTextRenderer splashText; + + protected TitleScreenMixin(Text title) { + super(title); + } + + @Inject(at = @At("TAIL"), method = "init") + private void init(CallbackInfo ci) { + ButtonWidget last = (ButtonWidget) children().get(children().size()-4); + this.addDrawableChild( + ButtonWidget.builder(Text.translatable("menu.reboot"), button -> { + + Runtime rt = Runtime.getRuntime(); + try { + Process pr = rt.exec("sudo reboot"); + } catch (IOException e) { + throw new RuntimeException(e); + } + }) + .dimensions(last.getX(), last.getY(), last.getWidth(), last.getHeight()) + .build() + ); + remove(last); + } + + @Inject(at = @At("TAIL"), method = "addNormalWidgets") + private void addNormalWidgets(int y, int spacingY, CallbackInfoReturnable cir) { + ButtonWidget last = (ButtonWidget) children().getLast(); + this.addDrawableChild( + ButtonWidget.builder(Text.translatable("menu.options"), button -> this.client.setScreen(new OptionsScreen(this, this.client.options))) + .dimensions(last.getX(), last.getY(), last.getWidth(), last.getHeight()) + .build() + ); + remove(last); + } + + @Inject(at = @At("TAIL"), method = "render") + public void render(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) throws NoSuchFieldException, IllegalAccessException { + if (this.backgroundFadeStart == 0L && this.doBackgroundFade) { + this.backgroundFadeStart = Util.getMeasuringTimeMs(); + } + + float f = 1.0F; + if (this.doBackgroundFade) { + float g = (float)(Util.getMeasuringTimeMs() - this.backgroundFadeStart) / 2000.0F; + if (g > 1.0F) { + this.doBackgroundFade = false; + this.backgroundAlpha = 1.0F; + } else { + g = MathHelper.clamp(g, 0.0F, 1.0F); + f = MathHelper.clampedMap(g, 0.5F, 1.0F, 0.0F, 1.0F); + this.backgroundAlpha = MathHelper.clampedMap(g, 0.0F, 0.5F, 0.0F, 1.0F); + } + + this.setWidgetAlpha(f); + } + + this.renderPanoramaBackground(context, delta); + int i = MathHelper.ceil(f * 255.0F) << 24; + if ((i & -67108864) != 0) { + super.render(context, mouseX, mouseY, delta); + this.logoDrawer.draw(context, this.width, f); + if (this.splashText != null && !this.client.options.getHideSplashTexts().getValue()) { + this.splashText.render(context, this.width, this.textRenderer, i); + } + + context.drawTextWithShadow(this.textRenderer, "minceraftOS "+ DesktopIntegrations.getVersion(), 2, this.height - 10, 16777215 | i); + } + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/client/resources/desktop-integrations.client.mixins.json b/mods/desktop-integrations/src/client/resources/desktop-integrations.client.mixins.json new file mode 100644 index 0000000..9fa5ff6 --- /dev/null +++ b/mods/desktop-integrations/src/client/resources/desktop-integrations.client.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "ru.themixray.mixin.client", + "compatibilityLevel": "JAVA_21", + "client": [ + "ClientMixin", + "TitleScreenMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/main/java/ru/themixray/DesktopIntegrations.java b/mods/desktop-integrations/src/main/java/ru/themixray/DesktopIntegrations.java new file mode 100644 index 0000000..4a593a9 --- /dev/null +++ b/mods/desktop-integrations/src/main/java/ru/themixray/DesktopIntegrations.java @@ -0,0 +1,43 @@ +package ru.themixray; + +import net.fabricmc.api.ModInitializer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.*; +import java.net.URL; +import java.util.Properties; +import java.util.Scanner; +import java.util.stream.Collectors; + +public class DesktopIntegrations implements ModInitializer { + public static final String MOD_ID = "desktop-integrations"; + + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); + + @Override + public void onInitialize() { + LOGGER.info("Desktop Integrations "+getVersion()+" loaded!"); + } + + public static String getVersion() { + try { + return getResourceFileAsString("/version"); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + static String getResourceFileAsString(String fileName) throws IOException { + try (InputStream is = DesktopIntegrations.class.getResourceAsStream(fileName)) { + if (is == null) return null; + try (InputStreamReader isr = new InputStreamReader(is); BufferedReader reader = new BufferedReader(isr)) { + return reader.lines().collect(Collectors.joining(System.lineSeparator())); + } + } + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/main/java/ru/themixray/mixin/ExampleMixin.java b/mods/desktop-integrations/src/main/java/ru/themixray/mixin/ExampleMixin.java new file mode 100644 index 0000000..160a467 --- /dev/null +++ b/mods/desktop-integrations/src/main/java/ru/themixray/mixin/ExampleMixin.java @@ -0,0 +1,15 @@ +package ru.themixray.mixin; + +import net.minecraft.server.MinecraftServer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MinecraftServer.class) +public class ExampleMixin { + @Inject(at = @At("HEAD"), method = "loadWorld") + private void init(CallbackInfo info) { + // This code is injected into the start of MinecraftServer.loadWorld()V + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/main/resources/assets/desktop-integrations/icon.png b/mods/desktop-integrations/src/main/resources/assets/desktop-integrations/icon.png new file mode 100644 index 0000000..018b5ec Binary files /dev/null and b/mods/desktop-integrations/src/main/resources/assets/desktop-integrations/icon.png differ diff --git a/mods/desktop-integrations/src/main/resources/assets/desktop-integrations/lang/en_us.json b/mods/desktop-integrations/src/main/resources/assets/desktop-integrations/lang/en_us.json new file mode 100644 index 0000000..b2d357a --- /dev/null +++ b/mods/desktop-integrations/src/main/resources/assets/desktop-integrations/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "menu.reboot": "Reboot" +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/main/resources/assets/desktop-integrations/lang/ru_ru.json b/mods/desktop-integrations/src/main/resources/assets/desktop-integrations/lang/ru_ru.json new file mode 100644 index 0000000..331be72 --- /dev/null +++ b/mods/desktop-integrations/src/main/resources/assets/desktop-integrations/lang/ru_ru.json @@ -0,0 +1,3 @@ +{ + "menu.reboot": "Перезагрузить" +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/main/resources/assets/minecraft/lang/en_us.json b/mods/desktop-integrations/src/main/resources/assets/minecraft/lang/en_us.json new file mode 100644 index 0000000..546c6bf --- /dev/null +++ b/mods/desktop-integrations/src/main/resources/assets/minecraft/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "menu.quit": "Power off", + "title.credits": "" +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/main/resources/assets/minecraft/lang/ru_ru.json b/mods/desktop-integrations/src/main/resources/assets/minecraft/lang/ru_ru.json new file mode 100644 index 0000000..0eb022a --- /dev/null +++ b/mods/desktop-integrations/src/main/resources/assets/minecraft/lang/ru_ru.json @@ -0,0 +1,4 @@ +{ + "menu.quit": "Выключить питание", + "title.credits": "" +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/main/resources/assets/minecraft/textures/gui/title/minecraft.png b/mods/desktop-integrations/src/main/resources/assets/minecraft/textures/gui/title/minecraft.png new file mode 100644 index 0000000..8984ae3 Binary files /dev/null and b/mods/desktop-integrations/src/main/resources/assets/minecraft/textures/gui/title/minecraft.png differ diff --git a/mods/desktop-integrations/src/main/resources/assets/minecraft/textures/gui/title/minecraft.png.mcmeta b/mods/desktop-integrations/src/main/resources/assets/minecraft/textures/gui/title/minecraft.png.mcmeta new file mode 100644 index 0000000..e38a5ad --- /dev/null +++ b/mods/desktop-integrations/src/main/resources/assets/minecraft/textures/gui/title/minecraft.png.mcmeta @@ -0,0 +1,5 @@ +{ + "texture": { + "blur": true + } +} diff --git a/mods/desktop-integrations/src/main/resources/desktop-integrations.mixins.json b/mods/desktop-integrations/src/main/resources/desktop-integrations.mixins.json new file mode 100644 index 0000000..ca25741 --- /dev/null +++ b/mods/desktop-integrations/src/main/resources/desktop-integrations.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "ru.themixray.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "ExampleMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/main/resources/fabric.mod.json b/mods/desktop-integrations/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..520d1f1 --- /dev/null +++ b/mods/desktop-integrations/src/main/resources/fabric.mod.json @@ -0,0 +1,37 @@ +{ + "schemaVersion": 1, + "id": "desktop-integrations", + "version": "${version}", + "name": "desktop-integrations", + "description": "Desktop Integrations", + "authors": [ + "TheMixRay" + ], + "contact": { + "homepage": "https://github.com/MeexReay/minceraftOS" + }, + "license": "CC0-1.0", + "icon": "assets/desktop-integrations/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "ru.themixray.DesktopIntegrations" + ], + "client": [ + "ru.themixray.DesktopIntegrationsClient" + ] + }, + "mixins": [ + "desktop-integrations.mixins.json", + { + "config": "desktop-integrations.client.mixins.json", + "environment": "client" + } + ], + "depends": { + "fabricloader": ">=0.16.10", + "minecraft": "~1.21.4", + "java": ">=21", + "fabric-api": "*" + } +} \ No newline at end of file diff --git a/mods/desktop-integrations/src/main/resources/version b/mods/desktop-integrations/src/main/resources/version new file mode 100644 index 0000000..6e8bf73 --- /dev/null +++ b/mods/desktop-integrations/src/main/resources/version @@ -0,0 +1 @@ +0.1.0 diff --git a/mods/fabric-api-0.118.5+1.21.4.jar b/mods/fabric-api-0.118.5+1.21.4.jar new file mode 100644 index 0000000..7c64483 Binary files /dev/null and b/mods/fabric-api-0.118.5+1.21.4.jar differ