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/build.gradle b/build.gradle new file mode 100644 index 0000000..8e521a0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,84 @@ +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}") + modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}") + modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}") +} + +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..a31d05a --- /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 = roundtrees + +# 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.2.0-unstable + cloth_config_version = 4.7.0-unstable + 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/roundtrees/RoundTreesClient.java b/src/main/java/eu/midnightdust/roundtrees/RoundTreesClient.java new file mode 100644 index 0000000..dc28545 --- /dev/null +++ b/src/main/java/eu/midnightdust/roundtrees/RoundTreesClient.java @@ -0,0 +1,16 @@ +package eu.midnightdust.roundtrees; + +import eu.midnightdust.roundtrees.config.RoundTreesConfig; +import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; +import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer; +import net.fabricmc.api.ClientModInitializer; + +public class RoundTreesClient implements ClientModInitializer { + public static RoundTreesConfig RT_CONFIG; + + @Override + public void onInitializeClient() { + AutoConfig.register(RoundTreesConfig.class, JanksonConfigSerializer::new); + RT_CONFIG = AutoConfig.getConfigHolder(RoundTreesConfig.class).getConfig(); + } +} diff --git a/src/main/java/eu/midnightdust/roundtrees/config/ModMenuIntegration.java b/src/main/java/eu/midnightdust/roundtrees/config/ModMenuIntegration.java new file mode 100644 index 0000000..adcbabc --- /dev/null +++ b/src/main/java/eu/midnightdust/roundtrees/config/ModMenuIntegration.java @@ -0,0 +1,16 @@ +package eu.midnightdust.roundtrees.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() { + return parent -> AutoConfig.getConfigScreen(RoundTreesConfig.class, parent).get(); + } +} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/roundtrees/config/RoundTreesConfig.java b/src/main/java/eu/midnightdust/roundtrees/config/RoundTreesConfig.java new file mode 100644 index 0000000..07dacfb --- /dev/null +++ b/src/main/java/eu/midnightdust/roundtrees/config/RoundTreesConfig.java @@ -0,0 +1,13 @@ +package eu.midnightdust.roundtrees.config; + +import me.sargunvohra.mcmods.autoconfig1u.ConfigData; +import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; +import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; + +@Config(name = "roundtrees") +public class RoundTreesConfig implements ConfigData { + @Comment(value = "Enable round log bounding box") + public boolean round_box = true; + @Comment(value = "Expand signs placed on log blocks for better visibility") + public boolean sign_fix = true; +} diff --git a/src/main/java/eu/midnightdust/roundtrees/mixin/MixinLogBlock.java b/src/main/java/eu/midnightdust/roundtrees/mixin/MixinLogBlock.java new file mode 100644 index 0000000..094bd00 --- /dev/null +++ b/src/main/java/eu/midnightdust/roundtrees/mixin/MixinLogBlock.java @@ -0,0 +1,65 @@ +package eu.midnightdust.roundtrees.mixin; + +import eu.midnightdust.roundtrees.RoundTreesClient; +import net.minecraft.block.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(PillarBlock.class) +public abstract class MixinLogBlock extends Block { + private static final VoxelShape CUBE_SHAPE; + private static final VoxelShape X_SHAPE; + private static final VoxelShape Y_SHAPE; + private static final VoxelShape Z_SHAPE; + + public MixinLogBlock(Settings settings) { + super(settings); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) { + if (state.getBlock().toString().toLowerCase().contains("log") && RoundTreesClient.RT_CONFIG.round_box) { + switch (state.get(PillarBlock.AXIS)) { + case X: + return X_SHAPE; + case Y: + return Y_SHAPE; + case Z: + return Z_SHAPE; + default: + return Y_SHAPE; + } + } + else { return CUBE_SHAPE; } + + } + static { + VoxelShape cube = createCuboidShape(0, 0, 0, 16, 16, 16); + VoxelShape y1 = createCuboidShape(-1, 0, 2, 17, 16, 14); + VoxelShape y2 = createCuboidShape(2, 0, -1, 14, 16, 17); + VoxelShape y3 = createCuboidShape(-2, 0, 4, 18, 16, 12); + VoxelShape y4 = createCuboidShape(4, 0, -2, 12, 16, 18); + + VoxelShape x1 = createCuboidShape(0,-1, 2, 16,17, 14); + VoxelShape x2 = createCuboidShape(0,2, -1, 16,14, 17); + VoxelShape x3 = createCuboidShape(0,-2, 4, 16,18, 12); + VoxelShape x4 = createCuboidShape(0,4, -2, 16,12, 18); + + VoxelShape z1 = createCuboidShape(-1, 2, 0, 17, 14, 16); + VoxelShape z2 = createCuboidShape(2, -1, 0, 14, 17, 16); + VoxelShape z3 = createCuboidShape(-2, 4, 0, 18, 12, 16); + VoxelShape z4 = createCuboidShape(4, -2, 0, 12, 18, 16); + + VoxelShape y_shape = VoxelShapes.union(cube, y1, y2, y3, y4); + VoxelShape x_shape = VoxelShapes.union(cube, x1, x2, x3, x4); + VoxelShape z_shape = VoxelShapes.union(cube, z1, z2, z3, z4); + + CUBE_SHAPE = cube; + X_SHAPE = x_shape; + Y_SHAPE = y_shape; + Z_SHAPE = z_shape; + } +} diff --git a/src/main/java/eu/midnightdust/roundtrees/mixin/MixinSignBlockEntityRenderer.java b/src/main/java/eu/midnightdust/roundtrees/mixin/MixinSignBlockEntityRenderer.java new file mode 100644 index 0000000..e4feb8b --- /dev/null +++ b/src/main/java/eu/midnightdust/roundtrees/mixin/MixinSignBlockEntityRenderer.java @@ -0,0 +1,97 @@ +package eu.midnightdust.roundtrees.mixin; + +import eu.midnightdust.roundtrees.RoundTreesClient; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.WallSignBlock; +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; +import net.minecraft.client.render.block.entity.BlockEntityRenderer; +import net.minecraft.client.render.block.entity.SignBlockEntityRenderer; +import net.minecraft.client.texture.NativeImage; +import net.minecraft.client.util.SpriteIdentifier; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.client.util.math.Vector3f; +import net.minecraft.text.OrderedText; +import net.minecraft.util.math.Direction; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.List; + +@Mixin(SignBlockEntityRenderer.class) +public abstract class MixinSignBlockEntityRenderer extends BlockEntityRenderer { + + + public MixinSignBlockEntityRenderer(BlockEntityRenderDispatcher dispatcher) { + super(dispatcher); + } + + @Shadow @Final private SignBlockEntityRenderer.SignModel model; + @Shadow public static SpriteIdentifier getModelTexture(Block block) { + return null; + } + + + @Inject(at = @At("TAIL"), method = "render") + @Environment(EnvType.CLIENT) + public void render(SignBlockEntity signBlockEntity, float f, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, int j, CallbackInfo ci) { + BlockState blockState = signBlockEntity.getCachedState(); + float h = 0; + + if (blockState.getBlock() instanceof WallSignBlock && RoundTreesClient.RT_CONFIG.sign_fix) { + switch (blockState.get(WallSignBlock.FACING)) { + case NORTH:if (signBlockEntity.getWorld().getBlockState(signBlockEntity.getPos().south()).getBlock().toString().toLowerCase().contains("log")) {renderSignExtention(signBlockEntity, f, matrixStack, vertexConsumerProvider, i, j, h, blockState);}; + case EAST:if (signBlockEntity.getWorld().getBlockState(signBlockEntity.getPos().west()).getBlock().toString().toLowerCase().contains("log")) {renderSignExtention(signBlockEntity, f, matrixStack, vertexConsumerProvider, i, j, h, blockState);}; + case SOUTH:if (signBlockEntity.getWorld().getBlockState(signBlockEntity.getPos().north()).getBlock().toString().toLowerCase().contains("log")) {renderSignExtention(signBlockEntity, f, matrixStack, vertexConsumerProvider, i, j, h, blockState);}; + case WEST:if (signBlockEntity.getWorld().getBlockState(signBlockEntity.getPos().east()).getBlock().toString().toLowerCase().contains("log")) {renderSignExtention(signBlockEntity, f, matrixStack, vertexConsumerProvider, i, j, h, blockState);}; + default:; + } + } + } + + public void renderSignExtention(SignBlockEntity signBlockEntity, float f, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, int j, float h, BlockState blockState) { + matrixStack.push(); + matrixStack.translate(0.5D, 0.5D, 0.5D); + h = -((Direction) blockState.get(WallSignBlock.FACING)).asRotation(); + matrixStack.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(h)); + matrixStack.translate(0.0D, -0.3125D, -0.4375D+0.04); + matrixStack.push(); + matrixStack.scale(0.6667F, -0.6667F, -0.6667F); + SpriteIdentifier spriteIdentifier = getModelTexture(blockState.getBlock()); + SignBlockEntityRenderer.SignModel var10002 = this.model; + var10002.getClass(); + VertexConsumer vertexConsumer = spriteIdentifier.getVertexConsumer(vertexConsumerProvider, var10002::getLayer); + this.model.field.render(matrixStack, vertexConsumer, i, j); + matrixStack.pop(); + TextRenderer textRenderer = this.dispatcher.getTextRenderer(); + matrixStack.translate(0.0D, 0.3333333432674408D, 0.046666666865348816D+0.013); + matrixStack.scale(0.010416667F, -0.010416667F, 0.010416667F); + int m = signBlockEntity.getTextColor().getSignColor(); + int n = (int)((double) NativeImage.getRed(m) * 0.4D); + int o = (int)((double)NativeImage.getGreen(m) * 0.4D); + int p = (int)((double)NativeImage.getBlue(m) * 0.4D); + int q = NativeImage.getAbgrColor(0, p, o, n); + + for(int s = 0; s < 4; ++s) { + OrderedText orderedText = signBlockEntity.getTextBeingEditedOnRow(s, (text) -> { + List list = textRenderer.wrapLines(text, 90); + return list.isEmpty() ? OrderedText.EMPTY : (OrderedText)list.get(0); + }); + if (orderedText != null) { + float t = (float)(-textRenderer.getWidth(orderedText) / 2); + textRenderer.draw(orderedText, t, (float)(s * 10 - 20), q, false, matrixStack.peek().getModel(), vertexConsumerProvider, false, 0, i); + } + } + matrixStack.pop(); + } +} diff --git a/src/main/resources/assets/roundtrees/icon.png b/src/main/resources/assets/roundtrees/icon.png new file mode 100644 index 0000000..83c5e3c Binary files /dev/null and b/src/main/resources/assets/roundtrees/icon.png differ diff --git a/src/main/resources/assets/roundtrees/lang/en_us.json b/src/main/resources/assets/roundtrees/lang/en_us.json new file mode 100644 index 0000000..4a9422a --- /dev/null +++ b/src/main/resources/assets/roundtrees/lang/en_us.json @@ -0,0 +1,5 @@ +{ + "text.autoconfig.roundtrees.title": "Round Trees Config", + "text.autoconfig.roundtrees.option.round_box": "Enable round log bounding box", + "text.autoconfig.roundtrees.option.sign_fix": "Fix signs placed on log blocks" +} \ 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 100644 index 0000000..777672b --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,38 @@ +{ + "schemaVersion": 1, + "id": "roundtrees", + "version": "${version}", + + "name": "Round Trees", + "description": "Makes the Round Trees resourcepack better by changing the log's bounding box and fixing signs on logs.", + "authors": [ + "Motschen", + "TeamMidnightDust" + ], + "contact": { + "homepage": "https://www.midnightdust.eu/", + "sources": "https://github.com/TeamMidnightDust/RoundTrees", + "issues": "https://github.com/TeamMidnightDust/RoundTrees/issues" + }, + + "license": "MIT", + "icon": "assets/roundtrees/icon.png", + + "environment": "client", + "entrypoints": { + "client": [ + "eu.midnightdust.roundtrees.RoundTreesClient" + ], + "modmenu": [ + "eu.midnightdust.roundtrees.config.ModMenuIntegration" + ] + }, + + "mixins": [ + "roundtrees.mixins.json" + ], + + "depends": { + "fabric": "*" + } +} diff --git a/src/main/resources/roundtrees.mixins.json b/src/main/resources/roundtrees.mixins.json new file mode 100644 index 0000000..dd812d7 --- /dev/null +++ b/src/main/resources/roundtrees.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "package": "eu.midnightdust.roundtrees.mixin", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinLogBlock", + "MixinSignBlockEntityRenderer" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file