diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..823aca8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,25 @@ +# gradle + +.gradle/ +out/ +classes/ +build/ + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# fabric + +run/ \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..ea9ed68 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 MidnightDust + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index e2ae10b..678e20c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # CustomSplashScreen -Change minecraft's loading screen to your liking! Completely configurable! +Change minecraft's loading screen to your liking! Completely configurable! \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..6ae580f --- /dev/null +++ b/build.gradle @@ -0,0 +1,90 @@ +plugins { + id 'fabric-loom' version '0.5-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +minecraft { +} + +repositories { + maven { url "https://jitpack.io" } +} + +dependencies { + //to change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modCompile "net.fabricmc:fabric-loader:${project.loader_version}" + + modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + + modImplementation ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}"){ + exclude module: "fabric-api" + } + modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}"){ + exclude module: "fabric-api" + } + modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}"){ + exclude module: "fabric-api" + } +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f2844e9 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version=1.16.4 + yarn_mappings=1.16.4+build.7 + loader_version=0.10.8 + +# Mod Properties + mod_version = 1.0.0 + maven_group = eu.midnightdust + archives_base_name = customsplashscreen + +# Dependencies + # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api + fabric_version=0.26.1+1.16 + + auto_config_version = 3.3.1 + cloth_config_version = 4.8.3 + mod_menu_version = 1.14.6+build.31 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..4b7e1f3 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..8e25e6c --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -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 +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + 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 + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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 + +@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=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5b60df3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/eu/midnightdust/customsplashscreen/CustomSplashScreenClient.java b/src/main/java/eu/midnightdust/customsplashscreen/CustomSplashScreenClient.java new file mode 100644 index 0000000..0aa0d84 --- /dev/null +++ b/src/main/java/eu/midnightdust/customsplashscreen/CustomSplashScreenClient.java @@ -0,0 +1,55 @@ +package eu.midnightdust.customsplashscreen; + +import eu.midnightdust.customsplashscreen.config.CustomSplashScreenConfig; +import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; +import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.client.rendering.v1.ArmorRenderingRegistry; +import net.fabricmc.fabric.impl.client.indigo.renderer.helper.TextureHelper; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.texture.TextureManager; +import net.minecraft.client.texture.TextureUtil; +import net.minecraft.data.client.model.Texture; +import org.jetbrains.annotations.Nullable; + +import java.io.*; +import java.nio.file.*; +import java.util.logging.FileHandler; + +public class CustomSplashScreenClient implements ClientModInitializer { + + public static CustomSplashScreenConfig CS_CONFIG; + public static File CONFIG_PATH = new File(FabricLoader.getInstance().getConfigDir() + "/customsplashscreen"); + private static Path BackgroundTexture = Paths.get(CONFIG_PATH + "/background.png"); + private static Path MojangTexture = Paths.get(CONFIG_PATH + "/mojangstudios.png"); + private static Path MojankTexture = Paths.get(CONFIG_PATH + "/mojank.png"); + private static Path ProgressBarTexture = Paths.get(CONFIG_PATH + "/progressbar.png"); + private static Path ProgressBarBackgroundTexture = Paths.get(CONFIG_PATH + "/progressbar_background.png"); + + @Override + public void onInitializeClient() { + AutoConfig.register(CustomSplashScreenConfig.class, JanksonConfigSerializer::new); + CS_CONFIG = AutoConfig.getConfigHolder(CustomSplashScreenConfig.class).getConfig(); + + if (!CONFIG_PATH.exists()) { // Run when config directory is nonexistant // + CONFIG_PATH.mkdir(); // Create our custom config directory // + + // Open Input Streams for copying the default textures to the config directory // + InputStream background = Thread.currentThread().getContextClassLoader().getResourceAsStream("background.png"); + InputStream mojangstudios = Thread.currentThread().getContextClassLoader().getResourceAsStream("mojangstudios.png"); + InputStream mojank = Thread.currentThread().getContextClassLoader().getResourceAsStream("mojank.png"); + InputStream progressbar = Thread.currentThread().getContextClassLoader().getResourceAsStream("progressbar.png"); + InputStream progressbarBG = Thread.currentThread().getContextClassLoader().getResourceAsStream("progressbar_background.png"); + try { + // Copy the default textures into the config directory // + Files.copy(background,BackgroundTexture,StandardCopyOption.REPLACE_EXISTING); + Files.copy(mojangstudios,MojangTexture,StandardCopyOption.REPLACE_EXISTING); + Files.copy(mojank,MojankTexture,StandardCopyOption.REPLACE_EXISTING); + Files.copy(progressbar,ProgressBarTexture,StandardCopyOption.REPLACE_EXISTING); + Files.copy(progressbarBG,ProgressBarBackgroundTexture,StandardCopyOption.REPLACE_EXISTING); + } catch (IOException e) { + e.printStackTrace(); + } + } + } +} diff --git a/src/main/java/eu/midnightdust/customsplashscreen/config/CustomSplashScreenConfig.java b/src/main/java/eu/midnightdust/customsplashscreen/config/CustomSplashScreenConfig.java new file mode 100644 index 0000000..f66e0fc --- /dev/null +++ b/src/main/java/eu/midnightdust/customsplashscreen/config/CustomSplashScreenConfig.java @@ -0,0 +1,68 @@ +package eu.midnightdust.customsplashscreen.config; + +import me.sargunvohra.mcmods.autoconfig1u.ConfigData; +import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; +import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry; +import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; + +@Config(name = "customsplashscreen") +public class CustomSplashScreenConfig implements ConfigData { + + @Comment(value = "Change the design of the progress bar") + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public ProgressBarType progressBarType = ProgressBarType.Vanilla; + + @Comment(value = "Change the texture of the logo") + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public LogoStyle logoStyle = LogoStyle.Mojang; + + @Comment(value = "Enable/Disable the background image") + public boolean backgroundImage = false; + + @Comment(value = "Change the color of the background") + @ConfigEntry.ColorPicker + public int backgroundColor = 15675965; + @Comment(value = "Change the color of the progress bar") + @ConfigEntry.ColorPicker + public int progressBarColor = 16777215; + @Comment(value = "Change the color of the progress bar frame") + @ConfigEntry.ColorPicker + public int progressFrameColor = 16777215; + + @Comment(value = "Change the mode of the custom loading bar") + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public ProgressBarMode customProgressBarMode = ProgressBarMode.Linear; + + @Comment(value = "Enable/Disable the custom progress bar background") + public boolean customProgressBarBackground = false; + + @Comment(value = "Change the style of the boss loading bar") + @ConfigEntry.Gui.EnumHandler(option = ConfigEntry.Gui.EnumHandler.EnumDisplayOption.BUTTON) + public BossBarType bossBarType = BossBarType.NOTCHED_6; + + + @ConfigEntry.Gui.CollapsibleObject + public Textures textures = new Textures(); + + public static class Textures { + public String BackgroundTexture = "background.png"; + public String MojangLogo = "mojangstudios.png"; + public String Aspect1to1Logo = "mojank.png"; + public String BossBarTexture = "textures/gui/bars.png"; + public String CustomBarTexture = "progressbar.png"; + public String CustomBarBackgroundTexture = "progressbar_background.png"; + } + + public enum ProgressBarType { + Vanilla, BossBar, Custom, Hidden; + } + public enum LogoStyle { + Mojang, Aspect1to1, Hidden; + } + public enum ProgressBarMode { + Linear, Stretch; + } + public enum BossBarType { + PROGRESS, NOTCHED_6, NOTCHED_10, NOTCHED_12, NOTCHED_20; + } +} diff --git a/src/main/java/eu/midnightdust/customsplashscreen/config/ModMenuIntegration.java b/src/main/java/eu/midnightdust/customsplashscreen/config/ModMenuIntegration.java new file mode 100644 index 0000000..f4585d4 --- /dev/null +++ b/src/main/java/eu/midnightdust/customsplashscreen/config/ModMenuIntegration.java @@ -0,0 +1,16 @@ +package eu.midnightdust.customsplashscreen.config; + +import io.github.prospector.modmenu.api.ConfigScreenFactory; +import io.github.prospector.modmenu.api.ModMenuApi; +import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public class ModMenuIntegration implements ModMenuApi { + + @Override + public ConfigScreenFactory getModConfigScreenFactory() { // Provide our Config Screen to Mod Menu // + return parent -> AutoConfig.getConfigScreen(CustomSplashScreenConfig.class, parent).get(); + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/customsplashscreen/mixin/SplashScreenMixin.java b/src/main/java/eu/midnightdust/customsplashscreen/mixin/SplashScreenMixin.java new file mode 100644 index 0000000..67b9372 --- /dev/null +++ b/src/main/java/eu/midnightdust/customsplashscreen/mixin/SplashScreenMixin.java @@ -0,0 +1,205 @@ +package eu.midnightdust.customsplashscreen.mixin; + +import com.mojang.blaze3d.systems.RenderSystem; +import eu.midnightdust.customsplashscreen.CustomSplashScreenClient; +import eu.midnightdust.customsplashscreen.config.CustomSplashScreenConfig; +import eu.midnightdust.customsplashscreen.texture.BlurredConfigTexture; +import eu.midnightdust.customsplashscreen.texture.ConfigTexture; +import eu.midnightdust.customsplashscreen.texture.EmptyTexture; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.hud.BackgroundHelper; +import net.minecraft.client.gui.screen.SplashScreen; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.resource.ResourceReloadMonitor; +import net.minecraft.util.Identifier; +import net.minecraft.util.Util; +import net.minecraft.util.math.MathHelper; +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.ModifyArg; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import static net.minecraft.client.gui.DrawableHelper.drawTexture; + +@Mixin(SplashScreen.class) +public class SplashScreenMixin { + + @Shadow @Final private static Identifier LOGO; + @Shadow @Final private MinecraftClient client; + @Shadow @Final private boolean reloading; + @Shadow private long applyCompleteTime; + @Shadow @Final private ResourceReloadMonitor reloadMonitor; + @Shadow private long prepareCompleteTime; + @Shadow private float progress; + + private static final CustomSplashScreenConfig CS_CONFIG = CustomSplashScreenClient.CS_CONFIG; + + + private static final Identifier EMPTY_TEXTURE = new Identifier("empty.png"); + private static final Identifier MOJANG_TEXTURE = new Identifier(CS_CONFIG.textures.MojangLogo); + private static final Identifier ASPECT_1to1_TEXTURE = new Identifier(CS_CONFIG.textures.Aspect1to1Logo); + private static final Identifier BOSS_BAR_TEXTURE = new Identifier(CS_CONFIG.textures.BossBarTexture); + private static final Identifier CUSTOM_PROGRESS_BAR_TEXTURE = new Identifier(CS_CONFIG.textures.CustomBarTexture); + private static final Identifier CUSTOM_PROGRESS_BAR_BACKGROUND_TEXTURE = new Identifier(CS_CONFIG.textures.CustomBarBackgroundTexture); + private static final Identifier BACKGROUND_TEXTURE = new Identifier(CS_CONFIG.textures.BackgroundTexture); + + @Inject(method = "init(Lnet/minecraft/client/MinecraftClient;)V", at = @At("HEAD"), cancellable=true) + private static void init(MinecraftClient client, CallbackInfo ci) { // Load our custom textures at game start // + if (CS_CONFIG.logoStyle == CustomSplashScreenConfig.LogoStyle.Mojang) { + client.getTextureManager().registerTexture(LOGO, new BlurredConfigTexture(MOJANG_TEXTURE)); + } + else { + client.getTextureManager().registerTexture(LOGO, new EmptyTexture(EMPTY_TEXTURE)); + } + client.getTextureManager().registerTexture(ASPECT_1to1_TEXTURE, new ConfigTexture(ASPECT_1to1_TEXTURE)); + client.getTextureManager().registerTexture(BACKGROUND_TEXTURE, new ConfigTexture(BACKGROUND_TEXTURE)); + + client.getTextureManager().registerTexture(CUSTOM_PROGRESS_BAR_TEXTURE, new ConfigTexture(CUSTOM_PROGRESS_BAR_TEXTURE)); + client.getTextureManager().registerTexture(CUSTOM_PROGRESS_BAR_BACKGROUND_TEXTURE, new ConfigTexture(CUSTOM_PROGRESS_BAR_BACKGROUND_TEXTURE)); + + ci.cancel(); + } + + @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/texture/TextureManager;bindTexture(Lnet/minecraft/util/Identifier;)V",shift = At.Shift.BEFORE), method = "render") + private void renderBackground(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Render our background image // + long l = Util.getMeasuringTimeMs(); + if (this.reloading && (this.reloadMonitor.isPrepareStageComplete() || this.client.currentScreen != null) && this.prepareCompleteTime == -1L) { + this.prepareCompleteTime = l; + } + + float f = this.applyCompleteTime > -1L ? (float)(l - this.applyCompleteTime) / 1000.0F : -1.0F; + float g = this.prepareCompleteTime > -1L ? (float)(l - this.prepareCompleteTime) / 500.0F : -1.0F; + float o; + if (f >= 1.0F) { + o = 1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F); + } else if (this.reloading) { + o = MathHelper.clamp(g, 0.0F, 1.0F); + } else { + o = 1.0F; + } + + int maxX = this.client.getWindow().getScaledWidth(); + int maxY = this.client.getWindow().getScaledHeight(); + + if (CS_CONFIG.backgroundImage) { + client.getTextureManager().bindTexture(BACKGROUND_TEXTURE); + RenderSystem.enableBlend(); + RenderSystem.alphaFunc(516, 0.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, o); + drawTexture(matrices, 0, 0, 0, 0, 0, maxX, maxY, maxY, maxX); + RenderSystem.defaultBlendFunc(); + RenderSystem.defaultAlphaFunc(); + RenderSystem.disableBlend(); + } + } + + @Inject(at = @At("TAIL"), method = "render") + private void renderLogo(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Render our 1 to 1 logo // + long l = Util.getMeasuringTimeMs(); + if (this.reloading && (this.reloadMonitor.isPrepareStageComplete() || this.client.currentScreen != null) && this.prepareCompleteTime == -1L) { + this.prepareCompleteTime = l; + } + float f = this.applyCompleteTime > -1L ? (float)(l - this.applyCompleteTime) / 1000.0F : -1.0F; + float g = this.prepareCompleteTime > -1L ? (float)(l - this.prepareCompleteTime) / 500.0F : -1.0F; + float o; + int m; + if (f >= 1.0F) { + o = 1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F); + } else if (this.reloading) { + o = MathHelper.clamp(g, 0.0F, 1.0F); + } else { + o = 1.0F; + } + + m = (int)((double)this.client.getWindow().getScaledWidth() * 0.5D); + + if (CustomSplashScreenClient.CS_CONFIG.logoStyle == CustomSplashScreenConfig.LogoStyle.Aspect1to1) { + double d = Math.min((double)this.client.getWindow().getScaledWidth() * 0.75D, this.client.getWindow().getScaledHeight()) * 0.25D; + int r = (int)(d * 0.5D); + double e = d * 4.0D; + int s = (int)(e * 0.5D); + client.getTextureManager().bindTexture(ASPECT_1to1_TEXTURE); + RenderSystem.enableBlend(); + RenderSystem.alphaFunc(516, 0.0F); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, o); + drawTexture(matrices, m - (s / 2), r, s, s, 0, 0, 512, 512, 512, 512); + RenderSystem.defaultBlendFunc(); + RenderSystem.defaultAlphaFunc(); + RenderSystem.disableBlend(); + } + } + + @ModifyArg(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashScreen;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5) + private int modifyBackgroundColor(int color) { // Set the Background Color to our configured value // + long l = Util.getMeasuringTimeMs(); + if (this.reloading && (this.reloadMonitor.isPrepareStageComplete() || this.client.currentScreen != null) && this.prepareCompleteTime == -1L) { + this.prepareCompleteTime = l; + } + float f = this.applyCompleteTime > -1L ? (float)(l - this.applyCompleteTime) / 1000.0F : -1.0F; + int m; + m = MathHelper.ceil((1.0F - MathHelper.clamp(f - 1.0F, 0.0F, 1.0F)) * 255.0F); + + if (CS_CONFIG.backgroundImage) { + return BackgroundHelper.ColorMixer.getArgb(0, 0, 0, 0); + } + else { + return CustomSplashScreenClient.CS_CONFIG.backgroundColor | m << 24; + } + } + + @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashScreen;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V"), index = 5) + private int modifyProgressFrame(int color) { // Set the Progress Bar Frame Color to our configured value // + if (CustomSplashScreenClient.CS_CONFIG.progressBarType == CustomSplashScreenConfig.ProgressBarType.BossBar || CS_CONFIG.progressBarType == CustomSplashScreenConfig.ProgressBarType.Hidden) { + return BackgroundHelper.ColorMixer.getArgb(0, 0, 0, 0); + } + else return CustomSplashScreenClient.CS_CONFIG.progressFrameColor | 255 << 24; + } + @ModifyArg(method = "renderProgressBar", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/SplashScreen;fill(Lnet/minecraft/client/util/math/MatrixStack;IIIII)V", ordinal = 4), index = 5) + private int modifyProgressColor(int color) { // Set the Progress Bar Color to our configured value // + if (CustomSplashScreenClient.CS_CONFIG.progressBarType == CustomSplashScreenConfig.ProgressBarType.BossBar || CS_CONFIG.progressBarType == CustomSplashScreenConfig.ProgressBarType.Hidden || CS_CONFIG.progressBarType == CustomSplashScreenConfig.ProgressBarType.Custom) { + return BackgroundHelper.ColorMixer.getArgb(0, 0, 0, 0); + } + else return CustomSplashScreenClient.CS_CONFIG.progressBarColor | 255 << 24; + } + + @Inject(at = @At("TAIL"), method = "renderProgressBar", cancellable = true) + private void renderCSProgressBar(MatrixStack matrices, int x1, int y1, int x2, int y2, float opacity, CallbackInfo ci) { // Render our custom Progress Bar // + int i = MathHelper.ceil((float)(x2 - x1 - 2) * this.progress); + if (CustomSplashScreenClient.CS_CONFIG.progressBarType == CustomSplashScreenConfig.ProgressBarType.BossBar) { // Bossbar Style Progress Bar // + client.getTextureManager().bindTexture(BOSS_BAR_TEXTURE); + int overlay = 0; + + if (CustomSplashScreenClient.CS_CONFIG.bossBarType == CustomSplashScreenConfig.BossBarType.NOTCHED_6) {overlay = 93;} + else if (CustomSplashScreenClient.CS_CONFIG.bossBarType == CustomSplashScreenConfig.BossBarType.NOTCHED_10) {overlay = 105;} + else if (CustomSplashScreenClient.CS_CONFIG.bossBarType == CustomSplashScreenConfig.BossBarType.NOTCHED_12) {overlay = 117;} + else if (CustomSplashScreenClient.CS_CONFIG.bossBarType == CustomSplashScreenConfig.BossBarType.NOTCHED_20) {overlay = 129;} + + int bbWidth = (int) ((x2 - x1+1) * 1.4f); + int bbHeight = (y2 - y1) * 30; + drawTexture(matrices, x1, y1 + 1, 0, 0, 0, x2-x1, (int) ((y2-y1)/1.4f), bbHeight, bbWidth); + drawTexture(matrices, x1, y1 + 1, 0, 0, 5f, i, (int) ((y2-y1)/1.4f), bbHeight, bbWidth); + + RenderSystem.alphaFunc(516, 0.0F); + RenderSystem.enableBlend(); + if (overlay != 0) { + drawTexture(matrices, x1, y1 + 1, 0, 0, overlay, x2 - x1, (int) ((y2 - y1) / 1.4f), bbHeight, bbWidth); + } + RenderSystem.defaultBlendFunc(); + RenderSystem.defaultAlphaFunc(); + RenderSystem.disableBlend(); + } + if (CustomSplashScreenClient.CS_CONFIG.progressBarType == CustomSplashScreenConfig.ProgressBarType.Custom) { // Custom Progress Bar // + int customWidth = CustomSplashScreenClient.CS_CONFIG.customProgressBarMode == CustomSplashScreenConfig.ProgressBarMode.Linear ? x2-x1 : i; + if (CS_CONFIG.customProgressBarBackground) { + client.getTextureManager().bindTexture(CUSTOM_PROGRESS_BAR_BACKGROUND_TEXTURE); + drawTexture(matrices, x1, y1, 0, 0, 6, x2-x1, y2-y1, 10, x2-x1); + } + client.getTextureManager().bindTexture(CUSTOM_PROGRESS_BAR_TEXTURE); + drawTexture(matrices, x1, y1, 0, 0, 6, i, y2-y1, 10, customWidth); + } + } + +} diff --git a/src/main/java/eu/midnightdust/customsplashscreen/texture/BlurredConfigTexture.java b/src/main/java/eu/midnightdust/customsplashscreen/texture/BlurredConfigTexture.java new file mode 100644 index 0000000..f2c4899 --- /dev/null +++ b/src/main/java/eu/midnightdust/customsplashscreen/texture/BlurredConfigTexture.java @@ -0,0 +1,38 @@ +package eu.midnightdust.customsplashscreen.texture; + +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.resource.metadata.TextureResourceMetadata; +import net.minecraft.client.texture.NativeImage; +import net.minecraft.client.texture.ResourceTexture; +import net.minecraft.resource.ResourceManager; +import net.minecraft.util.Identifier; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +public class BlurredConfigTexture extends ResourceTexture { + // Load textures from the config directory // + + public BlurredConfigTexture(Identifier location) { + super(location); + } + + protected TextureData loadTextureData(ResourceManager resourceManager) { + try { + InputStream input = new FileInputStream(FabricLoader.getInstance().getConfigDir()+"/customsplashscreen/"+this.location.toString().replace("minecraft:","")); + TextureData texture; + + try { + texture = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(input)); + } finally { + input.close(); + } + + return texture; + } catch (IOException var18) { + return new TextureData(var18); + } + } + +} diff --git a/src/main/java/eu/midnightdust/customsplashscreen/texture/ConfigTexture.java b/src/main/java/eu/midnightdust/customsplashscreen/texture/ConfigTexture.java new file mode 100644 index 0000000..dd042fc --- /dev/null +++ b/src/main/java/eu/midnightdust/customsplashscreen/texture/ConfigTexture.java @@ -0,0 +1,38 @@ +package eu.midnightdust.customsplashscreen.texture; + +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.resource.metadata.TextureResourceMetadata; +import net.minecraft.client.texture.NativeImage; +import net.minecraft.client.texture.ResourceTexture; +import net.minecraft.resource.ResourceManager; +import net.minecraft.util.Identifier; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; + +public class ConfigTexture extends ResourceTexture { + // Load textures from the config directory // + + public ConfigTexture(Identifier location) { + super(location); + } + + protected TextureData loadTextureData(ResourceManager resourceManager) { + try { + InputStream input = new FileInputStream(FabricLoader.getInstance().getConfigDir()+"/customsplashscreen/"+this.location.toString().replace("minecraft:","")); + TextureData texture; + + try { + texture = new TextureData(new TextureResourceMetadata(false, true), NativeImage.read(input)); + } finally { + input.close(); + } + + return texture; + } catch (IOException var18) { + return new TextureData(var18); + } + } + +} diff --git a/src/main/java/eu/midnightdust/customsplashscreen/texture/EmptyTexture.java b/src/main/java/eu/midnightdust/customsplashscreen/texture/EmptyTexture.java new file mode 100644 index 0000000..ee25ac2 --- /dev/null +++ b/src/main/java/eu/midnightdust/customsplashscreen/texture/EmptyTexture.java @@ -0,0 +1,40 @@ +package eu.midnightdust.customsplashscreen.texture; + +import net.minecraft.client.resource.metadata.TextureResourceMetadata; +import net.minecraft.client.texture.NativeImage; +import net.minecraft.client.texture.ResourceTexture; +import net.minecraft.resource.ResourceManager; +import net.minecraft.util.Identifier; + +import java.io.IOException; +import java.io.InputStream; + +public class EmptyTexture extends ResourceTexture { + // Empty texture used for hiding the default mojang logo when using other logo styles // + + public EmptyTexture(Identifier location) { + super(location); + } + + protected TextureData loadTextureData(ResourceManager resourceManager) { + try { + InputStream input = Thread.currentThread().getContextClassLoader().getResourceAsStream("empty.png"); + TextureData texture = null; + + if( input != null ) { + + try { + texture = new TextureData(new TextureResourceMetadata(true, true), NativeImage.read(input)); + } finally { + input.close(); + } + + } + + return texture; + } catch (IOException var18) { + return new TextureData(var18); + } + } + +} diff --git a/src/main/resources/assets/customsplashscreen/icon.png b/src/main/resources/assets/customsplashscreen/icon.png new file mode 100644 index 0000000..e181de3 Binary files /dev/null and b/src/main/resources/assets/customsplashscreen/icon.png differ diff --git a/src/main/resources/assets/customsplashscreen/lang/en_us.json b/src/main/resources/assets/customsplashscreen/lang/en_us.json new file mode 100644 index 0000000..d61caac --- /dev/null +++ b/src/main/resources/assets/customsplashscreen/lang/en_us.json @@ -0,0 +1,19 @@ +{ + "text.autoconfig.customsplashscreen.title":"Custom Splash Screen Config", + "text.autoconfig.customsplashscreen.option.progressBarType":"Progress Bar Type", + "text.autoconfig.customsplashscreen.option.logoStyle":"Logo Style", + "text.autoconfig.customsplashscreen.option.backgroundImage":"Background Image", + "text.autoconfig.customsplashscreen.option.backgroundColor":"Background Color", + "text.autoconfig.customsplashscreen.option.progressBarColor":"Progress Bar Color", + "text.autoconfig.customsplashscreen.option.progressFrameColor":"Progress Bar Frame Color", + "text.autoconfig.customsplashscreen.option.customProgressBarMode":"Custom Progress Bar Mode", + "text.autoconfig.customsplashscreen.option.customProgressBarBackground":"Custom Progress Bar Background", + "text.autoconfig.customsplashscreen.option.bossBarType":"Boss Bar Style", + "text.autoconfig.customsplashscreen.option.textures":"Texture Locations", + "text.autoconfig.customsplashscreen.option.textures.MojangLogo":"Mojang Logo", + "text.autoconfig.customsplashscreen.option.textures.Aspect1to1Logo":"Aspect 1 to 1 Logo", + "text.autoconfig.customsplashscreen.option.textures.BossBarTexture":"Boss Bar Texture", + "text.autoconfig.customsplashscreen.option.textures.CustomBarTexture":"Custom Progress Bar Texture", + "text.autoconfig.customsplashscreen.option.textures.CustomBarBackgroundTexture":"Custom Progress Bar Background Texture", + "text.autoconfig.customsplashscreen.option.textures.BackgroundTexture":"Background Texture" +} \ No newline at end of file diff --git a/src/main/resources/background.png b/src/main/resources/background.png new file mode 100644 index 0000000..2ba4187 Binary files /dev/null and b/src/main/resources/background.png differ diff --git a/src/main/resources/customsplashscreen.mixins.json b/src/main/resources/customsplashscreen.mixins.json new file mode 100644 index 0000000..4f5dfdf --- /dev/null +++ b/src/main/resources/customsplashscreen.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "eu.midnightdust.customsplashscreen.mixin", + "compatibilityLevel": "JAVA_8", + "client": [ + "SplashScreenMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/empty.png b/src/main/resources/empty.png new file mode 100644 index 0000000..34380b9 Binary files /dev/null and b/src/main/resources/empty.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..a1f9d0b --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,43 @@ +{ + "schemaVersion": 1, + "id": "customsplashscreen", + "version": "${version}", + + "name": "Custom Splash Screen", + "description": "Change minecraft's loading screen to your liking! Completely configurable!", + "authors": [ + "Motschen", + "TeamMidnightDust" + ], + "contact": { + "homepage": "https://www.midnightdust.eu/", + "sources": "https://github.com/TeamMidnightDust/CustomSplashScreen", + "issues": "https://github.com/TeamMidnightDust/CustomSplashScreen/issues" + }, + + "license": "MIT", + "icon": "assets/customsplashscreen/icon.png", + + "environment": "client", + "entrypoints": { + "client": [ + "eu.midnightdust.customsplashscreen.CustomSplashScreenClient" + ], + "modmenu": [ + "eu.midnightdust.customsplashscreen.config.ModMenuIntegration" + ] + }, + + "mixins": [ + "customsplashscreen.mixins.json" + ], + + "depends": { + "autoconfig1u": "*", + "cloth-config2": "*" + }, + "breaks": { + "splash": "*", + "dark-loading-screen": "*" + } +} diff --git a/src/main/resources/mojangstudios.png b/src/main/resources/mojangstudios.png new file mode 100644 index 0000000..557113a Binary files /dev/null and b/src/main/resources/mojangstudios.png differ diff --git a/src/main/resources/mojank.png b/src/main/resources/mojank.png new file mode 100644 index 0000000..20f9435 Binary files /dev/null and b/src/main/resources/mojank.png differ diff --git a/src/main/resources/progressbar.png b/src/main/resources/progressbar.png new file mode 100644 index 0000000..a4dc9c6 Binary files /dev/null and b/src/main/resources/progressbar.png differ diff --git a/src/main/resources/progressbar_background.png b/src/main/resources/progressbar_background.png new file mode 100644 index 0000000..9aa7a5a Binary files /dev/null and b/src/main/resources/progressbar_background.png differ