From 3c9ca3f179223327f2d66d3fbad62e406f3eb207 Mon Sep 17 00:00:00 2001 From: Adrien1106 Date: Thu, 8 Feb 2024 20:36:03 +0100 Subject: [PATCH] updated to 1.20.4 and took possession of the code --- LICENSE | 16 +- build.gradle | 148 ++++++--- gradle.properties | 22 +- gradle/wrapper/gradle-wrapper.jar | Bin 56177 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 5 - gradlew | 309 +++++++++++------- gradlew.bat | 56 ++-- settings.gradle | 9 + .../reframedtemplates}/Templates.java | 43 +-- .../reframedtemplates}/TemplatesClient.java | 6 +- .../TemplatesClientApiImpl.java | 12 +- .../TemplatesModelProvider.java | 4 +- .../api/TemplateInteractionUtil.java | 6 +- .../api/TemplateInteractionUtilExt.java | 2 +- .../api/TemplatesClientApi.java | 6 +- .../api/ThemeableBlockEntity.java | 2 +- .../block/TemplateBlock.java | 6 +- .../block/TemplateButtonBlock.java | 12 +- .../block/TemplateCandleBlock.java | 6 +- .../block/TemplateCarpetBlock.java | 6 +- .../block/TemplateDoorBlock.java | 8 +- .../block/TemplateEntity.java | 12 +- .../block/TemplateFenceBlock.java | 6 +- .../block/TemplateFenceGateBlock.java | 10 +- .../block/TemplateLeverBlock.java | 6 +- .../block/TemplatePaneBlock.java | 6 +- .../block/TemplatePostBlock.java | 4 +- .../block/TemplatePressurePlateBlock.java | 19 +- .../block/TemplateSlabBlock.java | 6 +- .../block/TemplateSlopeBlock.java | 11 +- .../block/TemplateStairsBlock.java | 6 +- .../block/TemplateTrapdoorBlock.java | 12 +- .../block/TemplateVerticalSlabBlock.java | 4 +- .../block/TemplateWallBlock.java | 8 +- .../block/WaterloggableTemplateBlock.java | 2 +- .../mixin/MinecraftAccessor.java | 2 +- .../mixin/WallBlockAccessor.java | 2 +- .../mixin/particles/AccessorParticle.java | 2 +- .../AccessorSpriteBillboardParticle.java | 2 +- .../particles/MixinBlockDustParticle.java | 4 +- .../mixin/particles/MixinEntity.java | 4 +- .../mixin/particles/MixinLivingEntity.java | 4 +- .../model/MeshTransformUtil.java | 4 +- .../model/QuadUvBounds.java | 2 +- .../model/RetexturingBakedModel.java | 8 +- .../model/SlopeBaseMesh.java | 4 +- .../model/TemplateAppearance.java | 2 +- .../model/TemplateAppearanceManager.java | 4 +- .../model/UnbakedAutoRetexturedModel.java | 4 +- .../model/UnbakedJsonRetexturedModel.java | 6 +- .../model/UnbakedMeshRetexturedModel.java | 4 +- .../reframedtemplates}/util/Edge.java | 2 +- .../util/StairShapeMaker.java | 2 +- .../assets/framed-templates-icon.png | Bin 0 -> 2314 bytes .../textures/block/framed_accent_block.png | Bin 0 -> 5739 bytes .../templates/textures/block/framed_block.png | Bin 0 -> 5659 bytes src/main/resources/fabric.mod.json | 29 +- src/main/resources/templates-icon.png | Bin 1283 -> 0 bytes src/main/resources/templates.mixins.json | 16 +- unused/BbModelepic.java | 67 ---- unused/TattletaleRandom.java | 83 ----- 61 files changed, 516 insertions(+), 537 deletions(-) mode change 100755 => 100644 LICENSE delete mode 100755 gradle/wrapper/gradle-wrapper.jar delete mode 100755 gradle/wrapper/gradle-wrapper.properties mode change 100755 => 100644 gradlew mode change 100755 => 100644 gradlew.bat create mode 100644 settings.gradle rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/Templates.java (83%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/TemplatesClient.java (98%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/TemplatesClientApiImpl.java (87%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/TemplatesModelProvider.java (97%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/api/TemplateInteractionUtil.java (97%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/api/TemplateInteractionUtilExt.java (93%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/api/TemplatesClientApi.java (96%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/api/ThemeableBlockEntity.java (86%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateBlock.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateButtonBlock.java (92%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateCandleBlock.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateCarpetBlock.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateDoorBlock.java (94%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateEntity.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateFenceBlock.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateFenceGateBlock.java (92%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateLeverBlock.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplatePaneBlock.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplatePostBlock.java (94%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplatePressurePlateBlock.java (83%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateSlabBlock.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateSlopeBlock.java (88%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateStairsBlock.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateTrapdoorBlock.java (91%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateVerticalSlabBlock.java (97%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/TemplateWallBlock.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/block/WaterloggableTemplateBlock.java (97%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/mixin/MinecraftAccessor.java (89%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/mixin/WallBlockAccessor.java (92%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/mixin/particles/AccessorParticle.java (89%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/mixin/particles/AccessorSpriteBillboardParticle.java (86%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/mixin/particles/MixinBlockDustParticle.java (94%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/mixin/particles/MixinEntity.java (89%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/mixin/particles/MixinLivingEntity.java (91%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/model/MeshTransformUtil.java (97%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/model/QuadUvBounds.java (98%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/model/RetexturingBakedModel.java (96%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/model/SlopeBaseMesh.java (97%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/model/TemplateAppearance.java (94%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/model/TemplateAppearanceManager.java (98%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/model/UnbakedAutoRetexturedModel.java (97%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/model/UnbakedJsonRetexturedModel.java (96%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/model/UnbakedMeshRetexturedModel.java (95%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/util/Edge.java (98%) rename src/main/java/{io/github/cottonmc/templates => fr/adrien1106/reframedtemplates}/util/StairShapeMaker.java (96%) create mode 100644 src/main/resources/assets/framed-templates-icon.png create mode 100644 src/main/resources/assets/templates/textures/block/framed_accent_block.png create mode 100644 src/main/resources/assets/templates/textures/block/framed_block.png delete mode 100644 src/main/resources/templates-icon.png delete mode 100644 unused/BbModelepic.java delete mode 100644 unused/TattletaleRandom.java diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 index 5162781..c345176 --- a/LICENSE +++ b/LICENSE @@ -1,14 +1,2 @@ -Copyright 2019 B0undarybreaker (Meredith Espinosa) - -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. +Copyright (c) 2024 +All rights reserved. diff --git a/build.gradle b/build.gradle index f1aa739..bf5655a 100755 --- a/build.gradle +++ b/build.gradle @@ -1,64 +1,114 @@ -buildscript { - repositories { - maven { - name = "Fabric" - url = "https://maven.fabricmc.net/" - content { - includeGroup "net.fabricmc" - includeGroup "fabric-loom" +plugins { + id 'fabric-loom' version '1.5-SNAPSHOT' + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +sourceSets { + main { + resources { + srcDirs += { + 'src/generated' } } - mavenCentral() } - dependencies { - classpath "fabric-loom:fabric-loom.gradle.plugin:1.1.14" - } -} - -apply plugin: "fabric-loom" - -java.toolchain.languageVersion = JavaLanguageVersion.of(17) -java.withSourcesJar() -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" - options.release = 17 -} - -repositories { - mavenCentral() - - maven { - url = "https://maven.terraformersmc.com/releases/" - content { - includeGroup "com.terraformersmc" - } - } -} - -dependencies { - minecraft "com.mojang:minecraft:1.20.1" - mappings "net.fabricmc:yarn:1.20.1+build.2" - modApi "net.fabricmc:fabric-loader:0.14.21" - modApi "net.fabricmc.fabric-api:fabric-api:0.83.1+1.20.1" - - implementation "com.google.code.findbugs:jsr305:3.0.2" - - //modRuntimeOnly "com.terraformersmc:modmenu:7.2.1" //REMAP FAILURES????? } loom { - mixin { - defaultRefmapName = "templates.refmap.json" //see templates.mixins.json. I just like to always specify the name + runs { + // This adds a new gradle task that runs the datagen API: "gradlew runDatagen" + datagen { + inherit server + name "Data Generation" + vmArg "-Dfabric-api.datagen" + vmArg "-Dfabric-api.datagen.output-dir=${file("src/generated")}" + vmArg "-Dfabric-api.datagen.modid=${mod_id}" + + runDir "build/datagen" + } } } +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +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}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" +} + processResources { inputs.property "version", project.version - filesMatching("**/fabric.mod.json") { - expand "version": project.version + inputs.property "minecraft_version", project.minecraft_version + inputs.property "loader_version", project.loader_version + filteringCharset "UTF-8" + + filesMatching("fabric.mod.json") { + expand "version": project.version, + "mod_id": mod_id, + "minecraft_version": project.minecraft_version, + "loader_version": project.loader_version } } -jar { - from "LICENSE" +def targetJavaVersion = 17 +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" + if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { + it.options.release.set(targetJavaVersion) + } +} + +java { + def javaVersion = JavaVersion.toVersion(targetJavaVersion) + if (JavaVersion.current() < javaVersion) { + toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) + } + // 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) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } } diff --git a/gradle.properties b/gradle.properties index 2a2f2f8..31f14bf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,18 @@ -# dedodated wam -org.gradle.jvmargs=-Xmx6G +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G -archivesBaseName=templates -group=io.github.cottonmc -version=2.2.0+1.20.1 \ No newline at end of file +# Fabric Properties +# check these on https://modmuss50.me/fabric.html +minecraft_version=1.20.4 +yarn_mappings=1.20.4+build.3 +loader_version=0.15.6 + +# Mod Properties +mod_version = 1.0-SNAPSHOT +maven_group = fr.adrien1106 +archives_base_name = ReFramedTemplates +mod_id = reframedtemplates + +# Dependencies +# check this on https://modmuss50.me/fabric.html +fabric_version=0.95.4+1.20.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100755 index 29953ea141f55e3b8fc691d31b5ca8816d89fa87..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56177 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 i;x|p)^~-yfPOPa3(|vBayXKz \(.*\)$'` - 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_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="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # 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 @@ -81,92 +130,120 @@ 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "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" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# 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, 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. -# 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" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) -# 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")" + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat old mode 100755 new mode 100644 index f955316..93e3f59 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@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 @@ -9,19 +25,23 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +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 +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +55,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% @@ -45,38 +65,26 @@ 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 -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f8f7d33 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,9 @@ + pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} diff --git a/src/main/java/io/github/cottonmc/templates/Templates.java b/src/main/java/fr/adrien1106/reframedtemplates/Templates.java similarity index 83% rename from src/main/java/io/github/cottonmc/templates/Templates.java rename to src/main/java/fr/adrien1106/reframedtemplates/Templates.java index 22de8f2..ed30ca2 100644 --- a/src/main/java/io/github/cottonmc/templates/Templates.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/Templates.java @@ -1,24 +1,24 @@ -package io.github.cottonmc.templates; +package fr.adrien1106.reframedtemplates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; -import io.github.cottonmc.templates.block.TemplateBlock; -import io.github.cottonmc.templates.block.TemplateButtonBlock; -import io.github.cottonmc.templates.block.TemplateCandleBlock; -import io.github.cottonmc.templates.block.TemplateCarpetBlock; -import io.github.cottonmc.templates.block.TemplateDoorBlock; -import io.github.cottonmc.templates.block.TemplateEntity; -import io.github.cottonmc.templates.block.TemplateFenceBlock; -import io.github.cottonmc.templates.block.TemplateFenceGateBlock; -import io.github.cottonmc.templates.block.TemplateLeverBlock; -import io.github.cottonmc.templates.block.TemplatePaneBlock; -import io.github.cottonmc.templates.block.TemplatePostBlock; -import io.github.cottonmc.templates.block.TemplatePressurePlateBlock; -import io.github.cottonmc.templates.block.TemplateSlabBlock; -import io.github.cottonmc.templates.block.TemplateSlopeBlock; -import io.github.cottonmc.templates.block.TemplateStairsBlock; -import io.github.cottonmc.templates.block.TemplateTrapdoorBlock; -import io.github.cottonmc.templates.block.TemplateVerticalSlabBlock; -import io.github.cottonmc.templates.block.TemplateWallBlock; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.block.TemplateBlock; +import fr.adrien1106.reframedtemplates.block.TemplateButtonBlock; +import fr.adrien1106.reframedtemplates.block.TemplateCandleBlock; +import fr.adrien1106.reframedtemplates.block.TemplateCarpetBlock; +import fr.adrien1106.reframedtemplates.block.TemplateDoorBlock; +import fr.adrien1106.reframedtemplates.block.TemplateEntity; +import fr.adrien1106.reframedtemplates.block.TemplateFenceBlock; +import fr.adrien1106.reframedtemplates.block.TemplateFenceGateBlock; +import fr.adrien1106.reframedtemplates.block.TemplateLeverBlock; +import fr.adrien1106.reframedtemplates.block.TemplatePaneBlock; +import fr.adrien1106.reframedtemplates.block.TemplatePostBlock; +import fr.adrien1106.reframedtemplates.block.TemplatePressurePlateBlock; +import fr.adrien1106.reframedtemplates.block.TemplateSlabBlock; +import fr.adrien1106.reframedtemplates.block.TemplateSlopeBlock; +import fr.adrien1106.reframedtemplates.block.TemplateStairsBlock; +import fr.adrien1106.reframedtemplates.block.TemplateTrapdoorBlock; +import fr.adrien1106.reframedtemplates.block.TemplateVerticalSlabBlock; +import fr.adrien1106.reframedtemplates.block.TemplateWallBlock; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; @@ -48,6 +48,9 @@ import java.util.List; import java.util.function.BiConsumer; import java.util.stream.Collectors; +/** + * TODO handle random textures, handle grass side, multiple camos + */ public class Templates implements ModInitializer { public static final String MODID = "templates"; diff --git a/src/main/java/io/github/cottonmc/templates/TemplatesClient.java b/src/main/java/fr/adrien1106/reframedtemplates/TemplatesClient.java similarity index 98% rename from src/main/java/io/github/cottonmc/templates/TemplatesClient.java rename to src/main/java/fr/adrien1106/reframedtemplates/TemplatesClient.java index 04d4d69..ffba230 100644 --- a/src/main/java/io/github/cottonmc/templates/TemplatesClient.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/TemplatesClient.java @@ -1,7 +1,7 @@ -package io.github.cottonmc.templates; +package fr.adrien1106.reframedtemplates; -import io.github.cottonmc.templates.api.TemplatesClientApi; -import io.github.cottonmc.templates.model.SlopeBaseMesh; +import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; +import fr.adrien1106.reframedtemplates.model.SlopeBaseMesh; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry; diff --git a/src/main/java/io/github/cottonmc/templates/TemplatesClientApiImpl.java b/src/main/java/fr/adrien1106/reframedtemplates/TemplatesClientApiImpl.java similarity index 87% rename from src/main/java/io/github/cottonmc/templates/TemplatesClientApiImpl.java rename to src/main/java/fr/adrien1106/reframedtemplates/TemplatesClientApiImpl.java index 6557a94..7ece4a4 100644 --- a/src/main/java/io/github/cottonmc/templates/TemplatesClientApiImpl.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/TemplatesClientApiImpl.java @@ -1,10 +1,10 @@ -package io.github.cottonmc.templates; +package fr.adrien1106.reframedtemplates; -import io.github.cottonmc.templates.api.TemplatesClientApi; -import io.github.cottonmc.templates.model.TemplateAppearanceManager; -import io.github.cottonmc.templates.model.UnbakedAutoRetexturedModel; -import io.github.cottonmc.templates.model.UnbakedJsonRetexturedModel; -import io.github.cottonmc.templates.model.UnbakedMeshRetexturedModel; +import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; +import fr.adrien1106.reframedtemplates.model.TemplateAppearanceManager; +import fr.adrien1106.reframedtemplates.model.UnbakedAutoRetexturedModel; +import fr.adrien1106.reframedtemplates.model.UnbakedJsonRetexturedModel; +import fr.adrien1106.reframedtemplates.model.UnbakedMeshRetexturedModel; import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.RendererAccess; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; diff --git a/src/main/java/io/github/cottonmc/templates/TemplatesModelProvider.java b/src/main/java/fr/adrien1106/reframedtemplates/TemplatesModelProvider.java similarity index 97% rename from src/main/java/io/github/cottonmc/templates/TemplatesModelProvider.java rename to src/main/java/fr/adrien1106/reframedtemplates/TemplatesModelProvider.java index 3e46028..3f95577 100644 --- a/src/main/java/io/github/cottonmc/templates/TemplatesModelProvider.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/TemplatesModelProvider.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates; +package fr.adrien1106.reframedtemplates; -import io.github.cottonmc.templates.model.TemplateAppearanceManager; +import fr.adrien1106.reframedtemplates.model.TemplateAppearanceManager; import net.fabricmc.fabric.api.client.model.ModelProviderContext; import net.fabricmc.fabric.api.client.model.ModelResourceProvider; import net.fabricmc.fabric.api.client.model.ModelVariantProvider; diff --git a/src/main/java/io/github/cottonmc/templates/api/TemplateInteractionUtil.java b/src/main/java/fr/adrien1106/reframedtemplates/api/TemplateInteractionUtil.java similarity index 97% rename from src/main/java/io/github/cottonmc/templates/api/TemplateInteractionUtil.java rename to src/main/java/fr/adrien1106/reframedtemplates/api/TemplateInteractionUtil.java index 7866668..33bf60f 100644 --- a/src/main/java/io/github/cottonmc/templates/api/TemplateInteractionUtil.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/api/TemplateInteractionUtil.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.api; +package fr.adrien1106.reframedtemplates.api; -import io.github.cottonmc.templates.block.TemplateEntity; +import fr.adrien1106.reframedtemplates.block.TemplateEntity; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; @@ -113,7 +113,7 @@ public class TemplateInteractionUtil { if(held.getItem() instanceof BlockItem bi && be.getThemeState().getBlock() == Blocks.AIR) { Block block = bi.getBlock(); ItemPlacementContext ctx = new ItemPlacementContext(new ItemUsageContext(player, hand, hit)); - BlockState placementState = block.getPlacementState(ctx); + BlockState placementState = block.getPlacementState(ctx); // TODO Smart if(placementState != null && Block.isShapeFullCube(placementState.getCollisionShape(world, pos)) && !(block instanceof BlockEntityProvider)) { if(!world.isClient) be.setRenderedState(placementState); diff --git a/src/main/java/io/github/cottonmc/templates/api/TemplateInteractionUtilExt.java b/src/main/java/fr/adrien1106/reframedtemplates/api/TemplateInteractionUtilExt.java similarity index 93% rename from src/main/java/io/github/cottonmc/templates/api/TemplateInteractionUtilExt.java rename to src/main/java/fr/adrien1106/reframedtemplates/api/TemplateInteractionUtilExt.java index b1d21e5..f2b5cca 100644 --- a/src/main/java/io/github/cottonmc/templates/api/TemplateInteractionUtilExt.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/api/TemplateInteractionUtilExt.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.api; +package fr.adrien1106.reframedtemplates.api; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/io/github/cottonmc/templates/api/TemplatesClientApi.java b/src/main/java/fr/adrien1106/reframedtemplates/api/TemplatesClientApi.java similarity index 96% rename from src/main/java/io/github/cottonmc/templates/api/TemplatesClientApi.java rename to src/main/java/fr/adrien1106/reframedtemplates/api/TemplatesClientApi.java index cce64ee..3b92db7 100644 --- a/src/main/java/io/github/cottonmc/templates/api/TemplatesClientApi.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/api/TemplatesClientApi.java @@ -1,7 +1,7 @@ -package io.github.cottonmc.templates.api; +package fr.adrien1106.reframedtemplates.api; -import io.github.cottonmc.templates.TemplatesClient; -import io.github.cottonmc.templates.model.TemplateAppearanceManager; +import fr.adrien1106.reframedtemplates.model.TemplateAppearanceManager; +import fr.adrien1106.reframedtemplates.TemplatesClient; import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/api/ThemeableBlockEntity.java b/src/main/java/fr/adrien1106/reframedtemplates/api/ThemeableBlockEntity.java similarity index 86% rename from src/main/java/io/github/cottonmc/templates/api/ThemeableBlockEntity.java rename to src/main/java/fr/adrien1106/reframedtemplates/api/ThemeableBlockEntity.java index 3aa31b0..eb788d5 100644 --- a/src/main/java/io/github/cottonmc/templates/api/ThemeableBlockEntity.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/api/ThemeableBlockEntity.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.api; +package fr.adrien1106.reframedtemplates.api; import net.fabricmc.fabric.api.rendering.data.v1.RenderAttachmentBlockEntity; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateBlock.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplateBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateBlock.java index 9d1bb12..e0a9710 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateButtonBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateButtonBlock.java similarity index 92% rename from src/main/java/io/github/cottonmc/templates/block/TemplateButtonBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateButtonBlock.java index 72cb5a1..b5aaef1 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateButtonBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateButtonBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockSetType; @@ -27,11 +27,11 @@ import org.jetbrains.annotations.Nullable; public class TemplateButtonBlock extends ButtonBlock implements BlockEntityProvider { public TemplateButtonBlock(Settings settings) { - this(settings, BlockSetType.OAK, 30, true); + this(settings, BlockSetType.OAK, 30); } - public TemplateButtonBlock(Settings settings, BlockSetType blockSetType, int i, boolean bl) { - super(settings, blockSetType, i, bl); + public TemplateButtonBlock(Settings settings, BlockSetType blockSetType, int i) { + super(blockSetType, i, settings); setDefaultState(TemplateInteractionUtil.setDefaultStates(getDefaultState())); } diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateCandleBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateCandleBlock.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplateCandleBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateCandleBlock.java index 4bc9318..830d43f 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateCandleBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateCandleBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateCarpetBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateCarpetBlock.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplateCarpetBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateCarpetBlock.java index 4d36fa6..c2d13d7 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateCarpetBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateCarpetBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateDoorBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateDoorBlock.java similarity index 94% rename from src/main/java/io/github/cottonmc/templates/block/TemplateDoorBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateDoorBlock.java index 953f85c..5a50641 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateDoorBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateDoorBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockSetType; @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; public class TemplateDoorBlock extends DoorBlock implements BlockEntityProvider { public TemplateDoorBlock(Settings settings, BlockSetType blockSetType) { - super(settings, blockSetType); + super(blockSetType, settings); setDefaultState(TemplateInteractionUtil.setDefaultStates(getDefaultState())); } diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateEntity.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateEntity.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplateEntity.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateEntity.java index ec7f420..3d9fe5e 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateEntity.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateEntity.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; -import io.github.cottonmc.templates.api.ThemeableBlockEntity; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.api.ThemeableBlockEntity; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.entity.BlockEntity; @@ -18,9 +18,9 @@ import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket; import net.minecraft.registry.Registries; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.annotation.Nonnull; import java.util.Objects; //Keeping the weight of this block entity down, both in terms of memory consumption and NBT sync traffic, @@ -80,7 +80,7 @@ public class TemplateEntity extends BlockEntity implements ThemeableBlockEntity if(bitfield != DEFAULT_BITFIELD) tag.putByte(BITFIELD_KEY, bitfield); } - public static @Nonnull BlockState readStateFromItem(ItemStack stack) { + public static @NotNull BlockState readStateFromItem(ItemStack stack) { NbtCompound blockEntityTag = BlockItem.getBlockEntityNbt(stack); if(blockEntityTag == null) return Blocks.AIR.getDefaultState(); diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateFenceBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateFenceBlock.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplateFenceBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateFenceBlock.java index b86df28..7080e49 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateFenceBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateFenceBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateFenceGateBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateFenceGateBlock.java similarity index 92% rename from src/main/java/io/github/cottonmc/templates/block/TemplateFenceGateBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateFenceGateBlock.java index 5ed502a..e342bc5 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateFenceGateBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateFenceGateBlock.java @@ -1,9 +1,9 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; -import io.github.cottonmc.templates.api.TemplateInteractionUtilExt; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtilExt; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; public class TemplateFenceGateBlock extends FenceGateBlock implements BlockEntityProvider, TemplateInteractionUtilExt { public TemplateFenceGateBlock(Settings settings, WoodType woodType) { - super(settings, woodType); + super(woodType, settings); setDefaultState(TemplateInteractionUtil.setDefaultStates(getDefaultState())); } diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateLeverBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateLeverBlock.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplateLeverBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateLeverBlock.java index e417609..ce629ac 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateLeverBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateLeverBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplatePaneBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplatePaneBlock.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplatePaneBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplatePaneBlock.java index b085185..9ea03ea 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplatePaneBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplatePaneBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplatePostBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplatePostBlock.java similarity index 94% rename from src/main/java/io/github/cottonmc/templates/block/TemplatePostBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplatePostBlock.java index d182ae9..1d092e1 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplatePostBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplatePostBlock.java @@ -1,7 +1,7 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplatePressurePlateBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplatePressurePlateBlock.java similarity index 83% rename from src/main/java/io/github/cottonmc/templates/block/TemplatePressurePlateBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplatePressurePlateBlock.java index d789f69..347b46d 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplatePressurePlateBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplatePressurePlateBlock.java @@ -1,14 +1,9 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; -import net.minecraft.block.Block; -import net.minecraft.block.BlockEntityProvider; -import net.minecraft.block.BlockSetType; -import net.minecraft.block.BlockState; -import net.minecraft.block.PressurePlateBlock; -import net.minecraft.block.ShapeContext; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; +import net.minecraft.block.*; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -26,13 +21,13 @@ import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; public class TemplatePressurePlateBlock extends PressurePlateBlock implements BlockEntityProvider { - public TemplatePressurePlateBlock(ActivationRule activationRule, Settings settings, BlockSetType blockSetType) { - super(activationRule, settings, blockSetType); + public TemplatePressurePlateBlock(Settings settings, BlockSetType blockSetType) { + super(blockSetType, settings); setDefaultState(TemplateInteractionUtil.setDefaultStates(getDefaultState())); } public TemplatePressurePlateBlock(Settings settings) { - this(ActivationRule.EVERYTHING, settings, BlockSetType.OAK); + this(settings, BlockSetType.OAK); } @Override diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateSlabBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateSlabBlock.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplateSlabBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateSlabBlock.java index cecf35b..39571af 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateSlabBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateSlabBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateSlopeBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateSlopeBlock.java similarity index 88% rename from src/main/java/io/github/cottonmc/templates/block/TemplateSlopeBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateSlopeBlock.java index 0fee8b1..41c2401 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateSlopeBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateSlopeBlock.java @@ -1,9 +1,9 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; -import io.github.cottonmc.templates.util.Edge; -import io.github.cottonmc.templates.util.StairShapeMaker; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.util.Edge; +import fr.adrien1106.reframedtemplates.util.StairShapeMaker; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; @@ -13,8 +13,7 @@ import net.minecraft.state.property.EnumProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; - -import javax.annotation.Nullable; +import org.jetbrains.annotations.Nullable; public class TemplateSlopeBlock extends WaterloggableTemplateBlock { public static final EnumProperty EDGE = EnumProperty.of("edge", Edge.class); diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateStairsBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateStairsBlock.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplateStairsBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateStairsBlock.java index b26310d..013e094 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateStairsBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateStairsBlock.java @@ -1,8 +1,8 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateTrapdoorBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateTrapdoorBlock.java similarity index 91% rename from src/main/java/io/github/cottonmc/templates/block/TemplateTrapdoorBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateTrapdoorBlock.java index a50b038..3809cd5 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateTrapdoorBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateTrapdoorBlock.java @@ -1,9 +1,9 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; -import io.github.cottonmc.templates.api.TemplateInteractionUtilExt; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtilExt; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockSetType; @@ -27,8 +27,8 @@ import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; public class TemplateTrapdoorBlock extends TrapdoorBlock implements BlockEntityProvider, TemplateInteractionUtilExt { - public TemplateTrapdoorBlock(Settings settings, BlockSetType blah) { - super(settings, blah); + public TemplateTrapdoorBlock(Settings settings, BlockSetType woodType) { + super(woodType, settings); setDefaultState(TemplateInteractionUtil.setDefaultStates(getDefaultState())); } diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateVerticalSlabBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateVerticalSlabBlock.java similarity index 97% rename from src/main/java/io/github/cottonmc/templates/block/TemplateVerticalSlabBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateVerticalSlabBlock.java index 62149bd..3a5faac 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateVerticalSlabBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateVerticalSlabBlock.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext; diff --git a/src/main/java/io/github/cottonmc/templates/block/TemplateWallBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateWallBlock.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/block/TemplateWallBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/TemplateWallBlock.java index 0023014..c614a58 100644 --- a/src/main/java/io/github/cottonmc/templates/block/TemplateWallBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/TemplateWallBlock.java @@ -1,9 +1,9 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import com.google.common.base.MoreObjects; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplateInteractionUtil; -import io.github.cottonmc.templates.mixin.WallBlockAccessor; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplateInteractionUtil; +import fr.adrien1106.reframedtemplates.mixin.WallBlockAccessor; import net.minecraft.block.Block; import net.minecraft.block.BlockEntityProvider; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/block/WaterloggableTemplateBlock.java b/src/main/java/fr/adrien1106/reframedtemplates/block/WaterloggableTemplateBlock.java similarity index 97% rename from src/main/java/io/github/cottonmc/templates/block/WaterloggableTemplateBlock.java rename to src/main/java/fr/adrien1106/reframedtemplates/block/WaterloggableTemplateBlock.java index e03baba..7d20cb6 100644 --- a/src/main/java/io/github/cottonmc/templates/block/WaterloggableTemplateBlock.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/block/WaterloggableTemplateBlock.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.block; +package fr.adrien1106.reframedtemplates.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/io/github/cottonmc/templates/mixin/MinecraftAccessor.java b/src/main/java/fr/adrien1106/reframedtemplates/mixin/MinecraftAccessor.java similarity index 89% rename from src/main/java/io/github/cottonmc/templates/mixin/MinecraftAccessor.java rename to src/main/java/fr/adrien1106/reframedtemplates/mixin/MinecraftAccessor.java index 4a16a91..7720ad2 100644 --- a/src/main/java/io/github/cottonmc/templates/mixin/MinecraftAccessor.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/mixin/MinecraftAccessor.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.mixin; +package fr.adrien1106.reframedtemplates.mixin; import net.minecraft.client.MinecraftClient; import net.minecraft.client.color.item.ItemColors; diff --git a/src/main/java/io/github/cottonmc/templates/mixin/WallBlockAccessor.java b/src/main/java/fr/adrien1106/reframedtemplates/mixin/WallBlockAccessor.java similarity index 92% rename from src/main/java/io/github/cottonmc/templates/mixin/WallBlockAccessor.java rename to src/main/java/fr/adrien1106/reframedtemplates/mixin/WallBlockAccessor.java index 7368c1b..2f8ed36 100644 --- a/src/main/java/io/github/cottonmc/templates/mixin/WallBlockAccessor.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/mixin/WallBlockAccessor.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.mixin; +package fr.adrien1106.reframedtemplates.mixin; import net.minecraft.block.BlockState; import net.minecraft.block.WallBlock; diff --git a/src/main/java/io/github/cottonmc/templates/mixin/particles/AccessorParticle.java b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/AccessorParticle.java similarity index 89% rename from src/main/java/io/github/cottonmc/templates/mixin/particles/AccessorParticle.java rename to src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/AccessorParticle.java index 35a0ac1..9a25f25 100644 --- a/src/main/java/io/github/cottonmc/templates/mixin/particles/AccessorParticle.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/AccessorParticle.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.mixin.particles; +package fr.adrien1106.reframedtemplates.mixin.particles; import net.minecraft.client.particle.Particle; import net.minecraft.util.math.random.Random; diff --git a/src/main/java/io/github/cottonmc/templates/mixin/particles/AccessorSpriteBillboardParticle.java b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/AccessorSpriteBillboardParticle.java similarity index 86% rename from src/main/java/io/github/cottonmc/templates/mixin/particles/AccessorSpriteBillboardParticle.java rename to src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/AccessorSpriteBillboardParticle.java index 3060709..73c0ece 100644 --- a/src/main/java/io/github/cottonmc/templates/mixin/particles/AccessorSpriteBillboardParticle.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/AccessorSpriteBillboardParticle.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.mixin.particles; +package fr.adrien1106.reframedtemplates.mixin.particles; import net.minecraft.client.particle.SpriteBillboardParticle; import net.minecraft.client.texture.Sprite; diff --git a/src/main/java/io/github/cottonmc/templates/mixin/particles/MixinBlockDustParticle.java b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/MixinBlockDustParticle.java similarity index 94% rename from src/main/java/io/github/cottonmc/templates/mixin/particles/MixinBlockDustParticle.java rename to src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/MixinBlockDustParticle.java index cad758c..1799c7c 100644 --- a/src/main/java/io/github/cottonmc/templates/mixin/particles/MixinBlockDustParticle.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/MixinBlockDustParticle.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.mixin.particles; +package fr.adrien1106.reframedtemplates.mixin.particles; -import io.github.cottonmc.templates.api.ThemeableBlockEntity; +import fr.adrien1106.reframedtemplates.api.ThemeableBlockEntity; import net.minecraft.block.BlockState; import net.minecraft.client.MinecraftClient; import net.minecraft.client.particle.BlockDustParticle; diff --git a/src/main/java/io/github/cottonmc/templates/mixin/particles/MixinEntity.java b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/MixinEntity.java similarity index 89% rename from src/main/java/io/github/cottonmc/templates/mixin/particles/MixinEntity.java rename to src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/MixinEntity.java index 4d9cd52..5b20f03 100644 --- a/src/main/java/io/github/cottonmc/templates/mixin/particles/MixinEntity.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/MixinEntity.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.mixin.particles; +package fr.adrien1106.reframedtemplates.mixin.particles; -import io.github.cottonmc.templates.api.ThemeableBlockEntity; +import fr.adrien1106.reframedtemplates.api.ThemeableBlockEntity; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/io/github/cottonmc/templates/mixin/particles/MixinLivingEntity.java b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/MixinLivingEntity.java similarity index 91% rename from src/main/java/io/github/cottonmc/templates/mixin/particles/MixinLivingEntity.java rename to src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/MixinLivingEntity.java index 741044d..d6b0e9d 100644 --- a/src/main/java/io/github/cottonmc/templates/mixin/particles/MixinLivingEntity.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/mixin/particles/MixinLivingEntity.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.mixin.particles; +package fr.adrien1106.reframedtemplates.mixin.particles; -import io.github.cottonmc.templates.api.ThemeableBlockEntity; +import fr.adrien1106.reframedtemplates.api.ThemeableBlockEntity; import net.minecraft.block.BlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/io/github/cottonmc/templates/model/MeshTransformUtil.java b/src/main/java/fr/adrien1106/reframedtemplates/model/MeshTransformUtil.java similarity index 97% rename from src/main/java/io/github/cottonmc/templates/model/MeshTransformUtil.java rename to src/main/java/fr/adrien1106/reframedtemplates/model/MeshTransformUtil.java index a431626..b512c92 100644 --- a/src/main/java/io/github/cottonmc/templates/model/MeshTransformUtil.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/MeshTransformUtil.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.model; +package fr.adrien1106.reframedtemplates.model; -import io.github.cottonmc.templates.api.TemplatesClientApi; +import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; import net.fabricmc.fabric.api.renderer.v1.mesh.MeshBuilder; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; diff --git a/src/main/java/io/github/cottonmc/templates/model/QuadUvBounds.java b/src/main/java/fr/adrien1106/reframedtemplates/model/QuadUvBounds.java similarity index 98% rename from src/main/java/io/github/cottonmc/templates/model/QuadUvBounds.java rename to src/main/java/fr/adrien1106/reframedtemplates/model/QuadUvBounds.java index d6aaa40..6f0cd17 100644 --- a/src/main/java/io/github/cottonmc/templates/model/QuadUvBounds.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/QuadUvBounds.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.model; +package fr.adrien1106.reframedtemplates.model; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadView; diff --git a/src/main/java/io/github/cottonmc/templates/model/RetexturingBakedModel.java b/src/main/java/fr/adrien1106/reframedtemplates/model/RetexturingBakedModel.java similarity index 96% rename from src/main/java/io/github/cottonmc/templates/model/RetexturingBakedModel.java rename to src/main/java/fr/adrien1106/reframedtemplates/model/RetexturingBakedModel.java index c0a7d8b..8855665 100644 --- a/src/main/java/io/github/cottonmc/templates/model/RetexturingBakedModel.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/RetexturingBakedModel.java @@ -1,7 +1,7 @@ -package io.github.cottonmc.templates.model; +package fr.adrien1106.reframedtemplates.model; -import io.github.cottonmc.templates.block.TemplateEntity; -import io.github.cottonmc.templates.mixin.MinecraftAccessor; +import fr.adrien1106.reframedtemplates.block.TemplateEntity; +import fr.adrien1106.reframedtemplates.mixin.MinecraftAccessor; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.model.ForwardingBakedModel; @@ -26,7 +26,7 @@ import java.util.function.Supplier; public abstract class RetexturingBakedModel extends ForwardingBakedModel { public RetexturingBakedModel(BakedModel baseModel, TemplateAppearanceManager tam, ModelBakeSettings settings, BlockState itemModelState, boolean ao) { - this.wrapped = baseModel; //field from the superclass; vanilla getQuads etc will delegate through to this + this.wrapped = baseModel; //field from the superclass; vanilla getQuads etc. will delegate through to this this.tam = tam; this.facePermutation = MeshTransformUtil.facePermutation(settings); diff --git a/src/main/java/io/github/cottonmc/templates/model/SlopeBaseMesh.java b/src/main/java/fr/adrien1106/reframedtemplates/model/SlopeBaseMesh.java similarity index 97% rename from src/main/java/io/github/cottonmc/templates/model/SlopeBaseMesh.java rename to src/main/java/fr/adrien1106/reframedtemplates/model/SlopeBaseMesh.java index 330841d..6cf92bb 100644 --- a/src/main/java/io/github/cottonmc/templates/model/SlopeBaseMesh.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/SlopeBaseMesh.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.model; +package fr.adrien1106.reframedtemplates.model; -import io.github.cottonmc.templates.api.TemplatesClientApi; +import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; import net.fabricmc.fabric.api.renderer.v1.mesh.MeshBuilder; diff --git a/src/main/java/io/github/cottonmc/templates/model/TemplateAppearance.java b/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearance.java similarity index 94% rename from src/main/java/io/github/cottonmc/templates/model/TemplateAppearance.java rename to src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearance.java index 70550cc..714628b 100644 --- a/src/main/java/io/github/cottonmc/templates/model/TemplateAppearance.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearance.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.model; +package fr.adrien1106.reframedtemplates.model; import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial; import net.minecraft.client.texture.Sprite; diff --git a/src/main/java/io/github/cottonmc/templates/model/TemplateAppearanceManager.java b/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearanceManager.java similarity index 98% rename from src/main/java/io/github/cottonmc/templates/model/TemplateAppearanceManager.java rename to src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearanceManager.java index 4a07776..ea80ee5 100644 --- a/src/main/java/io/github/cottonmc/templates/model/TemplateAppearanceManager.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/TemplateAppearanceManager.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.model; +package fr.adrien1106.reframedtemplates.model; -import io.github.cottonmc.templates.api.TemplatesClientApi; +import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.material.BlendMode; import net.fabricmc.fabric.api.renderer.v1.material.MaterialFinder; diff --git a/src/main/java/io/github/cottonmc/templates/model/UnbakedAutoRetexturedModel.java b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedAutoRetexturedModel.java similarity index 97% rename from src/main/java/io/github/cottonmc/templates/model/UnbakedAutoRetexturedModel.java rename to src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedAutoRetexturedModel.java index 682902b..f8296b9 100644 --- a/src/main/java/io/github/cottonmc/templates/model/UnbakedAutoRetexturedModel.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedAutoRetexturedModel.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.model; +package fr.adrien1106.reframedtemplates.model; -import io.github.cottonmc.templates.api.TemplatesClientApi; +import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; diff --git a/src/main/java/io/github/cottonmc/templates/model/UnbakedJsonRetexturedModel.java b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedJsonRetexturedModel.java similarity index 96% rename from src/main/java/io/github/cottonmc/templates/model/UnbakedJsonRetexturedModel.java rename to src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedJsonRetexturedModel.java index 8d9e6b2..03a1eef 100644 --- a/src/main/java/io/github/cottonmc/templates/model/UnbakedJsonRetexturedModel.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedJsonRetexturedModel.java @@ -1,7 +1,7 @@ -package io.github.cottonmc.templates.model; +package fr.adrien1106.reframedtemplates.model; -import io.github.cottonmc.templates.Templates; -import io.github.cottonmc.templates.api.TemplatesClientApi; +import fr.adrien1106.reframedtemplates.Templates; +import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; import net.fabricmc.fabric.api.renderer.v1.Renderer; import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; diff --git a/src/main/java/io/github/cottonmc/templates/model/UnbakedMeshRetexturedModel.java b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedMeshRetexturedModel.java similarity index 95% rename from src/main/java/io/github/cottonmc/templates/model/UnbakedMeshRetexturedModel.java rename to src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedMeshRetexturedModel.java index 02f5fd7..8c033e7 100644 --- a/src/main/java/io/github/cottonmc/templates/model/UnbakedMeshRetexturedModel.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/model/UnbakedMeshRetexturedModel.java @@ -1,6 +1,6 @@ -package io.github.cottonmc.templates.model; +package fr.adrien1106.reframedtemplates.model; -import io.github.cottonmc.templates.api.TemplatesClientApi; +import fr.adrien1106.reframedtemplates.api.TemplatesClientApi; import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/main/java/io/github/cottonmc/templates/util/Edge.java b/src/main/java/fr/adrien1106/reframedtemplates/util/Edge.java similarity index 98% rename from src/main/java/io/github/cottonmc/templates/util/Edge.java rename to src/main/java/fr/adrien1106/reframedtemplates/util/Edge.java index 674b630..071cea8 100644 --- a/src/main/java/io/github/cottonmc/templates/util/Edge.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/util/Edge.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.util; +package fr.adrien1106.reframedtemplates.util; import net.minecraft.item.ItemPlacementContext; import net.minecraft.util.StringIdentifiable; diff --git a/src/main/java/io/github/cottonmc/templates/util/StairShapeMaker.java b/src/main/java/fr/adrien1106/reframedtemplates/util/StairShapeMaker.java similarity index 96% rename from src/main/java/io/github/cottonmc/templates/util/StairShapeMaker.java rename to src/main/java/fr/adrien1106/reframedtemplates/util/StairShapeMaker.java index e6d6669..1d4009d 100644 --- a/src/main/java/io/github/cottonmc/templates/util/StairShapeMaker.java +++ b/src/main/java/fr/adrien1106/reframedtemplates/util/StairShapeMaker.java @@ -1,4 +1,4 @@ -package io.github.cottonmc.templates.util; +package fr.adrien1106.reframedtemplates.util; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; diff --git a/src/main/resources/assets/framed-templates-icon.png b/src/main/resources/assets/framed-templates-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..207907bce88daf600a8615761e6854baffd76327 GIT binary patch literal 2314 zcmbtUeNYtV89$qJj2NOOskLoP)+Gdl+1ro%UhgD$cft)E9Nh7tK*Qed-rdUH?zy|% z9h@YHXdp(=LQG6VGBH~5t4gL5Y>HOfI8`xZG}G!BV=zsV)O3tPlUnVBzIz;m%s7)j zx^sKG@3X(>_dd_>dETefQ&Nzg_VYB2Mw9L;bd-bVeD!|dKJcH7%=2nAv(|HVyT@g> zLmo*Ca6Ah>jJ~w3DBDr?*y-oA@HS@QpRa3=ywT1KEGgfsU)h9wnD{LJ{P5mHfpPoU z%2jdx!G*@Z@Cg4>`Qw>2zsU7x)J@32HBTAN4qW`t*L~wHedCMYm$-A^>~B699TXJn z!O{25-!Pz|4=y-zhc|u7!WU`$Y}e?roDZ6>>>j**E!2@^otvYKQMsQ4Hon|G`>${P z?A^qvB@LH5=JwBty(8t1&EE4`)3X&j)2h8YmY5bUUhvSI8v_p;i!QB>hR0@&bq)Qq z@VN1{&xWq2zZ-2npYx%2_{j3Hk>cFCz_L$@=Tm8mdkmF@J$ni&3m)y>_vQ2FZeRJ) zMDI}X+C%l7bZ-U!;vc&2Y`Au{`OLS+*Oj*{+TY(YG5pAy=*NjG|31;RZsP8uoc@n5 zEWJ}DWB*!mCt7yH+1UredEVZ7^U#se zGqyjydEiXLrM%X|y$rg&DHi6$=XTAxlkwmCHkV3AH@?02DyYebr`YG*!dW{5mTf{_ zYrT2+m0$j*yJB!lWuivkMv+vJHdu-=ZnUY+xLwJA)^8f>eWt(N-Jfu^)5}`wj5`{g zN)_J4uUJ=WIMwHWMR9Bv@|succefTt%C&EGRlV6>GSpME+VSLpj>^58N;_D~?pDvS z-kKWclm4RYo$HH!{k&&$Xj$FL%v~Fb_jQyV*j&z)VTZPOH!{}4UA|~F(HS6L2$J3W z@)tSlU{{q`scT~_?EzA#AnILNVuh~OnHeh0ZJ~@HA^!89c)-JkRDMs|O+ITnu&>D?3FCL-j23CRm zY>*Rd@XdElz!1mS;3|U~b4ToKh%0QCSZ{NQk8Wa`f+jB`-}1|$$30V^9EQj`dZ zqOn*^8`Eh;DTv}0iv`69lpqj*K;$Mtq2h=jXH1f$XdJ9eOI$?ZL;+H1DZkjL*kBOH zWPss_+da)L$SECwB50h7ptu%8!(lb*BwALSQQ(}4<(_ES*A!vVa#j`_C7N|cSwYE| za%bpi-$V<%f~-&i&8j?rS<3+u#$d!Plo>~Gzm5j}7>!VV9gFDo2HMCH#z4SN zPx+Th9B4g?pBazJ!vG#XMliUEG9YG5k0E-7!4L~zMhpfsI!jP&gneTDgU_uK($)$&}kfc^j;53#mSn-`wDE zFqA?$D1`-F7@;FEg2c=|+)NTi@XN(;Qq2h{K)OYS3pD)@GVSCJwKGg9BhNv}UMDGfG6k86vJ9Lu(jiI+vS1j1KAePc_o%hWPX){tgC5ZnCQxA$ z!6Ftjh9M>b)0zB6v%x^=ru=0wpu{MN%?|?AfHJD*|_0&+ga#q zKDUh$#`#BochdYcerv5}(-*~J`?zy{o%QqU3;G?q+{)3BJ)z5g{MEkfg8^G@&Ad0h z8a#RM%cpixcV7?}{Qjp;^glE3ZQuIiS4VGN6Z$8f=o%TxdOVhK>mzLGMRoAIoF$IK IE9%?+2ec_>!~g&Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/templates/textures/block/framed_accent_block.png b/src/main/resources/assets/templates/textures/block/framed_accent_block.png new file mode 100644 index 0000000000000000000000000000000000000000..b9ae752c61ec61940f463be7ea881a3965df7634 GIT binary patch literal 5739 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/templates/textures/block/framed_block.png b/src/main/resources/assets/templates/textures/block/framed_block.png new file mode 100644 index 0000000000000000000000000000000000000000..e5f41f71177963a2ca9d00ab52799bed91aa6ade GIT binary patch literal 5659 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 I%ht#K2lhd=1.20.1", - "fabricloader": "*", + "minecraft": ">=${minecraft_version}", + "fabricloader": "${loader_version}", "fabric-api": "*" } } \ No newline at end of file diff --git a/src/main/resources/templates-icon.png b/src/main/resources/templates-icon.png deleted file mode 100644 index 82a03b3e4245c2bca61d87ba8504f225ce3df2fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1283 zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fjKx9jP7LeL$-HD>VA<>G;uumf z=k48%*`et&?H`xenp*DkRpAUR^jebwS*t^=q2euJ+`& z>t#*Mi&nhR|7ZO>=V{XW2elW^%dR^0PrmL};&*rZ?O(pf&WLv_F46Duhj|0Tw9qee zxPP7g7O~o?__+Jc=v6^=^&8ut_4V-nJzsul_ND6R7e7_Lyp6SELu$&iSJ}QwJsj5Y;&0$r@i$c^eT&pL>{fS?XT=t@Y%5m0I{8RV zYKeO9Wm}Gw@tMAzoitAu`;3p=~oPv5sUTUsvQ)78YX`V#++=PfTLCt**QTG^~` zuYS|D|4V`S{|CT0Pgrs3d1+40#^2KGZ|;;Vab5J~_Qn_cKi_+8f8oxDhq5Nmg|P=c zFh-iCyRX|#IC$}-@QWr;9^P)SzvtPD+q+-f6RUEvv9)h~H*o8voY&FmE=djJ3Qx{)VU&4Pp elements; - } - - static class Elem { - Map> vertices; - Map faces; - } - - static class Face { - Map> uv; - List vertices; - } - - public static void main(String[] args) { - Model m = new Gson().fromJson(model, Model.class); - - Map> verts = m.elements.get(0).vertices; - List faces = m.elements.get(0).faces.values().stream().toList(); - - List classifications = List.of("TAG_LEFT", "TAG_RIGHT", "TAG_BOTTOM", "TAG_BACK", "TAG_SLOPE"); - Iterator asd = classifications.iterator(); - - for(Face face : faces) { - System.out.printf(".tag(%s)%n", asd.next()); - - for(int i = 0; i < 4; i++) { - String vertId = face.vertices.get(permute(i)); - List coords = verts.get(vertId); - System.out.printf(".pos(%s, %sf, %sf, %sf)", i, p(coords.get(0)/16f), p(coords.get(1)/16f), p(coords.get(2)/16f)); - - List uv = face.uv.get(vertId); - System.out.printf(".uv(%s, %sf, %sf)%n", i, p(uv.get(0)/16f), p(uv.get(1)/16f)); - } - - System.out.println(".color(-1, -1, -1, -1)\n.emit()"); - } - System.out.println(';'); - } - - //i don't like "16.0f" i'd rather "16f" - private static String p(float f) { - if(f == (long) f) return Long.toString((long) f); - else return Float.toString(f); - } - - private static int permute(int i) { - if(i == 0) return 2; - if(i == 1) return 0; - if(i == 2) return 1; - if(i == 3) return 3; - throw new IllegalArgumentException(); - } - - private static final String model = """ -{"meta":{"format_version":"4.5","model_format":"free","box_uv":false},"name":"","model_identifier":"","visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[{"name":"cuboid","color":4,"origin":[-8,0,-8],"rotation":[0,0,0],"visibility":true,"locked":false,"vertices":{"Iy48":[16,8,16],"dg4s":[16,4,12],"ezd5":[16,0,16],"txzT":[16,0,8],"ZcIz":[0,8,16],"tgTW":[0,0,16],"Q2eV":[0,0,8],"8xsY":[0,4,12]},"faces":{"JSoJzuHO":{"uv":{"Iy48":[0,8],"ezd5":[0,16],"dg4s":[4,12],"txzT":[8,16]},"vertices":["Iy48","ezd5","dg4s","txzT"]},"0I6IF0zk":{"uv":{"ZcIz":[16,8],"tgTW":[16,16],"Q2eV":[8,16],"8xsY":[12,12]},"vertices":["ZcIz","8xsY","tgTW","Q2eV"]},"d7iH7DqS":{"uv":{"ezd5":[16,0],"tgTW":[0,0],"txzT":[16,8],"Q2eV":[0,8]},"vertices":["ezd5","tgTW","txzT","Q2eV"]},"OQ809wKZ":{"uv":{"Iy48":[16,8],"ZcIz":[0,8],"ezd5":[16,16],"tgTW":[0,16]},"vertices":["Iy48","ZcIz","ezd5","tgTW"]},"TSyHMrco":{"uv":{"txzT":[0,16],"Q2eV":[16,16],"Iy48":[0,8],"ZcIz":[16,8]},"vertices":["txzT","Q2eV","Iy48","ZcIz"]}},"type":"mesh","uuid":"3152a30a-ea8e-4ceb-57eb-58319c89815a"}],"outliner":["3152a30a-ea8e-4ceb-57eb-58319c89815a"],"textures":[]}"""; -} diff --git a/unused/TattletaleRandom.java b/unused/TattletaleRandom.java deleted file mode 100644 index c2717b2..0000000 --- a/unused/TattletaleRandom.java +++ /dev/null @@ -1,83 +0,0 @@ -package io.github.cottonmc.templates.util; - -import net.minecraft.util.math.random.Random; -import net.minecraft.util.math.random.RandomSplitter; - -public class TattletaleRandom implements Random { - public TattletaleRandom(Random delegate) { - this.delegate = delegate; - } - - private final Random delegate; - public boolean wasUsed = false; - - public Random split() { - wasUsed = true; - return delegate.split(); - } - - public RandomSplitter nextSplitter() { - wasUsed = true; - return delegate.nextSplitter(); - } - - public void setSeed(long l) { - wasUsed = true; - delegate.setSeed(l); - } - - public int nextInt() { - wasUsed = true; - return delegate.nextInt(); - } - - public int nextInt(int i) { - wasUsed = true; - return delegate.nextInt(i); - } - - public int nextBetween(int i, int j) { - wasUsed = true; - return delegate.nextBetween(i, j); - } - - public long nextLong() { - wasUsed = true; - return delegate.nextLong(); - } - - public boolean nextBoolean() { - wasUsed = true; - return delegate.nextBoolean(); - } - - public float nextFloat() { - wasUsed = true; - return delegate.nextFloat(); - } - - public double nextDouble() { - wasUsed = true; - return delegate.nextDouble(); - } - - public double nextGaussian() { - wasUsed = true; - return delegate.nextGaussian(); - } - - public double nextTriangular(double d, double e) { - wasUsed = true; - return delegate.nextTriangular(d, e); - } - - public void skip(int i) { - wasUsed = true; - delegate.skip(i); - } - - public int nextBetweenExclusive(int i, int j) { - wasUsed = true; - return delegate.nextBetweenExclusive(i, j); - } -}