diff --git a/build.gradle b/build.gradle index 3e05d80..8d073fa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'babric-loom' version '1.1.7' + id 'babric-loom' version '1.4.2' id 'maven-publish' } @@ -77,12 +77,12 @@ dependencies { modImplementation("com.github.calmilamsy:ModMenu:${project.modmenu_version}") { transitive false } - modImplementation("net.glasslauncher.mods:GlassConfigAPI:${project.gcapi_version}") { - transitive false - } - modImplementation("net.glasslauncher:HowManyItems-Fabric-Unofficial:${project.howmanyitems_version}") { - transitive false - } +// modImplementation("net.glasslauncher.mods:GlassConfigAPI:${project.gcapi_version}") { +// transitive false +// } +// modImplementation("net.glasslauncher:HowManyItems-Fabric-Unofficial:${project.howmanyitems_version}") { +// transitive false +// } } processResources { diff --git a/gradle.properties b/gradle.properties index 74d2766..4fa7101 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.daemon=false # check these on https://fabricmc.net/develop minecraft_version=b1.7.3 yarn_mappings=b1.7.3+526f17e -loader_version=0.14.19-babric.1 +loader_version=0.14.24-babric.1 # Mod Properties mod_version=1.1.3 @@ -14,7 +14,7 @@ maven_group=net.mine_diver archives_base_name=SmoothBeta # Dependencies -stapi_version=b4e08b5 +stapi_version=a3970ee # Extra Dependencies gcapi_version=1.1.6 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 490fda8..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d0b7eaa..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Sun Jun 14 19:21:24 BST 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME \ No newline at end of file diff --git a/gradlew b/gradlew index 2fe81a7..c53aefa 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/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,78 +17,113 @@ # ############################################################################## -## -## 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 - ;; - 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 + # 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" + 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 @@ -97,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 @@ -105,79 +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 -# 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; +# * $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. +# -# 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" +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/gradlew.bat b/gradlew.bat index 62bd9b9..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,28 +64,14 @@ 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% +"%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 diff --git a/src/main/java/net/mine_diver/smoothbeta/SmoothBeta.java b/src/main/java/net/mine_diver/smoothbeta/SmoothBeta.java index 74f8423..98ac39b 100644 --- a/src/main/java/net/mine_diver/smoothbeta/SmoothBeta.java +++ b/src/main/java/net/mine_diver/smoothbeta/SmoothBeta.java @@ -2,14 +2,14 @@ import net.modificationstation.stationapi.api.mod.entrypoint.Entrypoint; import net.modificationstation.stationapi.api.mod.entrypoint.EventBusPolicy; -import net.modificationstation.stationapi.api.registry.ModID; +import net.modificationstation.stationapi.api.util.Namespace; import net.modificationstation.stationapi.api.util.Null; import org.apache.logging.log4j.Logger; @Entrypoint(eventBus = @EventBusPolicy(registerStatic = false, registerInstance = false)) public class SmoothBeta { - @Entrypoint.ModID - public static final ModID MODID = Null.get(); + @Entrypoint.Namespace + public static final Namespace NAMESPACE = Null.get(); @Entrypoint.Logger public static final Logger LOGGER = Null.get(); diff --git a/src/main/java/net/mine_diver/smoothbeta/client/render/Shader.java b/src/main/java/net/mine_diver/smoothbeta/client/render/Shader.java index 43bb681..a4d1fbc 100644 --- a/src/main/java/net/mine_diver/smoothbeta/client/render/Shader.java +++ b/src/main/java/net/mine_diver/smoothbeta/client/render/Shader.java @@ -11,11 +11,11 @@ import net.fabricmc.api.Environment; import net.mine_diver.smoothbeta.client.render.gl.*; import net.modificationstation.stationapi.api.client.texture.AbstractTexture; -import net.modificationstation.stationapi.api.registry.Identifier; import net.modificationstation.stationapi.api.resource.Resource; import net.modificationstation.stationapi.api.resource.ResourceFactory; -import net.modificationstation.stationapi.api.util.FileNameUtil; +import net.modificationstation.stationapi.api.util.Identifier; import net.modificationstation.stationapi.api.util.JsonHelper; +import net.modificationstation.stationapi.api.util.PathUtil; import org.apache.commons.io.IOUtils; import org.lwjgl.opengl.GL13; @@ -26,12 +26,12 @@ import java.util.*; import static net.mine_diver.smoothbeta.SmoothBeta.LOGGER; -import static net.mine_diver.smoothbeta.SmoothBeta.MODID; +import static net.mine_diver.smoothbeta.SmoothBeta.NAMESPACE; @Environment(EnvType.CLIENT) public class Shader implements GlShader, AutoCloseable { - private static final String CORE_DIRECTORY = MODID + "/shaders/core/"; - private static final String INCLUDE_DIRECTORY = MODID + "/shaders/include/"; + private static final String CORE_DIRECTORY = NAMESPACE + "/shaders/core/"; + private static final String INCLUDE_DIRECTORY = NAMESPACE + "/shaders/include/"; private static int activeShaderId; private final Map samplers = new HashMap<>(); private final List samplerNames = new ArrayList<>(); @@ -125,7 +125,7 @@ public Shader(ResourceFactory factory, String name, VertexFormat format) throws } catch (Exception exception4) { ShaderParseException shaderParseException4 = ShaderParseException.wrap(exception4); - shaderParseException4.addFaultyFile(identifier.id); + shaderParseException4.addFaultyFile(identifier.path); throw shaderParseException4; } this.modelViewMat = this.getUniform("ModelViewMat"); @@ -141,14 +141,14 @@ private static Program loadProgram(ResourceFactory factory, Program.Type type, S String string = CORE_DIRECTORY + name + type.getFileExtension(); Resource resource = factory.getResourceOrThrow(Identifier.of(string)); try (InputStream inputStream = resource.getInputStream()) { - final String string2 = FileNameUtil.getPosixFullPath(string); + final String string2 = PathUtil.getPosixFullPath(string); program2 = Program.createFromResource(type, name, inputStream, resource.getResourcePackName(), new GLImportProcessor() { private final Set visitedImports = Sets.newHashSet(); @Override public String loadImport(boolean inline, String name) { String string; - name = FileNameUtil.normalizeToPosix((inline ? string2 : Shader.INCLUDE_DIRECTORY) + name); + name = PathUtil.normalizeToPosix((inline ? string2 : Shader.INCLUDE_DIRECTORY) + name); if (!this.visitedImports.add(name)) return null; Identifier identifier = Identifier.of(name); BufferedReader reader; diff --git a/src/main/java/net/mine_diver/smoothbeta/client/render/Shaders.java b/src/main/java/net/mine_diver/smoothbeta/client/render/Shaders.java index 53b1772..bfd062b 100644 --- a/src/main/java/net/mine_diver/smoothbeta/client/render/Shaders.java +++ b/src/main/java/net/mine_diver/smoothbeta/client/render/Shaders.java @@ -3,9 +3,9 @@ import net.mine_diver.smoothbeta.client.render.gl.Program; import net.mine_diver.unsafeevents.listener.EventListener; import net.modificationstation.stationapi.api.client.event.resource.AssetsResourceReloaderRegisterEvent; -import net.modificationstation.stationapi.api.registry.Identifier; import net.modificationstation.stationapi.api.resource.IdentifiableResourceReloadListener; import net.modificationstation.stationapi.api.resource.ResourceManager; +import net.modificationstation.stationapi.api.util.Identifier; import net.modificationstation.stationapi.api.util.profiler.Profiler; import java.io.IOException; @@ -15,10 +15,10 @@ import java.util.concurrent.Executor; import java.util.function.Supplier; -import static net.mine_diver.smoothbeta.SmoothBeta.MODID; +import static net.mine_diver.smoothbeta.SmoothBeta.NAMESPACE; public class Shaders implements IdentifiableResourceReloadListener { - public static final Identifier ID = MODID.id("shaders"); + public static final Identifier ID = NAMESPACE.id("shaders"); private static Shader terrainShader; diff --git a/src/main/java/net/mine_diver/smoothbeta/client/render/gl/GLImportProcessor.java b/src/main/java/net/mine_diver/smoothbeta/client/render/gl/GLImportProcessor.java index 2b1dec5..d88d9dd 100644 --- a/src/main/java/net/mine_diver/smoothbeta/client/render/gl/GLImportProcessor.java +++ b/src/main/java/net/mine_diver/smoothbeta/client/render/gl/GLImportProcessor.java @@ -4,8 +4,8 @@ import com.google.common.collect.Lists; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.modificationstation.stationapi.api.util.FileNameUtil; -import net.modificationstation.stationapi.api.util.StringHelper; +import net.mine_diver.smoothbeta.util.StringHelper; +import net.modificationstation.stationapi.api.util.PathUtil; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; @@ -69,7 +69,7 @@ private List parseImports(String source, Context context, String path) { ++context.line; k = context.line; - List list2 = this.parseImports(string5, context, bl ? FileNameUtil.getPosixFullPath(string4) : ""); + List list2 = this.parseImports(string5, context, bl ? PathUtil.getPosixFullPath(string4) : ""); list2.set(0, String.format(Locale.ROOT, "#line %d %d\n%s", 0, k, this.extractVersion(list2.get(0), context))); if (!StringUtils.isBlank(string3)) { list.add(string3); diff --git a/src/main/java/net/mine_diver/smoothbeta/mixin/client/multidraw/compat/stationrendererapi/StationTessellatorImplMixin.java b/src/main/java/net/mine_diver/smoothbeta/mixin/client/multidraw/compat/stationrendererapi/StationTessellatorImplMixin.java index 99c8358..9d60a73 100644 --- a/src/main/java/net/mine_diver/smoothbeta/mixin/client/multidraw/compat/stationrendererapi/StationTessellatorImplMixin.java +++ b/src/main/java/net/mine_diver/smoothbeta/mixin/client/multidraw/compat/stationrendererapi/StationTessellatorImplMixin.java @@ -54,17 +54,17 @@ private void smoothbeta_renderTerrain(BakedQuad quad, float x, float y, float z, fastVertexData[22] = Float.floatToRawIntBits((float) (Float.intBitsToFloat(fastVertexData[22]) + y + access.getYOffset())); fastVertexData[23] = Float.floatToRawIntBits((float) (Float.intBitsToFloat(fastVertexData[23]) + z + access.getZOffset())); fastVertexData[27] = normal; - if (!access.getDisableColour()) { + if (!access.getColorDisabled()) { fastVertexData[5] = colour0; fastVertexData[12] = colour1; fastVertexData[19] = colour2; fastVertexData[26] = colour3; - access.setHasColour(true); + access.setHasColor(true); } access.setHasTexture(true); access.setHasNormals(true); - System.arraycopy(fastVertexData, 0, access.stationapi$getBufferArray(), access.stationapi$getBufferPosition(), 28); - access.stationapi$setVertexAmount(access.stationapi$getVertexAmount() + 4); + System.arraycopy(fastVertexData, 0, access.stationapi$getBuffer(), access.stationapi$getBufferPosition(), 28); + access.stationapi$setAddedVertexCount(access.stationapi$getAddedVertexCount() + 4); access.stationapi$setBufferPosition(access.stationapi$getBufferPosition() + 28); access.stationapi$setVertexCount(access.stationapi$getVertexCount() + 4); ensureBufferCapacity(28); diff --git a/src/main/java/net/mine_diver/smoothbeta/util/StringHelper.java b/src/main/java/net/mine_diver/smoothbeta/util/StringHelper.java new file mode 100644 index 0000000..7b6f226 --- /dev/null +++ b/src/main/java/net/mine_diver/smoothbeta/util/StringHelper.java @@ -0,0 +1,85 @@ +package net.mine_diver.smoothbeta.util; + +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.Nullable; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class StringHelper { + private static final Pattern FORMATTING_CODE = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]"); + private static final Pattern LINE_BREAK = Pattern.compile("\\r\\n|\\v"); + private static final Pattern ENDS_WITH_LINE_BREAK = Pattern.compile("(?:\\r\\n|\\v)$"); + + /** + * {@return the length of the {@code tick} in the MM:SS format, where + * the MM is the minutes and SS is the seconds (optionally zero-padded)} + */ + public static String formatTicks(int ticks) { + int i = ticks / 20; + int j = i / 60; + if ((i %= 60) < 10) { + return j + ":0" + i; + } + return j + ":" + i; + } + + /** + * {@return the {@code text} with all formatting codes removed} + * + *

A formatting code is the character {@code \u00a7} followed by + * a numeric character or a letter A to F, K to O, or R. + * + * @see Formatting#strip + */ + public static String stripTextFormat(String text) { + return FORMATTING_CODE.matcher(text).replaceAll(""); + } + + /** + * {@return true if {@code text} is {@code null} or empty, false otherwise} + */ + public static boolean isEmpty(@Nullable String text) { + return StringUtils.isEmpty(text); + } + + /** + * {@return {@code text} truncated to at most {@code maxLength} characters, + * optionally with ellipsis} + */ + public static String truncate(String text, int maxLength, boolean addEllipsis) { + if (text.length() <= maxLength) { + return text; + } + if (addEllipsis && maxLength > 3) { + return text.substring(0, maxLength - 3) + "..."; + } + return text.substring(0, maxLength); + } + + /** + * {@return the number of linebreaks in {@code text}} + * + *

A linebreak is either a CRLF sequence or a vertical tab (U+000B). + */ + public static int countLines(String text) { + if (text.isEmpty()) { + return 0; + } + Matcher matcher = LINE_BREAK.matcher(text); + int i = 1; + while (matcher.find()) { + ++i; + } + return i; + } + + /** + * {@return true if {@code text} ends with a linebreak, false otherwise} + * + *

A linebreak is either a CRLF sequence or a vertical tab (U+000B). + */ + public static boolean endsWithLineBreak(String text) { + return ENDS_WITH_LINE_BREAK.matcher(text).find(); + } +}