diff --git a/.gitignore b/.gitignore new file mode 100755 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 100755 index 0000000..96d8e42 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 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/build.gradle b/build.gradle new file mode 100755 index 0000000..5c882b4 --- /dev/null +++ b/build.gradle @@ -0,0 +1,87 @@ +plugins { + id 'fabric-loom' version '0.8-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +minecraft { +} + +repositories { + maven { + url = "https://api.modrinth.com/maven" + } +} + +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" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "maven.modrinth:iris:${project.iris_version}" + modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}" + include "maven.modrinth:midnightlib:${project.midnightlib_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + // 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 + // If Javadoc is generated, this must be specified in that task too. + it.options.encoding = "UTF-8" + + // Minecraft 1.17 (21w19a) upwards uses Java 16. + it.options.release = 16 +} + +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() +} + +jar { + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } +} + +// 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 + } + } + } + + // 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. + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100755 index 0000000..3c25d4d --- /dev/null +++ b/gradle.properties @@ -0,0 +1,19 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G + +# Fabric Properties + # check these on https://fabricmc.net/use + minecraft_version=1.17.1 + yarn_mappings=1.17.1+build.61 + loader_version=0.11.7 + +# Mod Properties + mod_version = 1.0.0 + maven_group = eu.midnightdust + archives_base_name = picturesign + +# 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.40.1+1.17 + midnightlib_version=0.2.6 + iris_version=mc1.17.1-1.1.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100755 index 0000000..e708b1c 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 100755 index 0000000..e5338d3 --- /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-7.0.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/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 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 + # 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=`expr $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" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100755 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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 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%" == "0" goto execute + +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 execute + +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 + +: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%"=="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 100755 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/picturesign/PictureDownloader.java b/src/main/java/eu/midnightdust/picturesign/PictureDownloader.java new file mode 100755 index 0000000..895c143 --- /dev/null +++ b/src/main/java/eu/midnightdust/picturesign/PictureDownloader.java @@ -0,0 +1,109 @@ +package eu.midnightdust.picturesign; + +import eu.midnightdust.picturesign.config.PictureSignConfig; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.texture.NativeImage; +import net.minecraft.client.texture.NativeImageBackedTexture; +import net.minecraft.util.Identifier; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.io.*; +import java.net.URL; +import java.util.Hashtable; +import java.util.concurrent.ExecutorService; + +import static java.util.concurrent.Executors.newFixedThreadPool; + +public class PictureDownloader { + + public static class PictureData { + public String url; + public Identifier identifier; + + public PictureData(String url) { + this.url = url; + } + } + static PictureDownloader downloader = new PictureDownloader(); + + public static PictureDownloader getInstance() { + return downloader; + } + + // Create a service for downloading the picture + private final ExecutorService service = newFixedThreadPool(PictureSignConfig.maxThreads); + + private final Hashtable cache = new Hashtable<>(); + + private final Object mutex = new Object(); + + // Downloads the picture, or returns the cached picture + public PictureData getPicture(String url) { + synchronized (mutex) { + // Try to get the picture from cache + PictureData data = this.cache.get(url); + if (data == null) { + // Download the picture if not in cache + this.downloadPicture(url); + return null; + } + + if (data.identifier == null) { + return null; + } + + return data; + } + } + + // Download the image and save it in cache + private void downloadPicture(String url) { + if (PictureSignConfig.debug) PictureSignClient.LOGGER.info("Started downloading picture: " + url); + this.cache.put(url, new PictureData(url)); + + service.submit(() -> { + try { + BufferedInputStream in = new BufferedInputStream(new URL(url).openStream()); + File file = File.createTempFile(".picturesign", "temp"); + file.deleteOnExit(); + + BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(file)); + + byte[] dataBuffer = new byte[1024]; + int bytesRead; + while ((bytesRead = in.read(dataBuffer, 0, 1024)) != -1) { + out.write(dataBuffer, 0, bytesRead); + } + + out.close(); + + // Convert to png + BufferedImage bufferedImage = ImageIO.read(file); + + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + ImageIO.write(bufferedImage, "png", byteArrayOutputStream); + + InputStream inputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray()); + + NativeImage nativeImage = NativeImage.read(inputStream); + NativeImageBackedTexture nativeImageBackedTexture = new NativeImageBackedTexture(nativeImage); + + Identifier texture = MinecraftClient.getInstance().getTextureManager().registerDynamicTexture("picturesign/image", + nativeImageBackedTexture); + + // Cache the downloaded picture + synchronized (mutex) { + PictureData data = this.cache.get(url); + data.identifier = texture; + } + + if (PictureSignConfig.debug) PictureSignClient.LOGGER.info("Finished downloading picture: " + url); + + } catch (IOException error) { + PictureSignClient.LOGGER.error("Error downloading picture: " + error); + } + }); + } +} + diff --git a/src/main/java/eu/midnightdust/picturesign/PictureSignClient.java b/src/main/java/eu/midnightdust/picturesign/PictureSignClient.java new file mode 100755 index 0000000..983bf9a --- /dev/null +++ b/src/main/java/eu/midnightdust/picturesign/PictureSignClient.java @@ -0,0 +1,14 @@ +package eu.midnightdust.picturesign; + +import eu.midnightdust.picturesign.config.PictureSignConfig; +import net.fabricmc.api.ClientModInitializer; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class PictureSignClient implements ClientModInitializer { + public static Logger LOGGER = LogManager.getLogger("PictureSign"); + @Override + public void onInitializeClient() { + PictureSignConfig.init("picturesign", PictureSignConfig.class); + } +} diff --git a/src/main/java/eu/midnightdust/picturesign/config/PictureSignConfig.java b/src/main/java/eu/midnightdust/picturesign/config/PictureSignConfig.java new file mode 100755 index 0000000..75d43fe --- /dev/null +++ b/src/main/java/eu/midnightdust/picturesign/config/PictureSignConfig.java @@ -0,0 +1,9 @@ +package eu.midnightdust.picturesign.config; + +import eu.midnightdust.lib.config.MidnightConfig; + +public class PictureSignConfig extends MidnightConfig { + @Entry public static boolean enabled = true; + @Entry public static boolean debug = false; + @Entry(min = 1, max = 10) public static int maxThreads = 4; +} diff --git a/src/main/java/eu/midnightdust/picturesign/mixin/MixinSignBlockEntityRenderer.java b/src/main/java/eu/midnightdust/picturesign/mixin/MixinSignBlockEntityRenderer.java new file mode 100755 index 0000000..9c8095b --- /dev/null +++ b/src/main/java/eu/midnightdust/picturesign/mixin/MixinSignBlockEntityRenderer.java @@ -0,0 +1,30 @@ +package eu.midnightdust.picturesign.mixin; + +import eu.midnightdust.picturesign.config.PictureSignConfig; +import eu.midnightdust.picturesign.render.PictureSignRenderer; +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.client.render.*; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.block.entity.SignBlockEntityRenderer; +import net.minecraft.client.util.math.MatrixStack; +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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(SignBlockEntityRenderer.class) +public abstract class MixinSignBlockEntityRenderer implements BlockEntityRenderer { + PictureSignRenderer psRenderer = new PictureSignRenderer(); + + @Inject(at = @At("HEAD"), method = "render") + public void ps$onRender(SignBlockEntity signBlockEntity, float f, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light, int overlay, CallbackInfo ci) { + if (PictureSignConfig.enabled && signBlockEntity.getTextOnRow(0,false).getString().matches("(!PS:.*)")) { + psRenderer.render(signBlockEntity, matrixStack, light, overlay); + } + } + @Inject(at = @At("HEAD"), method = "shouldRender", cancellable = true) + private static void shouldRender(SignBlockEntity sign, int signColor, CallbackInfoReturnable cir) { + if (PictureSignConfig.enabled && sign.getTextOnRow(0,false).getString().matches("(!PS:.*)")) cir.setReturnValue(true); + } +} diff --git a/src/main/java/eu/midnightdust/picturesign/render/PictureSignRenderer.java b/src/main/java/eu/midnightdust/picturesign/render/PictureSignRenderer.java new file mode 100755 index 0000000..e5c1a27 --- /dev/null +++ b/src/main/java/eu/midnightdust/picturesign/render/PictureSignRenderer.java @@ -0,0 +1,120 @@ +package eu.midnightdust.picturesign.render; + +import com.mojang.blaze3d.systems.RenderSystem; +import eu.midnightdust.picturesign.PictureDownloader; +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.client.render.*; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.state.property.Properties; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Matrix4f; +import net.minecraft.util.math.Quaternion; +import net.minecraft.util.math.Vec3f; + +import java.util.Arrays; +import java.util.List; + +public class PictureSignRenderer { + + public void render(SignBlockEntity signBlockEntity, MatrixStack matrixStack, int light, int overlay) { + String text = signBlockEntity.getTextOnRow(0, false).getString() + + signBlockEntity.getTextOnRow(1, false).getString() + + signBlockEntity.getTextOnRow(2, false).getString(); + String url = text.replaceAll("!PS:", "").replaceAll(" ",""); + if (url.contains("imgur:")) url = url.replace("imgur:", "https://i.imgur.com/"); + if (url.contains("imgbb:")) url = url.replace("imgbb:", "https://i.ibb.co/"); + if (!url.contains("https://") && !url.contains("http://")) { + url = "https://" + url; + } + if (!url.contains(".png") && !url.contains(".jpg") && !url.contains(".jpeg")) return; + String lastLine = signBlockEntity.getTextOnRow(3, false).getString(); + + if (!lastLine.matches("(.*\\d:.*\\d:.*\\d:.*\\d:.*\\d)")) return; + + List scale = Arrays.stream(lastLine.split(":")).toList(); + float width = 0; + float height = 0; + float x = 0; + float y = 0; + float z = 0; + try { + width = Float.parseFloat(scale.get(0)); + height = Float.parseFloat(scale.get(1)); + x = Float.parseFloat(scale.get(2)); + y = Float.parseFloat(scale.get(3)); + z = Float.parseFloat(scale.get(4)); + } + catch (NumberFormatException ignored) {} + + // Download the picture data + PictureDownloader.PictureData data = PictureDownloader.getInstance().getPicture(url); + if (data == null || data.identifier == null) { + return; + } + + float xOffset = 0.0F; + float zOffset = 0.0F; + + Quaternion yRotation = Vec3f.POSITIVE_Y.getDegreesQuaternion(0F); + + if (signBlockEntity.getCachedState().contains(Properties.HORIZONTAL_FACING)) { + Direction direction = signBlockEntity.getCachedState().get(Properties.HORIZONTAL_FACING); + switch (direction) { + case NORTH -> { + zOffset = 1.01F; + xOffset = 1.0F; + yRotation = Vec3f.POSITIVE_Y.getDegreesQuaternion(180.0F); + } + case SOUTH -> zOffset = 0.010F; + case EAST -> { + zOffset = 1.01F; + yRotation = Vec3f.POSITIVE_Y.getDegreesQuaternion(90.0F); + } + case WEST -> { + yRotation = Vec3f.POSITIVE_Y.getDegreesQuaternion(-90.0F); + xOffset = 1.01F; + } + } + } + else if (signBlockEntity.getCachedState().contains(Properties.ROTATION)) { + yRotation = Vec3f.POSITIVE_Y.getDegreesQuaternion(signBlockEntity.getCachedState().get(Properties.ROTATION) * -22.5f); + } + else return; + + + Tessellator tessellator = Tessellator.getInstance(); + BufferBuilder buffer = tessellator.getBuffer(); + + matrixStack.push(); + + RenderSystem.setShader(GameRenderer::getPositionTexShader); + RenderSystem.setShaderTexture(0, data.identifier); + + RenderSystem.disableBlend(); + RenderSystem.enableDepthTest(); + RenderSystem.depthMask(true); + + matrixStack.translate(xOffset + x, 0.00F + y, zOffset + z); + matrixStack.multiply(yRotation); + + Matrix4f matrix4f = matrixStack.peek().getModel(); + buffer.begin(VertexFormat.DrawMode.QUADS, VertexFormats.POSITION_TEXTURE_COLOR); + + buffer.vertex(matrix4f, width, 0.0F, 1.0F).texture(1.0F, 1.0F).color(255, 255, 255, 255) + .light(light).overlay(overlay).next(); + + buffer.vertex(matrix4f, width, height, 1.0F).texture(1.0F, 0.0F).color(255, 255, 255, 255) + .light(light).overlay(overlay).next(); + + buffer.vertex(matrix4f, 0.0F, height, 1.0F).texture(0.0F, 0.0F).color(255, 255, 255, 255) + .light(light).overlay(overlay).next(); + + buffer.vertex(matrix4f, 0.0F, 0.0F, 1.0F).texture(0.0F, 1.0F).color(255, 255, 255, 255) + .light(light).overlay(overlay).next(); + + tessellator.draw(); + matrixStack.pop(); + + RenderSystem.disableDepthTest(); + } +} diff --git a/src/main/resources/assets/picturesign/icon.png b/src/main/resources/assets/picturesign/icon.png new file mode 100755 index 0000000..2a0d83a Binary files /dev/null and b/src/main/resources/assets/picturesign/icon.png differ diff --git a/src/main/resources/assets/picturesign/lang/en_us.json b/src/main/resources/assets/picturesign/lang/en_us.json new file mode 100755 index 0000000..a1dd397 --- /dev/null +++ b/src/main/resources/assets/picturesign/lang/en_us.json @@ -0,0 +1,7 @@ +{ + "picturesign.midnightconfig.title":"PictureSign Config", + + "picturesign.midnightconfig.enabled":"Enabled", + "picturesign.midnightconfig.debug":"Send debug info", + "picturesign.midnightconfig.maxThreads":"Max download threads" +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100755 index 0000000..9f887c7 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,34 @@ +{ + "schemaVersion": 1, + "id": "picturesign", + "version": "${version}", + + "name": "PictureSign", + "description": "Use signs to display custom images completely client-side!", + "authors": [ + "Motschen", + "TeamMidnightDust" + ], + "contact": { + "homepage": "https://www.midnightdust.eu/", + "sources": "https://github.com/TeamMidnightDust/PictureSign", + "issues": "https://github.com/TeamMidnightDust/PictureSign/issues" + }, + + "license": "MIT", + "icon": "assets/picturesign/icon.png", + + "environment": "client", + "entrypoints": { + "client": [ + "eu.midnightdust.picturesign.PictureSignClient" + ] + }, + + "depends": { + "midnightlib": "*" + }, + "mixins": [ + "picturesign.mixins.json" + ] +} diff --git a/src/main/resources/picturesign.mixins.json b/src/main/resources/picturesign.mixins.json new file mode 100755 index 0000000..158464b --- /dev/null +++ b/src/main/resources/picturesign.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "eu.midnightdust.picturesign.mixin", + "compatibilityLevel": "JAVA_16", + "client": [ + "MixinSignBlockEntityRenderer" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file