diff --git a/1.12/Makefile b/1.12/Makefile index 12a5f78..88c2c73 100644 --- a/1.12/Makefile +++ b/1.12/Makefile @@ -101,5 +101,5 @@ dist: sanatize dist-check clean-all mod @djs tasks.js dist port-languages: - @echo "[1.12] Porting language files to 1.13/1.14 ..." + @echo "[1.12] Porting language files to 1.14 ..." @djs tasks.js port-languages diff --git a/1.13/.gitignore b/1.13/.gitignore deleted file mode 100644 index af7450c..0000000 --- a/1.13/.gitignore +++ /dev/null @@ -1,37 +0,0 @@ -bin -*.launch -.settings -.metadata -.classpath -.project -out -*.ipr -*.iws -*.iml -.idea -build -.gradle -*.tmp -*.log -*.jks -eclipse -run -tests -/dist -signing.* -src/main/java/archive -src/main/resources/assets/minecraft -.vscode -/classes -/dev -/tmp -/archive -/assets-src -.gimp -*.xcf -desktop.ini -.DS_Store -Thumbs.db -forge*changelog.txt -/*.txt -mcmodsrepo \ No newline at end of file diff --git a/1.13/Makefile b/1.13/Makefile deleted file mode 100644 index 671af46..0000000 --- a/1.13/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# @file Makefile -# @author Stefan Wilhelm (wile) -# @license MIT -# -# GNU Make makefile based build relay. -# Note for reviewers/clones: This file is a auxiliary script for my setup. -# It's not needed to build the mod. -# -MOD_JAR_PREFIX=engineersdecor- -MOD_JAR=$(filter-out %-sources.jar,$(wildcard build/libs/${MOD_JAR_PREFIX}*.jar)) - -ifeq ($(OS),Windows_NT) -GRADLE=gradlew.bat --no-daemon -GRADLE_STOP=gradlew.bat --stop -DJS=djs -else -GRADLE=./gradlew --no-daemon -GRADLE_STOP=./gradlew --stop -DJS=djs -endif - -wildcardr=$(foreach d,$(wildcard $1*),$(call wildcardr,$d/,$2) $(filter $(subst *,%,$2),$d)) - -# -# Targets -# -.PHONY: default mod init clean clean-all mrproper all run install sanatize dist-check dist start-server - -default: mod - -all: clean clean-all mod | install - -mod: - @echo "[1.13] Building mod using gradle ..." - @$(GRADLE) build $(GRADLE_OPTS) - -clean: - @echo "[1.13] Cleaning ..." - @rm -f build/libs/* - @$(GRADLE) clean - -clean-all: - @echo "[1.13] Cleaning using gradle ..." - @rm -f dist/* - @rm -rf run/logs/ - @rm -rf run/crash-reports/ - @$(GRADLE) clean cleanCache - -mrproper: clean-all - @rm -f meta/*.* - @rm -rf run/ - @rm -rf out/ - @rm -f .project - @rm -f .classpath - -init: - @echo "[1.13] Initialising eclipse workspace using gradle ..." - @$(GRADLE) eclipse - -sanatize: - @echo "[1.13] Running sanatising tasks ..." - @djs tasks.js trailing-whitespaces - @djs tasks.js tabs-to-spaces - @djs tasks.js sync-languages - @djs tasks.js version-check - @djs tasks.js update-json - @git status -s . - -dist-check: - @echo "[1.13] Running dist checks ..." - @djs tasks.js dist-check - -dist: sanatize dist-check clean-all mod - @echo "[1.13] Distribution files ..." - @mkdir -p dist - @cp build/libs/$(MOD_JAR_PREFIX)* dist/ - @djs tasks.js dist diff --git a/1.13/build.gradle b/1.13/build.gradle deleted file mode 100644 index 9b689b8..0000000 --- a/1.13/build.gradle +++ /dev/null @@ -1,98 +0,0 @@ -// @file build.gradle -// Engineer's decor mod gradle build relay (mc1.13.2) -buildscript { - repositories { - maven { url = 'https://files.minecraftforge.net/maven' } - jcenter() - mavenCentral() - } - dependencies { - classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true - } -} -apply plugin: 'net.minecraftforge.gradle' -apply plugin: 'eclipse' -apply plugin: 'maven-publish' -sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' -//----------------------------------------------------------------------------- -version = "${version_engineersdecor}" -group = "wile.engineersdecor" -archivesBaseName = "engineersdecor-${version_minecraft}" - -// def signing = { -> -// def sp = new Properties() -// if(file("signing.properties").exists()) file("signing.properties").withInputStream { sp.load(it) } -// return sp -// }() - -// def git_version = { -> -// def stdout = new ByteArrayOutputStream() -// exec { -// commandLine 'git', 'log', '-1', '--format=%h' -// standardOutput = stdout -// } -// return stdout.toString().trim() -// }() - -minecraft { - mappings channel: 'snapshot', version: '20180921-1.13' - // accessTransformer = file('build/resources/main/META-INF/accesstransformer.cfg') - runs { - client { - workingDirectory project.file('run') - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' - mods { - engineersdecor { - source sourceSets.main - } - } - } - server { - workingDirectory project.file('run') - property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' - property 'forge.logging.console.level', 'debug' - mods { - engineersdecor { - source sourceSets.main - } - } - } - } -} - -dependencies { - minecraft "net.minecraftforge:forge:${version_forge_minecraft}" -} - -jar { - manifest { - attributes([ - "Specification-Title": "engineersdecor", - "Specification-Vendor": "wilechaote", - "Specification-Version": "1", // We are version 1 of ourselves - "Implementation-Title": project.name, - "Implementation-Version": "${version_engineersdecor}", - "Implementation-Vendor" :"wilechaote", - "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") - ]) - } -} - -def reobfFile = file("$buildDir/reobfJar/output.jar") -def reobfArtifact = artifacts.add('default', reobfFile) { - type 'jar' - builtBy 'reobfJar' -} -publishing { - publications { - mavenJava(MavenPublication) { - artifact reobfArtifact - } - } - repositories { - maven { - url "file:///${project.projectDir}/mcmodsrepo" - } - } -} diff --git a/1.13/gradle.properties b/1.13/gradle.properties deleted file mode 100644 index 4f7023e..0000000 --- a/1.13/gradle.properties +++ /dev/null @@ -1,14 +0,0 @@ -# @file gradle.properties -org.gradle.daemon=false -org.gradle.jvmargs=-Xmx8G -version_minecraft=1.13.2 -version_forge_minecraft=1.13.2-25.0.219 -version_engineersdecor=1.0.7-b6 -# -# jar signing data loaded from signing.properties in the project root. -# -#signing.keystore_file= -#signing.keystore_alias= -#signing.keystore_pass= -#signing.keystore_keypass= -#fingerprint_sha1.fp_sha1= diff --git a/1.13/gradle/wrapper/gradle-wrapper.jar b/1.13/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 7a3265e..0000000 Binary files a/1.13/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/1.13/gradle/wrapper/gradle-wrapper.properties b/1.13/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 949819d..0000000 --- a/1.13/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip diff --git a/1.13/gradlew b/1.13/gradlew deleted file mode 100644 index cccdd3d..0000000 --- a/1.13/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## 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="" - -# 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/1.13/gradlew.bat b/1.13/gradlew.bat deleted file mode 100644 index e95643d..0000000 --- a/1.13/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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= - -@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/1.13/meta/update.json b/1.13/meta/update.json deleted file mode 100644 index 14c8075..0000000 --- a/1.13/meta/update.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", - "1.13.2": { - "1.0.7-b5": "[A] Added translation zh_cn (PR#33, XuyuEre)\n[M] Updated textures.\n[M] Updated 1st/3rd person item model rotations/translations.", - "1.0.7-b4": "[A] Added stained clinker brick block/stairs.", - "1.0.7-b3": "[V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-assigned.\n[A] Added \"Factory Area\" sign.\n[M] Sign background colors adapted.\n[M] EN lang file updated (PR#28, Voxelo).", - "1.0.4-b6": "[A] Added Small Electrical Furnace.\n[A] Added Small Waste Incinerator.\n[A] Experimental: Added fluid check valve.\n[A] Experimental: Added fluid redstone controlled valve.\n[A] Experimental: Added fluid redstone analog valve.\n[A] Experimental: Added passive fluid accumulator.", - "1.0.4-b5": "[A] Added Factory Dropper.\n[A] Added \"Caution Defense System Ahead\" sign.", - "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.", - "1.0.4-b3": "[V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-iterated.\n[A] Lab furnace ported to 1.13.\n[A] Treated wood crafting table: Added crafting table history/quick craft.\n[A] Treated wood stool: Sitting on the stool implemented.\n[A] Steel poles (thick/thin) with support heads/foots added.\n[E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), missing one forge feature yet for completion.\n[E] Prepared multi-layer rendering for windows, needs forge feature implementation.", - "1.0.2-b3": "[A] Added treated wood window.\n[A] Added treated wood pole support.\n[A] Added treated wood pole head.\n[A] Added steel framed window.", - "1.0.2-b2": "[A] Added wall decomposition recipes.\n[A] Added slag brick wall.\n[M] Climbing/descending mod ladders is faster when looking up or down and not sneaking.\n[M] Panzer glass material definition changed.", - "1.0.2-b1": "[A] Added Treated wood crafting table.\n[A] Added decomposition recipes for stairs and tiles.\n[N] Note: All v1.0.2-b1-mc1.12.2 blocks are ported to 1.13.2 (alpha -^ beta version).\n[N] Note: Until IE is out for 1.13.2, the recipes are temporary with vanilla items.", - "1.0.0-a3": "[A] Added iron inset light.\n[A] Added rebar concrete tile.\n[A] Added rebar concrete tile stairs.\n[A] Added clinker brick wall.\n[A] Added treated wood stool.\n[A] Added treated window sill.", - "1.0.0-a2": "[A] Added panzer glass.", - "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." - }, - "promos": { - "1.13.2-recommended": "", - "1.13.2-latest": "1.0.7-b5" - } -} \ No newline at end of file diff --git a/1.13/readme.md b/1.13/readme.md deleted file mode 100644 index 73acc8e..0000000 --- a/1.13/readme.md +++ /dev/null @@ -1,79 +0,0 @@ - -## Engineer's Decor (MC1.13.2) - -Mod sources for Minecraft version 1.13.2. - -- Description, credits, and features: Please see the readme in the repository root. - -- Compiled mod distribution channel is curseforge: https://www.curseforge.com/minecraft/mc-mods/engineers-decor/files. - ----- -## Version history - - ~ v1.0.7-b6 [F] Fixed recipe collision of Metal Rung Ladder (issue #37, - thx ProsperCraft for reporting). - - - v1.0.7-b5 [A] Added translation zh_cn (PR#33, XuyuEre) - [M] Updated textures. - [M] Updated 1st/3rd person item model rotations/translations. - - - v1.0.7-b4 [A] Added stained clinker brick block/stairs. - - - v1.0.7-b3 [V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported - to 1.13.2 implemented/prepared, therefore version re-assigned. - [A] Added "Factory Area" sign. - [M] Sign background colors adapted. - [M] EN lang file updated (PR#28, Voxelo). - - - v1.0.4-b6 [A] Added Small Electrical Furnace. - [A] Added Small Waste Incinerator. - [A] Experimental: Added fluid check valve. - [A] Experimental: Added fluid redstone controlled valve. - [A] Experimental: Added fluid redstone analog valve. - [A] Experimental: Added passive fluid accumulator. - - - v1.0.4-b5 [A] Added Factory Dropper. - [A] Added "Caution Defense System Ahead" sign. - - - v1.0.4-b4 [U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214. - [A] Added sign "Electrical hazard"/"Caution hot wire". - [A] Added sign "Caution dangerous there" (skull/bones). - [A] Added horizontal steel double-T support beam with pole connections. - - - v1.0.4-b3 [V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported - to 1.13.2 implemented/prepared, therefore version re-iterated. - [A] Lab furnace ported to 1.13. - [A] Treated wood crafting table: Added crafting table history/quick craft. - [A] Treated wood stool: Sitting on the stool implemented. - [A] Steel poles (thick/thin) with support heads/foots added. - [E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), - missing one forge feature yet for completion. - [E] Prepared multi-layer rendering for windows, needs forge feature implementation. - - - v1.0.2-b3 [A] Added treated wood window. - [A] Added treated wood pole support. - [A] Added treated wood pole head. - [A] Added steel framed window. - - - v1.0.2-b2 [A] Added wall decomposition recipes. - [A] Added slag brick wall. - [M] Climbing/descending mod ladders is faster when looking up or down and not sneaking. - [M] Panzer glass material definition changed. - - - v1.0.2-b1 [A] Added Treated wood crafting table. - [A] Added decomposition recipes for stairs and tiles. - [N] Note: All v1.0.2-b1-mc1.12.2 blocks are ported to 1.13.2 (alpha -^ beta version). - [N] Note: Until IE is out for 1.13.2, the recipes are temporary with vanilla items. - - - v1.0.0-a3 [A] Added iron inset light. - [A] Added rebar concrete tile. - [A] Added rebar concrete tile stairs. - [A] Added clinker brick wall. - [A] Added treated wood stool. - [A] Added treated window sill. - - - v1.0.0-a2 [A] Added panzer glass. - - - v1.0.0-a1 [A] Initial port to 1.13.2 with Forge beta. - ----- diff --git a/1.13/src/main/java/wile/engineersdecor/ModEngineersDecor.java b/1.13/src/main/java/wile/engineersdecor/ModEngineersDecor.java deleted file mode 100644 index 48d24da..0000000 --- a/1.13/src/main/java/wile/engineersdecor/ModEngineersDecor.java +++ /dev/null @@ -1,100 +0,0 @@ -package wile.engineersdecor; - -import net.minecraft.item.ItemGroup; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.CraftingHelper; -import wile.engineersdecor.blocks.ModBlocks; -import wile.engineersdecor.detail.ModConfig; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.model.obj.OBJLoader; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.DistExecutor; -import net.minecraftforge.fml.ModLoadingContext; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; -import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; -import net.minecraftforge.fml.event.server.FMLServerStartingEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import wile.engineersdecor.detail.RecipeCondModSpecific; - - -@Mod("engineersdecor") -public class ModEngineersDecor -{ - public static final String MODID = "engineersdecor"; // fixed name for double checks - private static final Logger LOGGER = LogManager.getLogger(); - - public ModEngineersDecor() - { - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onSetup); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onSendImc); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onRecvImc); - FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientSetup); - MinecraftForge.EVENT_BUS.register(this); - } - - public static final Logger logger() { return LOGGER; } - - // - // Events - // - - private void onSetup(final FMLCommonSetupEvent event) - { - ModLoadingContext.get().registerConfig(net.minecraftforge.fml.config.ModConfig.Type.COMMON, ModConfig.conf_spec); - LOGGER.info("Registering recipe condition processor ..."); - CraftingHelper.register(new ResourceLocation(MODID, "grc"), new RecipeCondModSpecific()); - } - - private void onClientSetup(final FMLClientSetupEvent event) - {} // Currently not needed: OBJLoader.INSTANCE.addDomain(ModEngineersDecor.MODID); - - private void onSendImc(final InterModEnqueueEvent event) - {} - - private void onRecvImc(final InterModProcessEvent event) - {} - - @SubscribeEvent - public void onServerStarting(FMLServerStartingEvent event) - {} - - @Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD) - public static class RegistryEvents - { - @SubscribeEvent - public static void onBlocksRegistry(final RegistryEvent.Register event) - { ModBlocks.registerBlocks(event); } - - @SubscribeEvent - public static void onItemRegistry(final RegistryEvent.Register event) - { ModBlocks.registerItemBlocks(event); } - } - - // - // Sided proxy functionality (skel) - // - public static ISidedProxy proxy = DistExecutor.runForDist(()->ClientProxy::new, ()->ServerProxy::new); - public interface ISidedProxy {} - public static final class ClientProxy implements ISidedProxy {} - public static final class ServerProxy implements ISidedProxy {} - - // - // Item group / creative tab - // - public static final ItemGroup ITEMGROUP = (new ItemGroup("tab" + MODID) { - @OnlyIn(Dist.CLIENT) - public ItemStack createIcon() - { return new ItemStack(ModBlocks.TREATED_WOOD_LADDER); } - }); -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecor.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecor.java deleted file mode 100644 index 5c0018b..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecor.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * @file BlockDecorFull.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Common functionality class for decor blocks. - * Mainly needed for: - * - MC block defaults. - * - Tooltip functionality - * - Model initialisation - */ -package wile.engineersdecor.blocks; - -import wile.engineersdecor.detail.ModAuxiliaries; -import net.minecraft.block.Block; -import net.minecraft.block.material.EnumPushReaction; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockReader; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.util.*; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import javax.annotation.Nullable; -import java.util.List; - -public class BlockDecor extends Block -{ - - // The config combines some aspects of blocks, allowing to define different behaviour at construction time, without excessive polymorphy. - // It's an old school flag set as it is used internally only and shall not have as littlt impact on performance as possible. - public final long config; - public static final long CFG_DEFAULT = 0x0000000000000000L; // no special config - public static final long CFG_CUTOUT = 0x0000000000000001L; // cutout rendering - public static final long CFG_HORIZIONTAL = 0x0000000000000002L; // horizontal block, affects bounding box calculation at construction time - public static final long CFG_HORIZIONTAL_PLACEMENT = 0x0000000000000004L; // placed in the horizontzal direction the player is looking when placing. - public static final long CFG_WALL_DOOR_CONNECTION = 0x0000000000000008L; // wall block connects to fence gates and doors. - - public BlockDecor(long config, Block.Properties properties) - { super(properties); this.config = config; } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - @Override - @OnlyIn(Dist.CLIENT) - public BlockRenderLayer getRenderLayer() - { return ((config & CFG_CUTOUT)!=0) ? BlockRenderLayer.CUTOUT : BlockRenderLayer.SOLID; } - - @Override - @SuppressWarnings("deprecation") - public boolean isFullCube(IBlockState state) - { return ((config & CFG_CUTOUT)==0); } - - @Override - @SuppressWarnings("deprecation") - public boolean isNormalCube(IBlockState state) - { return ((config & CFG_CUTOUT)==0); } - - @Override - public boolean canSpawnInBlock() - { return false; } - - @Override - @SuppressWarnings("deprecation") - public EnumPushReaction getPushReaction(IBlockState state) - { return EnumPushReaction.NORMAL; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorDirected.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorDirected.java deleted file mode 100644 index 0801e72..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorDirected.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * @file BlockDecorDirected.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Smaller (cutout) block with a defined facing. - */ -package wile.engineersdecor.blocks; - -import net.minecraft.state.StateContainer; -import net.minecraft.util.math.shapes.VoxelShapes; -import wile.engineersdecor.detail.ModAuxiliaries; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.state.DirectionProperty; -import net.minecraft.block.Block; -import net.minecraft.block.BlockDirectional; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.world.IBlockReader; -import net.minecraft.util.BlockRenderLayer; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Arrays; - - -public class BlockDecorDirected extends BlockDecor -{ - public static final DirectionProperty FACING = BlockDirectional.FACING; - protected final ArrayList AABBs; - - public BlockDecorDirected(long config, Block.Properties builder, final AxisAlignedBB unrotatedAABB) - { - super(config, builder); - setDefaultState(stateContainer.getBaseState().with(FACING, EnumFacing.UP)); - final boolean is_horizontal = ((config & BlockDecor.CFG_HORIZIONTAL)!=0); - AABBs = new ArrayList(Arrays.asList( - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.DOWN, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.UP, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.NORTH, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.SOUTH, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.WEST, is_horizontal)), - VoxelShapes.create(ModAuxiliaries.getRotatedAABB(unrotatedAABB, EnumFacing.EAST, is_horizontal)), - VoxelShapes.create(unrotatedAABB), - VoxelShapes.create(unrotatedAABB) - )); - } - - @Override - public boolean isFullCube(IBlockState state) - { return false; } - - @Override - public boolean isNormalCube(IBlockState state) - { return false; } - - @Override - public boolean canSpawnInBlock() - { return false; } - - @Override - @SuppressWarnings("deprecation") - public BlockFaceShape getBlockFaceShape(IBlockReader world, IBlockState state, BlockPos pos, EnumFacing face) - { return BlockFaceShape.UNDEFINED; } - - @Override - @SuppressWarnings("deprecation") - public VoxelShape getShape(IBlockState state, IBlockReader source, BlockPos pos) - { return AABBs.get(((EnumFacing)state.get(FACING)).getIndex() & 0x7); } - - @Override - @SuppressWarnings("deprecation") - public VoxelShape getCollisionShape(IBlockState state, IBlockReader world, BlockPos pos) - { return getShape(state, world, pos); } - - @Override - protected void fillStateContainer(StateContainer.Builder builder) - { builder.add(FACING); } - - @Override - @Nullable - public IBlockState getStateForPlacement(BlockItemUseContext context) { - if((config & CFG_HORIZIONTAL_PLACEMENT)!=0) { - // placement in direction the player is facing - return getDefaultState().with(FACING, context.getPlacementHorizontalFacing()); - } else { - // default: placement on the face the player clicking - return getDefaultState().with(FACING, context.getFace()); - } - } - - @Override - @OnlyIn(Dist.CLIENT) - public BlockRenderLayer getRenderLayer() - { return BlockRenderLayer.CUTOUT; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorFull.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorFull.java deleted file mode 100644 index f18eabf..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorFull.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * @file BlockDecorFull.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Full block characteristics class. Explicitly overrides some - * `Block` methods to return faster due to exclusive block properties. - */ -package wile.engineersdecor.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wile.engineersdecor.detail.ModAuxiliaries; -import javax.annotation.Nullable; -import java.util.List; - - -public class BlockDecorFull extends BlockDecor -{ - public BlockDecorFull(long config, Block.Properties properties) - { super(config, properties); } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - @Override - @SuppressWarnings("deprecation") - public boolean isFullCube(IBlockState state) - { return true; } - - @Override - @SuppressWarnings("deprecation") - public boolean isNormalCube(IBlockState state) - { return true; } - - @Override - public boolean canSpawnInBlock() - { return false; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorLadder.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorLadder.java deleted file mode 100644 index c91a98c..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorLadder.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * @file BlockDecorLadder.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Ladder block. The implementation is based on the vanilla - * net.minecraft.block.BlockLadder. Minor changes to enable - * later configuration (for block list based construction - * time configuration), does not drop when the block behind - * is broken, etc. - */ -package wile.engineersdecor.blocks; - -import wile.engineersdecor.detail.ModAuxiliaries; -import net.minecraft.block.state.IBlockState; -import net.minecraft.block.*; -import net.minecraft.block.material.EnumPushReaction; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.shapes.VoxelShapes; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraft.world.IBlockReader; -import net.minecraft.util.*; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import javax.annotation.Nullable; -import java.util.List; - - -public class BlockDecorLadder extends BlockLadder -{ - protected static final AxisAlignedBB EDLADDER_UNROTATED_AABB = ModAuxiliaries.getPixeledAABB(3, 0, 0, 13, 16, 2); - protected static final VoxelShape EDLADDER_SOUTH_AABB = VoxelShapes.create(ModAuxiliaries.getRotatedAABB(EDLADDER_UNROTATED_AABB, EnumFacing.SOUTH, false)); - protected static final VoxelShape EDLADDER_EAST_AABB = VoxelShapes.create(ModAuxiliaries.getRotatedAABB(EDLADDER_UNROTATED_AABB, EnumFacing.EAST, false)); - protected static final VoxelShape EDLADDER_WEST_AABB = VoxelShapes.create(ModAuxiliaries.getRotatedAABB(EDLADDER_UNROTATED_AABB, EnumFacing.WEST, false)); - protected static final VoxelShape EDLADDER_NORTH_AABB = VoxelShapes.create(ModAuxiliaries.getRotatedAABB(EDLADDER_UNROTATED_AABB, EnumFacing.NORTH, false)); - - public BlockDecorLadder(long config, Block.Properties builder) - { super(builder); } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - public VoxelShape getShape(IBlockState state, IBlockReader worldIn, BlockPos pos) - { - switch ((EnumFacing)state.get(FACING)) { - case NORTH: return EDLADDER_NORTH_AABB; - case SOUTH: return EDLADDER_SOUTH_AABB; - case WEST: return EDLADDER_WEST_AABB; - default: return EDLADDER_EAST_AABB; - } - } - - @Override - public boolean canSpawnInBlock() - { return false; } - - @Override - @SuppressWarnings("deprecation") - public EnumPushReaction getPushReaction(IBlockState state) - { return EnumPushReaction.NORMAL; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java deleted file mode 100644 index f0433db..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorStairs.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * @file BlockDecorStairs.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Stairs and roof blocks, almost entirely based on vanilla stairs. - */ -package wile.engineersdecor.blocks; - -import net.minecraft.block.*; -import net.minecraft.block.material.EnumPushReaction; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wile.engineersdecor.detail.ModAuxiliaries; - -import javax.annotation.Nullable; -import java.util.List; - - -public class BlockDecorStairs extends BlockStairs -{ - public BlockDecorStairs(long config, IBlockState state, Block.Properties properties) - { super(state, properties); } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - @Override - public boolean canSpawnInBlock() - { return false; } - - @Override - @SuppressWarnings("deprecation") - public EnumPushReaction getPushReaction(IBlockState state) - { return EnumPushReaction.NORMAL; } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java b/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java deleted file mode 100644 index 916a970..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/BlockDecorWall.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * @file BlockDecorWall.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2019 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Wall blocks. - */ -package wile.engineersdecor.blocks; - -import net.minecraft.block.*; -import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.init.Fluids; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import wile.engineersdecor.detail.ModAuxiliaries; - -import javax.annotation.Nullable; -import java.util.List; - - -public class BlockDecorWall extends BlockWall -{ - private final VoxelShape[] shape_voxels; - private final VoxelShape[] collision_shape_voxels; - - public BlockDecorWall(long config, Block.Properties builder) - { - super(builder); - this.shape_voxels = buildWallShapes(4.0F, 4.0F, 16.0F, 0.0F, 16.0F); - this.collision_shape_voxels = buildWallShapes(4.0F, 4.0F, 24.0F, 0.0F, 24.0F); - } - - @Override - @OnlyIn(Dist.CLIENT) - public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) - { ModAuxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } - - protected VoxelShape[] buildWallShapes(float pole_width_x, float pole_width_z, float pole_height, float side_min_y, float side_max_y) - { return super.func_196408_a(pole_width_x, pole_width_z, pole_height, side_min_y, side_max_y); } - - @Override - public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) - { return shape_voxels[this.getIndex(state)]; } - - @Override - public VoxelShape getCollisionShape(IBlockState state, IBlockReader world, BlockPos pos) - { return collision_shape_voxels[this.getIndex(state)]; } - - private boolean attachesTo(IBlockState state, BlockFaceShape shape) - { final Block block = state.getBlock(); return (shape==BlockFaceShape.SOLID) && (!isExcepBlockForAttachWithPiston(block)) || (shape==BlockFaceShape.MIDDLE_POLE_THICK) || ((shape==BlockFaceShape.MIDDLE_POLE) && (block instanceof BlockFenceGate)); } - - @Override - public IBlockState updatePostPlacement(IBlockState state, EnumFacing facing, IBlockState facingState, IWorld world, BlockPos currentPos, BlockPos facingPos) - { - if(state.get(WATERLOGGED)) world.getPendingFluidTicks().scheduleTick(currentPos, Fluids.WATER, Fluids.WATER.getTickRate(world)); - if(facing == EnumFacing.DOWN) return super.updatePostPlacement(state, facing, facingState, world, currentPos, facingPos); - boolean n = (facing==EnumFacing.NORTH) ? this.attachesTo(facingState, facingState.getBlockFaceShape(world, facingPos, facing.getOpposite())) : state.get(NORTH); - boolean e = (facing==EnumFacing.EAST) ? this.attachesTo(facingState, facingState.getBlockFaceShape(world, facingPos, facing.getOpposite())) : state.get(EAST); - boolean s = (facing==EnumFacing.SOUTH) ? this.attachesTo(facingState, facingState.getBlockFaceShape(world, facingPos, facing.getOpposite())) : state.get(SOUTH); - boolean w = (facing==EnumFacing.WEST) ? this.attachesTo(facingState, facingState.getBlockFaceShape(world, facingPos, facing.getOpposite())) : state.get(WEST); - boolean not_straight = (!n || !s || e || w) && (n || s || !e || !w); - return state.with(UP, not_straight).with(NORTH, n).with(EAST, e).with(SOUTH, s).with(WEST, w); - } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.13/src/main/java/wile/engineersdecor/blocks/ModBlocks.java deleted file mode 100644 index e736ad6..0000000 --- a/1.13/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * @file ModBlocks.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Definition and initialisation of blocks of this - * module, along with their tile entities if applicable. - * - * Note: Straight forward definition of different blocks/entities - * to make recipes, models and texture definitions easier. - */ -package wile.engineersdecor.blocks; - -import wile.engineersdecor.ModEngineersDecor; -import wile.engineersdecor.detail.ModAuxiliaries; -import net.minecraft.block.material.MaterialColor; -import net.minecraft.block.Block; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.event.RegistryEvent; -import java.util.ArrayList; -import java.util.List; -import java.util.Collections; -import javax.annotation.Nonnull; - -@SuppressWarnings("unused") -public class ModBlocks -{ - public static final BlockDecorFull CLINKER_BRICK_BLOCK = (BlockDecorFull)(new BlockDecorFull( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "clinker_brick_block")); - - public static final BlockDecorStairs CLINKER_BRICK_STAIRS = (BlockDecorStairs)(new BlockDecorStairs( - BlockDecor.CFG_DEFAULT, - CLINKER_BRICK_BLOCK.getDefaultState(), - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "clinker_brick_stairs")); - - public static final BlockDecorFull SLAG_BRICK_BLOCK = (BlockDecorFull)(new BlockDecorFull( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "slag_brick_block")); - - public static final BlockDecorStairs SLAG_BRICK_STAIRS = (BlockDecorStairs)(new BlockDecorStairs( - BlockDecor.CFG_DEFAULT, - SLAG_BRICK_BLOCK.getDefaultState(), - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "slag_brick_stairs")); - - public static final BlockDecorFull REBAR_CONCRETE_BLOCK = (BlockDecorFull)(new BlockDecorFull( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(6f, 2000f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "rebar_concrete")); - - public static final BlockDecorStairs REBAR_CONCRETE_STAIRS = (BlockDecorStairs)(new BlockDecorStairs( - BlockDecor.CFG_DEFAULT, - REBAR_CONCRETE_BLOCK.getDefaultState(), - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 2000f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "rebar_concrete_stairs")); - - public static final BlockDecorWall REBAR_CONCRETE_WALL = (BlockDecorWall)(new BlockDecorWall( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 2000f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "rebar_concrete_wall")); - - public static final BlockDecorWall CONCRETE_WALL = (BlockDecorWall)(new BlockDecorWall( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(2f, 50f).sound(SoundType.STONE) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "concrete_wall")); - - public static final BlockDecorLadder METAL_RUNG_LADDER = (BlockDecorLadder)(new BlockDecorLadder( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(1.8f, 25f).sound(SoundType.METAL) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "metal_rung_ladder")); - - public static final BlockDecorLadder METAL_RUNG_STEPS = (BlockDecorLadder)(new BlockDecorLadder( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.IRON, MaterialColor.IRON).hardnessAndResistance(1.8f, 25f).sound(SoundType.METAL) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "metal_rung_steps")); - - public static final BlockDecorLadder TREATED_WOOD_LADDER = (BlockDecorLadder)(new BlockDecorLadder( - BlockDecor.CFG_DEFAULT, - Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.8f, 25f).sound(SoundType.WOOD) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_ladder")); - - public static final BlockDecor TREATED_WOOD_TABLE = (BlockDecor)(new BlockDecor( - BlockDecor.CFG_CUTOUT, - Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.0f, 15f).sound(SoundType.WOOD) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_table")); - - public static final BlockDecorDirected TREATED_WOOD_POLE = (BlockDecorDirected)(new BlockDecorDirected( - BlockDecor.CFG_CUTOUT, - Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.0f, 15f).sound(SoundType.WOOD), - ModAuxiliaries.getPixeledAABB(5.8,5.8,0, 10.2,10.2,16) - )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "treated_wood_pole")); - - // public static final BlockDecorFull IRON_SHEET_ROOF_FULLBLOCK = new BlockDecorFull("iron_sheet_roof_block", 0, Material.IRON, 1.8f, 25f, SoundType.METAL); - // public static final BlockDecorStairs IRON_SHEET_ROOF = new BlockDecorStairs("iron_sheet_roof", IRON_SHEET_ROOF_FULLBLOCK.getDefaultState()); - - private static final Block modBlocks[] = { - CLINKER_BRICK_BLOCK, - CLINKER_BRICK_STAIRS, - SLAG_BRICK_BLOCK, - SLAG_BRICK_STAIRS, - REBAR_CONCRETE_BLOCK, - REBAR_CONCRETE_STAIRS, - REBAR_CONCRETE_WALL, - - METAL_RUNG_LADDER, - METAL_RUNG_STEPS, - TREATED_WOOD_LADDER, - - TREATED_WOOD_POLE, - TREATED_WOOD_TABLE, - }; - - private static final Block ieDependentBlocks[] = { - CONCRETE_WALL - }; - - private static final Block devBlocks[] = { -// IRON_SHEET_ROOF, // model looks not good enough yet - }; - - private static ArrayList registeredBlocks = new ArrayList<>(); - - @Nonnull - public static List getRegisteredBlocks() - { return Collections.unmodifiableList(registeredBlocks); } - - public static final void registerBlocks(RegistryEvent.Register event) - { - ArrayList allBlocks = new ArrayList<>(); - Collections.addAll(allBlocks, modBlocks); - // @todo: find way to remove items from JEI, creative tab, etc instead of omitting registration. - if(ModAuxiliaries.isModLoaded("immersiveengineering")) ModAuxiliaries.logInfo("Immersive Engineering also installed ..."); - Collections.addAll(allBlocks, ieDependentBlocks); - // @todo: config not available yet, other registration control for experimental features needed. - //if(ModConfig.MISC.with_experimental.get()) Collections.addAll(allBlocks, devBlocks); - registeredBlocks.addAll(allBlocks); - for(Block e:registeredBlocks) event.getRegistry().register(e); - ModAuxiliaries.logInfo("Registered " + Integer.toString(registeredBlocks.size()) + " blocks."); - } - - /** - * Registers items for all blocks. Requires registerBlocks() event to be received first. - */ - public static final void registerItemBlocks(RegistryEvent.Register event) - { - int n = 0; - for(Block e:registeredBlocks) { - ResourceLocation rl = e.getRegistryName(); - if(rl == null) continue; - event.getRegistry().register(new ItemBlock(e, (new ItemBlock.Properties().group(ModEngineersDecor.ITEMGROUP))).setRegistryName(rl)); - ++n; - } - } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java b/1.13/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java deleted file mode 100644 index f26125f..0000000 --- a/1.13/src/main/java/wile/engineersdecor/detail/ModAuxiliaries.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * @file ModAuxiliaries.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * General commonly used functionality. - * - * @TODO KEYBOARD INPUT - */ -package wile.engineersdecor.detail; - -import net.minecraft.util.EnumFacing; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentString; -import net.minecraft.world.IBlockReader; -import net.minecraftforge.fml.ModList; -import org.lwjgl.glfw.GLFW; -import wile.engineersdecor.ModEngineersDecor; -import net.minecraft.item.ItemStack; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.client.util.InputMappings; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - - -import javax.annotation.Nullable; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class ModAuxiliaries -{ - /** - * Text localisation wrapper, implicitly prepends `ModEngineersDecor.MODID` to the - * translation keys. Forces formatting argument, nullable if no special formatting shall be applied.. - */ - public static TextComponentTranslation localizable(String modtrkey, @Nullable TextFormatting color, Object... args) - { - TextComponentTranslation tr = new TextComponentTranslation(ModEngineersDecor.MODID+"."+modtrkey, args); - if(color!=null) tr.getStyle().setColor(color); - return tr; - } - - @OnlyIn(Dist.CLIENT) - public static String localize(String translationKey, Object... args) - { - TextComponentTranslation tr = new TextComponentTranslation(translationKey, args); - tr.getStyle().setColor(TextFormatting.RESET); - final String ft = tr.getFormattedText(); - if(ft.contains("${")) { - // Non-recursive, non-argument lang file entry cross referencing. - Pattern pt = Pattern.compile("\\$\\{([\\w\\.]+)\\}"); - Matcher mt = pt.matcher(ft); - StringBuffer sb = new StringBuffer(); - while(mt.find()) mt.appendReplacement(sb, (new TextComponentTranslation(mt.group(1))).getFormattedText().trim()); - mt.appendTail(sb); - return sb.toString(); - } else { - return ft; - } - } - - /** - * Returns true if a given key is translated for the current language. - */ - @OnlyIn(Dist.CLIENT) - public static boolean hasTranslation(String key) - { return net.minecraft.client.resources.I18n.hasKey(key); } - - public static final class Tooltip - { - @OnlyIn(Dist.CLIENT) - public static boolean extendedTipCondition() - { return InputMappings.isKeyDown(GLFW.GLFW_KEY_LEFT_SHIFT) || InputMappings.isKeyDown(GLFW.GLFW_KEY_RIGHT_SHIFT); } - - @OnlyIn(Dist.CLIENT) - public static boolean helpCondition() - { return extendedTipCondition() && (InputMappings.isKeyDown(GLFW.GLFW_KEY_LEFT_CONTROL) || InputMappings.isKeyDown(GLFW.GLFW_KEY_RIGHT_CONTROL)); } - - /** - * Adds an extended tooltip or help tooltip depending on the key states of CTRL and SHIFT. - * Returns true if the localisable help/tip was added, false if not (either not CTL/SHIFT or - * no translation found). - */ - @OnlyIn(Dist.CLIENT) - public static boolean addInformation(@Nullable String advancedTooltipTranslationKey, @Nullable String helpTranslationKey, List tooltip, ITooltipFlag flag, boolean addAdvancedTooltipHints) - { - // Note: intentionally not using keybinding here, this must be `control` or `shift`. MC uses lwjgl Keyboard, - // so using this also here should be ok. - final boolean help_available = (helpTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".help"); - final boolean tip_available = (advancedTooltipTranslationKey != null) && ModAuxiliaries.hasTranslation(helpTranslationKey + ".tip"); - if((!help_available) && (!tip_available)) return false; - if(helpCondition()) { - if(!help_available) return false; - String s = localize(helpTranslationKey + ".help"); - if(s.isEmpty()) return false; - tooltip.add(new TextComponentString(s)); // @todo: check how to optimise that (to use TextComponentTranslation directly without compat losses) - return true; - } else if(extendedTipCondition()) { - if(!tip_available) return false; - String s = localize(advancedTooltipTranslationKey + ".tip"); - if(s.isEmpty()) return false; - tooltip.add(new TextComponentString(s)); - return true; - } else if(addAdvancedTooltipHints) { - String s = ""; - if(tip_available) s += localize(ModEngineersDecor.MODID + ".tooltip.hint.extended") + (help_available ? " " : ""); - if(help_available) s += localize(ModEngineersDecor.MODID + ".tooltip.hint.help"); - tooltip.add(new TextComponentString(s)); - } - return false; - } - - /** - * Adds an extended tooltip or help tooltip for a given stack depending on the key states of CTRL and SHIFT. - * Format in the lang file is (e.g. for items): "item.MODID.REGISTRYNAME.tip" and "item.MODID.REGISTRYNAME.help". - * Return value see method pattern above. - */ - @OnlyIn(Dist.CLIENT) - public static boolean addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag, boolean addAdvancedTooltipHints) - { return addInformation(stack.getTranslationKey(), stack.getTranslationKey(), tooltip, flag, addAdvancedTooltipHints); } - } - - public static final AxisAlignedBB getPixeledAABB(double x0, double y0, double z0, double x1, double y1, double z1) - { return new AxisAlignedBB(x0/16.0, y0/16.0, z0/16.0, x1/16.0, y1/16.0, z1/16.0); } - - public static final AxisAlignedBB getRotatedAABB(AxisAlignedBB bb, EnumFacing new_facing, boolean horizontal_rotation) - { - if(!horizontal_rotation) { - switch(new_facing.getIndex()) { - case 0: return new AxisAlignedBB(1-bb.maxX, 1-bb.maxZ, 1-bb.maxY, 1-bb.minX, 1-bb.minZ, 1-bb.minY); // D - case 1: return new AxisAlignedBB(1-bb.maxX, bb.minZ, bb.minY, 1-bb.minX, bb.maxZ, bb.maxY); // U - case 2: return new AxisAlignedBB(1-bb.maxX, bb.minY, 1-bb.maxZ, 1-bb.minX, bb.maxY, 1-bb.minZ); // N - case 3: return new AxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // S --> bb - case 4: return new AxisAlignedBB(1-bb.maxZ, bb.minY, bb.minX, 1-bb.minZ, bb.maxY, bb.maxX); // W - case 5: return new AxisAlignedBB( bb.minZ, bb.minY, 1-bb.maxX, bb.maxZ, bb.maxY, 1-bb.minX); // E - } - } else { - switch(new_facing.getIndex()) { - case 0: return new AxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // D --> bb - case 1: return new AxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // U --> bb - case 2: return new AxisAlignedBB( bb.minX, bb.minY, bb.minZ, bb.maxX, bb.maxY, bb.maxZ); // N --> bb - case 3: return new AxisAlignedBB(1-bb.maxX, bb.minY, 1-bb.maxZ, 1-bb.minX, bb.maxY, 1-bb.minZ); // S - case 4: return new AxisAlignedBB( bb.minZ, bb.minY, 1-bb.maxX, bb.maxZ, bb.maxY, 1-bb.minX); // W - case 5: return new AxisAlignedBB(1-bb.maxZ, bb.minY, bb.minX, 1-bb.minZ, bb.maxY, bb.maxX); // E - } - } - return bb; - } - - public static final boolean isModLoaded(final String registry_name) - { return ModList.get().isLoaded(registry_name); } - - public static final void logInfo(final String msg) - { ModEngineersDecor.logger().info(msg); } - - public static final void logWarn(final String msg) - { ModEngineersDecor.logger().warn(msg); } - - public static final void logError(final String msg) - { ModEngineersDecor.logger().error(msg); } - -} diff --git a/1.13/src/main/java/wile/engineersdecor/detail/ModConfig.java b/1.13/src/main/java/wile/engineersdecor/detail/ModConfig.java deleted file mode 100644 index 7e9600a..0000000 --- a/1.13/src/main/java/wile/engineersdecor/detail/ModConfig.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * @file ModConfig.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Main class for module settings. Handles reading and - * saving the config file. - */ -package wile.engineersdecor.detail; - -import wile.engineersdecor.ModEngineersDecor; -import net.minecraftforge.common.ForgeConfigSpec; - -public class ModConfig -{ - private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder(); - public static final Miscellaneous MISC = new Miscellaneous(BUILDER); - public static final ForgeConfigSpec conf_spec = BUILDER.build(); - - public static final class Miscellaneous - { - public final ForgeConfigSpec.ConfigValue with_experimental; - - public Miscellaneous(ForgeConfigSpec.Builder builder) - { - builder.push("Miscellaneous"); - with_experimental = builder - .translation(ModEngineersDecor.MODID + ".config.with_experimental") - .comment("Enables experimental features. Use at own risk.") - .define("with_experimental", false); - builder.pop(); - } - } -} diff --git a/1.13/src/main/java/wile/engineersdecor/detail/RecipeCondModSpecific.java b/1.13/src/main/java/wile/engineersdecor/detail/RecipeCondModSpecific.java deleted file mode 100644 index bc6f7f9..0000000 --- a/1.13/src/main/java/wile/engineersdecor/detail/RecipeCondModSpecific.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * @file RecipeCondRegistered.java - * @author Stefan Wilhelm (wile) - * @copyright (C) 2018 Stefan Wilhelm - * @license MIT (see https://opensource.org/licenses/MIT) - * - * Recipe condition to enable opt'ing out JSON based recipes, referenced - * in assets/engineersdecor/recipes/_factories.json with full path (therefore - * I had to make a separate file for that instead of a few lines in - * ModAuxiliaries). - */ -package wile.engineersdecor.detail; - - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.IConditionSerializer; -import net.minecraftforge.registries.IForgeRegistry; -import net.minecraftforge.registries.ForgeRegistries; - -import com.google.gson.*; -import javax.annotation.Nullable; -import javax.annotation.Nonnull; -import java.util.function.BooleanSupplier; - - -public class RecipeCondModSpecific implements IConditionSerializer -{ - public static final BooleanSupplier RECIPE_INCLUDE = ()->true; - public static final BooleanSupplier RECIPE_EXCLUDE = ()->false; - - @Override - public @Nonnull BooleanSupplier parse(@Nullable JsonObject json) { - try { - if(json==null) return RECIPE_EXCLUDE; - final IForgeRegistry block_registry = ForgeRegistries.BLOCKS; - final IForgeRegistry item_registry = ForgeRegistries.ITEMS; - final JsonArray items = json.getAsJsonArray("required"); - if(items!=null) { - for(JsonElement e: items) { - if(!e.isJsonPrimitive()) continue; - final ResourceLocation rl = new ResourceLocation(((JsonPrimitive)e).getAsString()); - if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) return RECIPE_EXCLUDE; // required item not registered - } - } - final JsonPrimitive result = json.getAsJsonPrimitive("result"); - if(result != null) { - final ResourceLocation rl = new ResourceLocation(result.getAsString()); - if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) return RECIPE_EXCLUDE; // required result not registered - } - final JsonArray missing = json.getAsJsonArray("missing"); - if((missing!=null) && (missing.size() > 0)) { - for(JsonElement e: missing) { - if(!e.isJsonPrimitive()) continue; - final ResourceLocation rl = new ResourceLocation(((JsonPrimitive)e).getAsString()); - // At least one item missing, enable this recipe as alternative recipe for another one that check the missing item as required item. - // --> e.g. if IE not installed there is no slag. One recipe requires slag, and another one (for the same result) is used if there - // is no slag. - if((!block_registry.containsKey(rl)) && (!item_registry.containsKey(rl))) return RECIPE_INCLUDE; - } - return RECIPE_EXCLUDE; // all required there, but there is no item missing, so another recipe - } else { - return RECIPE_INCLUDE; // no missing given, means include if result and required are all there. - } - } catch(Throwable ex) { - ModAuxiliaries.logError("rsgauges::ResultRegisteredCondition failed: " + ex.toString()); - } - return RECIPE_EXCLUDE; // skip on exception. - } -} diff --git a/1.13/src/main/resources/META-INF/mods.toml b/1.13/src/main/resources/META-INF/mods.toml deleted file mode 100644 index ca3f229..0000000 --- a/1.13/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,31 +0,0 @@ -# @file mods.toml -# @spec TOML v0.5.0 (https://github.com/toml-lang/toml) -modLoader="javafml" # forge FML java -loaderVersion="[25,)" -issueTrackerURL="https://github.com/stfwi/engineers-decor/issues/" - -[[mods]] - -modId="engineersdecor" -version="${file.jarVersion}" -displayName="Engineer's Decor" -description="Adds cosmetic blocks for the engineer's workshop, factory and home." -authors="wilechaote" -credits="BluSunrize, malte0811, et al., the Forge Smiths, the Modders of the World." -updateJSONURL="https://raw.githubusercontent.com/stfwi/engineers-decor/develop/meta/update.json" -displayURL="https://github.com/stfwi/engineers-decor/" -logoFile="engineersdecor.png" # Double check: A file name (in the root of the mod JAR) containing a logo for display - -[[dependencies.engineersdecor]] - modId="forge" - mandatory=true - versionRange="[25,)" #mandatory - ordering="NONE" - side="BOTH" - -[[dependencies.engineersdecor]] - modId="minecraft" - mandatory=true - versionRange="[1.13.2]" - ordering="NONE" - side="BOTH" diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json deleted file mode 100644 index ed80404..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_block.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "": [ - { "model": "engineersdecor:block/brick/clinker_brick_model0" }, - { "model": "engineersdecor:block/brick/clinker_brick_model1" }, - { "model": "engineersdecor:block/brick/clinker_brick_model2" }, - { "model": "engineersdecor:block/brick/clinker_brick_model3" }, - { "model": "engineersdecor:block/brick/clinker_brick_model4" }, - { "model": "engineersdecor:block/brick/clinker_brick_model5" }, - { "model": "engineersdecor:block/brick/clinker_brick_model6" }, - { "model": "engineersdecor:block/brick/clinker_brick_model7" } - ] - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stairs.json deleted file mode 100644 index 2a934f4..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/clinker_brick_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/brick/clinker_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/clinker_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json deleted file mode 100644 index c9525c6..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/concrete_wall.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "multipart": [ - { "when": { "up": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_post" } }, - { "when": { "north": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_side", "uvlock": true } }, - { "when": { "east": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_side", "y": 90, "uvlock": true } }, - { "when": { "south": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_side", "y": 180, "uvlock": true } }, - { "when": { "west": "true" }, "apply": { "model": "engineersdecor:block/concrete/concrete_wall_side", "y": 270, "uvlock": true } } - ] -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof.json deleted file mode 100644 index 1bf9c8e..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "engineersdecor:block/stairs/decor_straight_roof_model", - "textures": { - "bottom": "engineersdecor:block/iestyle/ironsheet_roof_top", - "side": "engineersdecor:block/iestyle/ironsheet_roof", - "top": "engineersdecor:block/iestyle/ironsheet_roof_top" - } - }, - "variants": { - "": [{}], - "inventory": [{}], - "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model" }, - "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model" }, - "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model" }, - "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model" }, - "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model" }, - "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/stairs/decor_straight_roof_model", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/stairs/decor_outer_roof_model", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/stairs/decor_inner_roof_model", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof_block.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof_block.json deleted file mode 100644 index a7ff079..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/iron_sheet_roof_block.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "engineersdecor:block/std/decor_full_block_model", - "textures": { "all": "engineersdecor:block/iestyle/ironsheet_roof" } - }, - "variants": { - "": [{}], - "inventory": [{}] - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_ladder.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_ladder.json deleted file mode 100644 index 07c32af..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_ladder.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "engineersdecor:block/ladder/metal_rung_ladder_model" }, - "facing=south": { "model": "engineersdecor:block/ladder/metal_rung_ladder_model", "y":180 }, - "facing=west": { "model": "engineersdecor:block/ladder/metal_rung_ladder_model", "y":270 }, - "facing=east": { "model": "engineersdecor:block/ladder/metal_rung_ladder_model", "y":90 } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_steps.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_steps.json deleted file mode 100644 index 794103c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/metal_rung_steps.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "engineersdecor:block/ladder/metal_rung_steps_model" }, - "facing=south": { "model": "engineersdecor:block/ladder/metal_rung_steps_model", "y":180 }, - "facing=west": { "model": "engineersdecor:block/ladder/metal_rung_steps_model", "y":270 }, - "facing=east": { "model": "engineersdecor:block/ladder/metal_rung_steps_model", "y":90 } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json deleted file mode 100644 index a4d790a..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "": [ - { "model": "engineersdecor:block/concrete/rebar_concrete_model0" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model1" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model2" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model3" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model4" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model5" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model6" }, - { "model": "engineersdecor:block/concrete/rebar_concrete_model7" } - ] - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_stairs.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_stairs.json deleted file mode 100644 index a137d62..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/concrete/rebar_concrete_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_wall.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_wall.json deleted file mode 100644 index dee0d7c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/rebar_concrete_wall.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "multipart": [ - { "when": { "up": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_post" } }, - { "when": { "north": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_side", "uvlock": true } }, - { "when": { "east": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_side", "y": 90, "uvlock": true } }, - { "when": { "south": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_side", "y": 180, "uvlock": true } }, - { "when": { "west": "true" }, "apply": { "model": "engineersdecor:block/concrete/rebar_concrete_wall_side", "y": 270, "uvlock": true } } - ] -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_block.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_block.json deleted file mode 100644 index 41db44e..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_block.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "variants": { - "": [ - { "model": "engineersdecor:block/brick/slag_brick_model0" }, - { "model": "engineersdecor:block/brick/slag_brick_model1" }, - { "model": "engineersdecor:block/brick/slag_brick_model2" }, - { "model": "engineersdecor:block/brick/slag_brick_model3" }, - { "model": "engineersdecor:block/brick/slag_brick_model4" }, - { "model": "engineersdecor:block/brick/slag_brick_model5" }, - { "model": "engineersdecor:block/brick/slag_brick_model6" }, - { "model": "engineersdecor:block/brick/slag_brick_model7" } - ] - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_stairs.json deleted file mode 100644 index c89f2a2..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/slag_brick_stairs.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer" }, - "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer" }, - "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner" }, - "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner" }, - "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/brick/slag_brick_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_outer", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/brick/slag_brick_stairs_inner", "x": 180, "y": 270, "uvlock": true } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_ladder.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_ladder.json deleted file mode 100644 index b17f5a4..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_ladder.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "variants": { - "facing=north": { "model": "engineersdecor:block/ladder/treated_wood_ladder_model" }, - "facing=south": { "model": "engineersdecor:block/ladder/treated_wood_ladder_model", "y":180 }, - "facing=west": { "model": "engineersdecor:block/ladder/treated_wood_ladder_model", "y":270 }, - "facing=east": { "model": "engineersdecor:block/ladder/treated_wood_ladder_model", "y":90 } - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_pole.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_pole.json deleted file mode 100644 index eb3a59b..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_pole.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "engineersdecor:pole/straight_pole_model", - "textures": { - "particle": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "side": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "top": "engineersdecor:block/pole/treated_wood_pole_top_texture" - } - }, - "variants": { - "facing": { "north": {"y":180}, "south": {"y":0}, "west": {"y":90}, "east": {"y":270}, "up": {"x":90}, "down": {"x":270}} - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_table.json b/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_table.json deleted file mode 100644 index 80afd09..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/blockstates/treated_wood_table.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { "model": "engineersdecor:furniture/treated_wood_table_model" }, - "variants": { "": [{}] } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json b/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json deleted file mode 100644 index 0d5b675..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/lang/en_us.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "language": "English", - "language.region": "United States", - "language.code": "en_us", - - "itemGroup.tabengineersdecor":"Engineer's Decor", - - "engineersdecor.config.title":"Engineer's Decor Config", - "engineersdecor.tooltip.hint.extended":"§6[§9SHIFT§r More info§6]§r", - "engineersdecor.tooltip.hint.help":"§6[§9CTRL-SHIFT§r Help§6]§r", - - "block.engineersdecor.clinker_brick_block":"Clinker Brick", - "block.engineersdecor.clinker_brick_block.help":"§6A brick block with position dependent texture variations.§r\nLooks slightly darker and more color intensive than the vanilla brick block.", - "block.engineersdecor.clinker_brick_stairs":"Clinker Brick Stairs", - "block.engineersdecor.clinker_brick_stairs.help":"§6Looks slightly darker and more color intensive than the vanilla brick block.", - - "block.engineersdecor.slag_brick_block":"Slag Brick", - "block.engineersdecor.slag_brick_block.help":"§6A gray-brown brick block with position dependent texture variations.", - "block.engineersdecor.slag_brick_stairs":"Slag Brick Stairs", - "block.engineersdecor.slag_brick_stairs.help":"§6Gray-brown brick stairs.", - - "block.engineersdecor.rebar_concrete":"Rebar Concrete", - "block.engineersdecor.rebar_concrete.help":"§6Steel reinforced concrete block.§r Expensive but Creeper-proof like obsidian.", - "block.engineersdecor.rebar_concrete_stairs":"Rebar Concrete Stairs", - "block.engineersdecor.rebar_concrete_stairs.help":"§6Steel reinforced concrete stairs.§r Expensive but Creeper-proof like obsidian.", - "block.engineersdecor.rebar_concrete_wall":"Rebar Concrete Wall", - "block.engineersdecor.rebar_concrete_wall.help":"§6Steel reinforced concrete wall.§r Expensive but Creeper-proof like obsidian.", - - "block.engineersdecor.concrete_wall":"Concrete Wall", - "block.engineersdecor.concrete_wall.help":"§6Wall made of solid concrete.", - - "block.engineersdecor.metal_rung_ladder":"Metal Rung Ladder", - "block.engineersdecor.metal_rung_ladder.help":"§6Typical industrial wall ladder, consisting of horizontal metal rod rungs.", - - "block.engineersdecor.metal_rung_steps":"Staggered Metal Steps", - "block.engineersdecor.metal_rung_steps.help":"§6Staggered rod rungs affixed to a wall, allowing to climb up, fall down, and so on.", - - "block.engineersdecor.treated_wood_ladder":"Treated Wood Ladder", - "block.engineersdecor.treated_wood_ladder.help":"§6Weather-proof wooden ladder.", - - - - - "block.engineersdecor.iron_sheet_roof":"Iron Sheet Metal Roof", - "block.engineersdecor.iron_sheet_roof.help":"§6Well, it's a roof.", - - "block.engineersdecor.treated_wood_pole":"Straight Treated Wood Pole", - "block.engineersdecor.treated_wood_pole.help":"§6Straight pole fragment with the diameter of a wire relay.§r\nCan be useful as alternative to the wire posts if special special lengths are needed, or as support for structures.", - - "block.engineersdecor.treated_wood_table":"Treated Wood Table", - "block.engineersdecor.treated_wood_table.help":"§6Robust four-legged wood table." - -} diff --git a/1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json b/1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json deleted file mode 100644 index 08710a4..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/lang/zh_cn.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "language": "Chinese", - "language.region": "China", - "language.code": "zh_cn", - - "itemGroup.tabengineersdecor":"工程师的装饰", - - "engineersdecor.config.title":"工程师的装饰配置", - "engineersdecor.tooltip.hint.extended":"§6[按§9SHIFT§r获取更多信息§6]§r", - "engineersdecor.tooltip.hint.help":"§6[按§9CTRL-SHIFT§r获取帮助§6]§r", - - "block.engineersdecor.clinker_brick_block":"熟料砖", - "block.engineersdecor.clinker_brick_block.help":"§6具有位置相关纹理变化的砖块.§r\n看起来比原版砖块稍暗,颜色更浓.", - "block.engineersdecor.clinker_brick_stairs":"熟料砖楼梯", - "block.engineersdecor.clinker_brick_stairs.help":"§6看起来比原版砖块稍暗,颜色更浓.", - - "block.engineersdecor.slag_brick_block":"炉渣砖", - "block.engineersdecor.slag_brick_block.help":"§6灰褐色砖块,具有位置相关的纹理变化.", - "block.engineersdecor.slag_brick_stairs":"炉渣砖楼梯", - "block.engineersdecor.slag_brick_stairs.help":"§6灰褐色砖块楼梯.", - - "block.engineersdecor.rebar_concrete":"钢筋混凝土", - "block.engineersdecor.rebar_concrete.help":"§6钢筋混凝土砌块.§r 昂贵,但像黑曜石一样防苦力怕.", - "block.engineersdecor.rebar_concrete_stairs":"钢筋混凝土楼梯", - "block.engineersdecor.rebar_concrete_stairs.help":"§6钢筋混凝土楼梯.§r 昂贵,但像黑曜石一样防苦力怕.", - "block.engineersdecor.rebar_concrete_wall":"钢筋混凝土墙", - "block.engineersdecor.rebar_concrete_wall.help":"§6钢筋混凝土墙.§r 昂贵,但像黑曜石一样防苦力怕.", - - "block.engineersdecor.concrete_wall":"水泥墙", - "block.engineersdecor.concrete_wall.help":"§6墙由坚固的混凝土制成.", - - "block.engineersdecor.metal_rung_ladder":"金属环梯", - "block.engineersdecor.metal_rung_ladder.help":"§6典型的工业墙梯,包括水平金属杆横档.", - - "block.engineersdecor.metal_rung_steps":"交错的金属台阶", - "block.engineersdecor.metal_rung_steps.help":"§6贴在墙上的交错的杆横档,允许爬上,爬下等等.", - - "block.engineersdecor.treated_wood_ladder":"经过处理的木梯", - "block.engineersdecor.treated_wood_ladder.help":"§6防风雨的木梯.", - - - - - "block.engineersdecor.iron_sheet_roof":"铁板金属屋顶", - "block.engineersdecor.iron_sheet_roof.help":"§6嗯,这是一个屋顶.", - - "block.engineersdecor.treated_wood_pole":"直立处理木杆", - "block.engineersdecor.treated_wood_pole.help":"§6具有导线继电器直径的直极片段.§r\n如果需要特殊的特殊长度,或作为结构的支撑,可以作为线柱的替代品.", - - "block.engineersdecor.treated_wood_table":"经过处理的木桌", - "block.engineersdecor.treated_wood_table.help":"§6坚固的四足木桌." - -} diff --git a/1.13/src/main/resources/assets/engineersdecor/logo.png b/1.13/src/main/resources/assets/engineersdecor/logo.png deleted file mode 100644 index 567f937..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/logo.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model0.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model0.json deleted file mode 100644 index 5f7fcf3..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model0.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture0" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model1.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model1.json deleted file mode 100644 index 831dc09..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model1.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture1" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model2.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model2.json deleted file mode 100644 index 3a712ce..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model2.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture2" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model3.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model3.json deleted file mode 100644 index 1abe010..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model3.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture3" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model4.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model4.json deleted file mode 100644 index 3854790..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model4.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture4" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model5.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model5.json deleted file mode 100644 index 3acb321..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model5.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture5" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model6.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model6.json deleted file mode 100644 index 8e9f23f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model6.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture6" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model7.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model7.json deleted file mode 100644 index 943acaf..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_model7.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture7" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs.json deleted file mode 100644 index caf694a..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "top": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "side": "engineersdecor:block/clinker_brick/clinker_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_inner.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_inner.json deleted file mode 100644 index f0f846f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "top": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "side": "engineersdecor:block/clinker_brick/clinker_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_outer.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_outer.json deleted file mode 100644 index c231a1b..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/clinker_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "top": "engineersdecor:block/clinker_brick/clinker_brick_texture0", - "side": "engineersdecor:block/clinker_brick/clinker_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model0.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model0.json deleted file mode 100644 index 2980acf..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model0.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture0" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model1.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model1.json deleted file mode 100644 index 4bf5cef..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model1.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture1" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model2.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model2.json deleted file mode 100644 index c256403..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model2.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture2" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model3.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model3.json deleted file mode 100644 index f554b58..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model3.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture3" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model4.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model4.json deleted file mode 100644 index 3e33703..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model4.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture4" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model5.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model5.json deleted file mode 100644 index cc5d796..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model5.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture5" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model6.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model6.json deleted file mode 100644 index 74999bb..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model6.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture6" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model7.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model7.json deleted file mode 100644 index ade69c1..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_model7.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/slag_brick/slag_brick_texture7" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs.json deleted file mode 100644 index 2be0d00..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "engineersdecor:block/slag_brick/slag_brick_texture0", - "top": "engineersdecor:block/slag_brick/slag_brick_texture0", - "side": "engineersdecor:block/slag_brick/slag_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_inner.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_inner.json deleted file mode 100644 index 82576d5..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "engineersdecor:block/slag_brick/slag_brick_texture0", - "top": "engineersdecor:block/slag_brick/slag_brick_texture1", - "side": "engineersdecor:block/slag_brick/slag_brick_texture2" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_outer.json b/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_outer.json deleted file mode 100644 index 9242715..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/brick/slag_brick_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "engineersdecor:block/slag_brick/slag_brick_texture0", - "top": "engineersdecor:block/slag_brick/slag_brick_texture0", - "side": "engineersdecor:block/slag_brick/slag_brick_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_default.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_default.json deleted file mode 100644 index 5d32d22..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_default.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_default", - "textures": { - "wall": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete", - "particle": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_inventory.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_inventory.json deleted file mode 100644 index 7edb877..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_inventory", - "textures": { - "wall": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete", - "particle": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_post.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_post.json deleted file mode 100644 index 77ebaa5..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_post", - "textures": { - "wall": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete", - "particle": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_side.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_side.json deleted file mode 100644 index 1e1ba7f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/concrete_wall_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_side", - "textures": { - "wall": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete", - "particle": "engineersdecor:block/ieoriginal/ie_stone_decoration_concrete" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model0.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model0.json deleted file mode 100644 index 08e166a..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model0.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture0" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model1.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model1.json deleted file mode 100644 index 275a434..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model1.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture1" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model2.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model2.json deleted file mode 100644 index c685dcf..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model2.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture2" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model3.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model3.json deleted file mode 100644 index fac71fb..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model3.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture3" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model4.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model4.json deleted file mode 100644 index 08b007c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model4.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture4" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model5.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model5.json deleted file mode 100644 index 53c1799..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model5.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture5" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model6.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model6.json deleted file mode 100644 index c1ee5ce..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model6.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture6" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model7.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model7.json deleted file mode 100644 index 893d1c1..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_model7.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/concrete/rebar_concrete_texture7" } } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs.json deleted file mode 100644 index b082edd..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "engineersdecor:block/concrete/rebar_concrete_texture0", - "top": "engineersdecor:block/concrete/rebar_concrete_texture1", - "side": "engineersdecor:block/concrete/rebar_concrete_texture2" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_inner.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_inner.json deleted file mode 100644 index 96fe26d..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "engineersdecor:block/concrete/rebar_concrete_texture0", - "top": "engineersdecor:block/concrete/rebar_concrete_texture1", - "side": "engineersdecor:block/concrete/rebar_concrete_texture2" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_outer.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_outer.json deleted file mode 100644 index ff881a2..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "engineersdecor:block/concrete/rebar_concrete_texture0", - "top": "engineersdecor:block/concrete/rebar_concrete_texture1", - "side": "engineersdecor:block/concrete/rebar_concrete_texture2" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_default.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_default.json deleted file mode 100644 index 5ac9d0c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_default.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_default", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_inventory.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_inventory.json deleted file mode 100644 index 98c15ce..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_inventory.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_inventory", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_post.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_post.json deleted file mode 100644 index 2dded83..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_post.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_post", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_side.json b/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_side.json deleted file mode 100644 index 0994e40..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/concrete/rebar_concrete_wall_side.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent":"engineersdecor:block/wall/concrete_wall_side", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - } -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json deleted file mode 100644 index a6db2bc..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json +++ /dev/null @@ -1,190 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "o": "engineersdecor:block/iestyle/treated_wood_framed_texture", - "particle": "engineersdecor:block/iestyle/treated_wood_framed_texture" - }, - "elements": [ - { - "from": [1, 0, 1], - "to": [3, 14, 3], - "faces": { - "north": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "east": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "south": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "west": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "up": {"uv": [1, 1, 3, 3], "texture": "#o"}, - "down": {"uv": [1, 13, 3, 15], "texture": "#o", "cullface": "down"} - } - }, - { - "from": [13, 0, 1], - "to": [15, 14, 3], - "faces": { - "north": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "east": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "south": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "west": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "up": {"uv": [13, 1, 15, 3], "texture": "#o"}, - "down": {"uv": [13, 13, 15, 15], "texture": "#o", "cullface": "down"} - } - }, - { - "from": [13, 0, 13], - "to": [15, 14, 15], - "faces": { - "north": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "east": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "south": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "west": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "up": {"uv": [13, 13, 15, 15], "texture": "#o"}, - "down": {"uv": [13, 1, 15, 3], "texture": "#o", "cullface": "down"} - } - }, - { - "from": [1, 0, 13], - "to": [3, 14, 15], - "faces": { - "north": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "east": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "south": {"uv": [1, 2, 3, 16], "texture": "#o"}, - "west": {"uv": [13, 2, 15, 16], "texture": "#o"}, - "up": {"uv": [1, 13, 3, 15], "texture": "#o"}, - "down": {"uv": [1, 1, 3, 3], "texture": "#o", "cullface": "down"} - } - }, - { - "from": [0, 14, 0], - "to": [16, 15.875, 16], - "faces": { - "north": {"uv": [0, 0.125, 16, 2], "texture": "#o"}, - "east": {"uv": [0, 0.125, 16, 2], "texture": "#o"}, - "south": {"uv": [0, 0.125, 16, 2], "texture": "#o"}, - "west": {"uv": [0, 0.125, 16, 2], "texture": "#o"}, - "up": {"uv": [0, 0, 16, 16], "texture": "#o"}, - "down": {"uv": [0, 0, 16, 16], "texture": "#o"} - } - }, - { - "from": [0.125, 15.875, 0.125], - "to": [15.875, 16, 15.875], - "faces": { - "north": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"}, - "east": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"}, - "south": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"}, - "west": {"uv": [0.25, 0, 15.75, 0.125], "texture": "#o"}, - "up": {"uv": [0.25, 0.25, 15.75, 15.75], "texture": "#o"}, - "down": {"uv": [0.25, 0.25, 15.75, 15.75], "texture": "#o"} - } - }, - { - "from": [13, 13.5, 3], - "to": [15, 14, 5], - "faces": { - "north": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "east": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "south": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "west": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "up": {"uv": [13, 3, 15, 5], "texture": "#o"}, - "down": {"uv": [13, 11, 15, 13], "texture": "#o"} - } - }, - { - "from": [13, 13.5, 11], - "to": [15, 14, 13], - "faces": { - "north": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "east": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "south": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "west": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "up": {"uv": [13, 11, 15, 13], "texture": "#o"}, - "down": {"uv": [13, 3, 15, 5], "texture": "#o"} - } - }, - { - "from": [1, 13.5, 11], - "to": [3, 14, 13], - "faces": { - "north": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "east": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "south": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "west": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "up": {"uv": [1, 11, 3, 13], "texture": "#o"}, - "down": {"uv": [1, 3, 3, 5], "texture": "#o"} - } - }, - { - "from": [1, 13.5, 3], - "to": [3, 14, 5], - "faces": { - "north": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "east": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "south": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "west": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "up": {"uv": [1, 3, 3, 5], "texture": "#o"}, - "down": {"uv": [1, 11, 3, 13], "texture": "#o"} - } - }, - { - "from": [11, 13.5, 1], - "to": [13, 14, 3], - "faces": { - "north": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "east": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "south": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "west": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "up": {"uv": [11, 1, 13, 3], "texture": "#o"}, - "down": {"uv": [11, 13, 13, 15], "texture": "#o"} - } - }, - { - "from": [3, 13.5, 1], - "to": [5, 14, 3], - "faces": { - "north": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "east": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "south": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "west": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "up": {"uv": [3, 1, 5, 3], "texture": "#o"}, - "down": {"uv": [3, 13, 5, 15], "texture": "#o"} - } - }, - { - "from": [11, 13.5, 13], - "to": [13, 14, 15], - "faces": { - "north": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "east": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "south": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "west": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "up": {"uv": [11, 13, 13, 15], "texture": "#o"}, - "down": {"uv": [11, 1, 13, 3], "texture": "#o"} - } - }, - { - "from": [3, 13.5, 13], - "to": [5, 14, 15], - "faces": { - "north": {"uv": [11, 2, 13, 2.5], "texture": "#o"}, - "east": {"uv": [1, 2, 3, 2.5], "texture": "#o"}, - "south": {"uv": [3, 2, 5, 2.5], "texture": "#o"}, - "west": {"uv": [13, 2, 15, 2.5], "texture": "#o"}, - "up": {"uv": [3, 13, 5, 15], "texture": "#o"}, - "down": {"uv": [3, 1, 5, 3], "texture": "#o"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_ladder_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_ladder_model.json deleted file mode 100644 index f09e516..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_ladder_model.json +++ /dev/null @@ -1,159 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "particle": "engineersdecor:block/iestyle/steel_texture", - "o": "engineersdecor:block/iestyle/steel_texture" - }, - "display": { - "gui": { "rotation": [ 30, 225, 0 ], "scale": [0.625, 0.625, 0.625] }, - "fixed": { "scale": [0.5, 0.5, 0.5] }, - "ground": { "scale": [0.2, 0.2, 0.2] } - }, - "elements": [ - { - "from": [3, 2, 14], - "to": [13, 3, 15], - "faces": { - "north": {"uv": [1, 13, 16, 15], "texture": "#o"}, - "east": {"uv": [12, 13, 14, 15], "texture": "#o"}, - "south": {"uv": [1, 13, 16, 15], "texture": "#o"}, - "west": {"uv": [13, 11, 15, 13], "texture": "#o"}, - "up": {"uv": [1, 11, 16, 13], "texture": "#o"}, - "down": {"uv": [1, 13, 16, 15], "texture": "#o"} - } - }, - { - "from": [3, 6, 14], - "to": [13, 7, 15], - "faces": { - "north": {"uv": [3, 13, 16, 15], "texture": "#o"}, - "east": {"uv": [6, 14, 8, 16], "texture": "#o"}, - "south": {"uv": [3, 13, 16, 15], "texture": "#o"}, - "west": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "up": {"uv": [0, 13, 13, 15], "texture": "#o"}, - "down": {"uv": [3, 13, 16, 15], "texture": "#o"} - } - }, - { - "from": [3, 14, 14], - "to": [13, 15, 15], - "faces": { - "north": {"uv": [2, 6, 16, 8], "texture": "#o"}, - "east": {"uv": [7, 3, 9, 5], "texture": "#o"}, - "south": {"uv": [2, 6, 16, 8], "texture": "#o"}, - "west": {"uv": [2, 6, 4, 8], "texture": "#o"}, - "up": {"uv": [0, 4, 14, 6], "texture": "#o"}, - "down": {"uv": [2, 6, 16, 8], "texture": "#o"} - } - }, - { - "from": [3, 10, 14], - "to": [13, 11, 15], - "faces": { - "north": {"uv": [0, 11, 13, 13], "texture": "#o"}, - "east": {"uv": [1, 13, 3, 15], "texture": "#o"}, - "south": {"uv": [0, 11, 13, 13], "texture": "#o"}, - "west": {"uv": [0, 11, 2, 13], "texture": "#o"}, - "up": {"uv": [0, 9, 13, 11], "texture": "#o"}, - "down": {"uv": [0, 11, 13, 13], "texture": "#o"} - } - }, - { - "from": [12, 2, 15], - "to": [13.25, 3, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "south": {"uv": [1, 12, 4.25, 14], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "up": {"uv": [13, 4, 16, 6], "texture": "#o"}, - "down": {"uv": [1, 12, 4, 14], "texture": "#o"} - } - }, - { - "from": [2.75, 2, 15], - "to": [4, 3, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [11, 1, 14.25, 3], "texture": "#o"}, - "west": {"uv": [11, 9, 13, 11], "texture": "#o"}, - "up": {"uv": [12, 11, 15, 13], "texture": "#o"}, - "down": {"uv": [7, 3, 10, 5], "texture": "#o"} - } - }, - { - "from": [2.75, 10, 15], - "to": [4, 11, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [12, 14, 15.25, 16], "texture": "#o"}, - "west": {"uv": [7, 10, 9, 12], "texture": "#o"}, - "up": {"uv": [5, 12, 8, 14], "texture": "#o"}, - "down": {"uv": [4, 14, 7, 16], "texture": "#o"} - } - }, - { - "from": [12, 10, 15], - "to": [13.25, 11, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1.25], "texture": "#o"}, - "east": {"uv": [2, 4, 5, 6.25], "texture": "#o"}, - "south": {"uv": [10, 10, 13, 12], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1.25], "texture": "#o"}, - "up": {"uv": [7, 11, 9, 13], "texture": "#o"}, - "down": {"uv": [8, 0, 11, 2], "texture": "#o"} - } - }, - { - "from": [2.75, 6, 15], - "to": [4, 7, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [4, 7, 7.25, 9], "texture": "#o"}, - "west": {"uv": [11, 9, 13, 11], "texture": "#o"}, - "up": {"uv": [0, 13, 3, 15], "texture": "#o"}, - "down": {"uv": [4, 7, 7, 9], "texture": "#o"} - } - }, - { - "from": [12, 6, 15], - "to": [13.25, 7, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [8, 9, 10, 11], "texture": "#o"}, - "south": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "up": {"uv": [5, 13, 8, 15], "texture": "#o"}, - "down": {"uv": [8, 14, 11, 16], "texture": "#o"} - } - }, - { - "from": [2.75, 14, 15], - "to": [4, 15, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [3, 11, 6, 13], "texture": "#o"}, - "west": {"uv": [14, 7, 16, 9], "texture": "#o"}, - "up": {"uv": [7, 12, 10, 14], "texture": "#o"}, - "down": {"uv": [12, 7, 15, 9], "texture": "#o"} - } - }, - { - "from": [12, 14, 15], - "to": [13.25, 15, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1.25], "texture": "#o"}, - "east": {"uv": [0, 0, 3, 2.25], "texture": "#o"}, - "south": {"uv": [0, 13, 3, 15], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1.25], "texture": "#o"}, - "up": {"uv": [3, 7, 5.25, 9], "texture": "#o"}, - "down": {"uv": [0, 0, 1.25, 1], "texture": "#o"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_steps_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_steps_model.json deleted file mode 100644 index efa86fa..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/metal_rung_steps_model.json +++ /dev/null @@ -1,166 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "o": "engineersdecor:block/iestyle/steel_texture", - "particle": "engineersdecor:block/iestyle/steel_texture" - }, - "elements": [ - { - "from": [3, 2, 14], - "to": [7, 3, 15], - "faces": { - "north": {"uv": [1, 13, 9, 15], "texture": "#o"}, - "east": {"uv": [12, 13, 14, 15], "texture": "#o"}, - "south": {"uv": [4, 10, 11, 12], "texture": "#o"}, - "west": {"uv": [13, 11, 15, 13], "texture": "#o"}, - "up": {"uv": [1, 11, 9, 13], "texture": "#o"}, - "down": {"uv": [7, 2, 14, 4], "texture": "#o"} - } - }, - { - "from": [9, 6, 14], - "to": [13, 7, 15], - "faces": { - "north": {"uv": [3, 13, 9, 15], "texture": "#o"}, - "east": {"uv": [6, 14, 8, 16], "texture": "#o"}, - "south": {"uv": [4, 10, 11, 12], "texture": "#o"}, - "west": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "up": {"uv": [6, 11, 13, 13], "texture": "#o"}, - "down": {"uv": [9, 12, 16, 14], "texture": "#o"} - } - }, - { - "from": [9, 14, 14], - "to": [13, 15, 15], - "faces": { - "north": {"uv": [2, 6, 9, 8], "texture": "#o"}, - "east": {"uv": [7, 3, 9, 5], "texture": "#o"}, - "south": {"uv": [5, 13, 13, 15], "texture": "#o"}, - "west": {"uv": [2, 6, 4, 8], "texture": "#o"}, - "up": {"uv": [6, 9, 13, 11], "texture": "#o"}, - "down": {"uv": [4, 10, 11, 12], "texture": "#o"} - } - }, - { - "from": [3, 10, 14], - "to": [7, 11, 15], - "faces": { - "north": {"uv": [0, 11, 6, 13], "texture": "#o"}, - "east": {"uv": [1, 13, 3, 15], "texture": "#o"}, - "south": {"uv": [4, 6, 12, 8], "texture": "#o"}, - "west": {"uv": [0, 11, 2, 13], "texture": "#o"}, - "up": {"uv": [3, 5, 11, 7], "texture": "#o"}, - "down": {"uv": [5, 7, 12, 9], "texture": "#o"} - } - }, - { - "from": [6, 2, 15], - "to": [7.25, 3, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "south": {"uv": [1, 12, 4.25, 14], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "up": {"uv": [13, 4, 16, 6], "texture": "#o"}, - "down": {"uv": [1, 12, 4, 14], "texture": "#o"} - } - }, - { - "from": [2.75, 2, 15], - "to": [4, 3, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [11, 1, 14.25, 3], "texture": "#o"}, - "west": {"uv": [11, 9, 13, 11], "texture": "#o"}, - "up": {"uv": [12, 11, 15, 13], "texture": "#o"}, - "down": {"uv": [7, 3, 10, 5], "texture": "#o"} - } - }, - { - "from": [2.75, 10, 15], - "to": [4, 11, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [12, 14, 15.25, 16], "texture": "#o"}, - "west": {"uv": [7, 10, 9, 12], "texture": "#o"}, - "up": {"uv": [5, 12, 8, 14], "texture": "#o"}, - "down": {"uv": [4, 14, 7, 16], "texture": "#o"} - } - }, - { - "from": [6, 10, 15], - "to": [7.25, 11, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1.25], "texture": "#o"}, - "east": {"uv": [2, 4, 5, 6.25], "texture": "#o"}, - "south": {"uv": [10, 10, 13, 12], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1.25], "texture": "#o"}, - "up": {"uv": [7, 11, 9, 13], "texture": "#o"}, - "down": {"uv": [8, 0, 11, 2], "texture": "#o"} - } - }, - { - "from": [8.75, 6, 15], - "to": [10, 7, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [4, 7, 7.25, 9], "texture": "#o"}, - "west": {"uv": [11, 9, 13, 11], "texture": "#o"}, - "up": {"uv": [0, 13, 3, 15], "texture": "#o"}, - "down": {"uv": [4, 7, 7, 9], "texture": "#o"} - } - }, - { - "from": [12, 6, 15], - "to": [13.25, 7, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [8, 9, 10, 11], "texture": "#o"}, - "south": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "up": {"uv": [5, 13, 8, 15], "texture": "#o"}, - "down": {"uv": [8, 14, 11, 16], "texture": "#o"} - } - }, - { - "from": [8.75, 14, 15], - "to": [10, 15, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1], "texture": "#o"}, - "east": {"uv": [0, 0, 1, 1], "texture": "#o"}, - "south": {"uv": [3, 11, 6, 13], "texture": "#o"}, - "west": {"uv": [14, 7, 16, 9], "texture": "#o"}, - "up": {"uv": [7, 12, 10, 14], "texture": "#o"}, - "down": {"uv": [12, 7, 15, 9], "texture": "#o"} - } - }, - { - "from": [12, 14, 15], - "to": [13.25, 15, 16], - "faces": { - "north": {"uv": [0, 0, 1.25, 1.25], "texture": "#o"}, - "east": {"uv": [0, 0, 3, 2.25], "texture": "#o"}, - "south": {"uv": [0, 13, 3, 15], "texture": "#o"}, - "west": {"uv": [0, 0, 1, 1.25], "texture": "#o"}, - "up": {"uv": [3, 7, 5.25, 9], "texture": "#o"}, - "down": {"uv": [0, 0, 1.25, 1], "texture": "#o"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json deleted file mode 100644 index dbf9523..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "o": "engineersdecor:block/iestyle/treated_wood_rough_texture", - "particle": "engineersdecor:block/iestyle/treated_wood_rough_texture" - }, - "elements": [ - { - "from": [4, 2, 14.625], - "to": [12, 3, 15.625], - "faces": { - "north": {"uv": [0, 11, 15, 13], "texture": "#o"}, - "east": {"uv": [12, 13, 14, 15], "texture": "#o"}, - "south": {"uv": [1, 13, 16, 15], "texture": "#o"}, - "west": {"uv": [13, 11, 15, 13], "texture": "#o"}, - "up": {"uv": [1, 11, 16, 13], "texture": "#o"}, - "down": {"uv": [1, 13, 16, 15], "texture": "#o"} - } - }, - { - "from": [4, 6, 14.625], - "to": [12, 7, 15.625], - "faces": { - "north": {"uv": [1, 6, 14, 8], "texture": "#o"}, - "east": {"uv": [6, 14, 8, 16], "texture": "#o"}, - "south": {"uv": [3, 13, 16, 15], "texture": "#o"}, - "west": {"uv": [7, 9, 9, 11], "texture": "#o"}, - "up": {"uv": [0, 13, 13, 15], "texture": "#o"}, - "down": {"uv": [3, 13, 16, 15], "texture": "#o"} - } - }, - { - "from": [4, 14, 14.625], - "to": [12, 15, 15.625], - "faces": { - "north": {"uv": [0, 4, 14, 6], "texture": "#o"}, - "east": {"uv": [7, 3, 9, 5], "texture": "#o"}, - "south": {"uv": [2, 6, 16, 8], "texture": "#o"}, - "west": {"uv": [2, 6, 4, 8], "texture": "#o"}, - "up": {"uv": [0, 4, 14, 6], "texture": "#o"}, - "down": {"uv": [2, 6, 16, 8], "texture": "#o"} - } - }, - { - "from": [4, 10, 14.625], - "to": [12, 11, 15.625], - "faces": { - "north": {"uv": [3, 5, 16, 7], "texture": "#o"}, - "east": {"uv": [1, 13, 3, 15], "texture": "#o"}, - "south": {"uv": [0, 11, 13, 13], "texture": "#o"}, - "west": {"uv": [0, 11, 2, 13], "texture": "#o"}, - "up": {"uv": [0, 9, 13, 11], "texture": "#o"}, - "down": {"uv": [0, 11, 13, 13], "texture": "#o"} - } - }, - { - "from": [2.75, 0, 14.5], - "to": [4, 16, 16], - "faces": { - "north": {"uv": [2, 0, 4, 16], "texture": "#o"}, - "east": {"uv": [2, 0, 4, 16], "texture": "#o"}, - "south": {"uv": [5, 0, 7, 16], "texture": "#o"}, - "west": {"uv": [8, 0, 11, 16], "texture": "#o"}, - "up": {"uv": [11, 9, 13, 12], "texture": "#o"}, - "down": {"uv": [13, 9, 15, 12], "texture": "#o"} - } - }, - { - "from": [12, 0, 14.5], - "to": [13.25, 16, 16], - "faces": { - "north": {"uv": [1, 0, 3, 16], "texture": "#o"}, - "east": {"uv": [5, 0, 7, 16], "texture": "#o"}, - "south": {"uv": [13, 0, 15, 16], "texture": "#o"}, - "west": {"uv": [1, 0, 3, 16], "texture": "#o"}, - "up": {"uv": [6, 6, 8, 9], "texture": "#o"}, - "down": {"uv": [8, 5, 10, 8], "texture": "#o"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_model.json deleted file mode 100644 index 064dcc4..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_model.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "side": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "particle": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "top": "engineersdecor:block/pole/treated_wood_pole_top_texture" - }, - "elements": [ - { - "from": [5.75, 5.75, 0], - "to": [10.25, 10.25, 16], - "faces": { - "north": {"uv": [5.25, 5.25, 10.75, 10.75], "texture": "#top", "cullface": "north"}, - "south": {"uv": [5.25, 5.25, 10.75, 10.75], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [5.75, 10.25, 0], - "to": [10.25, 10.5, 16], - "faces": { - "north": {"uv": [5.25, 10.75, 10.75, 11], "texture": "#top", "cullface": "north"}, - "east": {"uv": [10.75, 0, 11, 16], "rotation": 90, "texture": "#side"}, - "south": {"uv": [5.25, 5, 10.75, 5.25], "texture": "#top", "cullface": "south"}, - "west": {"uv": [5, 0, 5.25, 16], "rotation": 90, "texture": "#side"}, - "up": {"uv": [5.25, 0, 10.75, 16], "texture": "#side"} - } - }, - { - "from": [5.75, 5.5, 0], - "to": [10.25, 5.75, 16], - "faces": { - "north": {"uv": [5.25, 5, 10.75, 5.25], "texture": "#top", "cullface": "north"}, - "east": {"uv": [5, 0, 5.25, 16], "rotation": 90, "texture": "#side"}, - "south": {"uv": [5.25, 10.75, 10.75, 11], "texture": "#top", "cullface": "south"}, - "west": {"uv": [10.75, 0, 11, 16], "rotation": 90, "texture": "#side"}, - "down": {"uv": [5.25, 0, 10.75, 16], "rotation": 180, "texture": "#side"} - } - }, - { - "from": [10.25, 5.75, 0], - "to": [10.5, 10.25, 16], - "faces": { - "north": {"uv": [10.75, 5.25, 11, 10.75], "texture": "#top", "cullface": "north"}, - "east": {"uv": [5.25, 0, 10.75, 16], "rotation": 90, "texture": "#side"}, - "south": {"uv": [10.75, 5.25, 11, 10.75], "texture": "#top", "cullface": "south"}, - "up": {"uv": [5, 0, 5.25, 16], "texture": "#side"}, - "down": {"uv": [10.75, 0, 11, 16], "rotation": 180, "texture": "#side"} - } - }, - { - "from": [5.5, 5.75, 0], - "to": [5.75, 10.25, 16], - "faces": { - "north": {"uv": [5, 5.25, 5.25, 10.75], "texture": "#top", "cullface": "north"}, - "south": {"uv": [5, 5.25, 5.25, 10.75], "texture": "#top", "cullface": "south"}, - "west": {"uv": [5.25, 0, 10.75, 16], "rotation": 90, "texture": "#side"}, - "up": {"uv": [10.75, 0, 11, 16], "texture": "#side"}, - "down": {"uv": [5, 0, 5.25, 16], "rotation": 180, "texture": "#side"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_up_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_up_model.json deleted file mode 100644 index 9b919eb..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/pole/straight_pole_up_model.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/cube", - "textures": { - "side": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "particle": "engineersdecor:block/pole/treated_wood_pole_side_texture", - "top": "engineersdecor:block/pole/treated_wood_pole_top_texture" - }, - "elements": [ - { - "from": [5.75, 0, 5.75], - "to": [10.25, 16, 10.25], - "faces": { - "up": {"uv": [5.25, 5.25, 10.75, 10.75], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [5.25, 5.25, 10.75, 10.75], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [5.75, 0, 10.25], - "to": [10.25, 16, 10.5], - "faces": { - "east": {"uv": [10.75, 0, 11, 16], "texture": "#side"}, - "south": {"uv": [5.25, 0, 10.75, 16], "texture": "#side"}, - "west": {"uv": [5, 0, 5.25, 16], "rotation": 180, "texture": "#side"}, - "up": {"uv": [5.25, 10.75, 10.75, 11], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [5.25, 5, 10.75, 5.25], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [5.75, 0, 5.5], - "to": [10.25, 16, 5.75], - "faces": { - "north": {"uv": [5.25, 0, 10.75, 16], "texture": "#side"}, - "east": {"uv": [5, 0, 5.25, 16], "texture": "#side"}, - "west": {"uv": [10.75, 0, 11, 16], "rotation": 180, "texture": "#side"}, - "up": {"uv": [5.25, 5, 10.75, 5.25], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [5.25, 10.75, 10.75, 11], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [10.25, 0, 5.75], - "to": [10.5, 16, 10.25], - "faces": { - "north": {"uv": [10.75, 0, 11, 16], "texture": "#side"}, - "east": {"uv": [5.25, 0, 10.75, 16], "texture": "#side"}, - "south": {"uv": [5, 0, 5.25, 16], "texture": "#side"}, - "up": {"uv": [10.75, 5.25, 11, 10.75], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [10.75, 5.25, 11, 10.75], "texture": "#top", "cullface": "south"} - } - }, - { - "from": [5.5, 0, 5.75], - "to": [5.75, 16, 10.25], - "faces": { - "north": {"uv": [5, 0, 5.25, 16], "texture": "#side"}, - "south": {"uv": [10.75, 0, 11, 16], "texture": "#side"}, - "west": {"uv": [5.25, 0, 10.75, 16], "rotation": 180, "texture": "#side"}, - "up": {"uv": [5, 5.25, 5.25, 10.75], "rotation": 180, "texture": "#top", "cullface": "north"}, - "down": {"uv": [5, 5.25, 5.25, 10.75], "texture": "#top", "cullface": "south"} - } - } - ], - "display": { - "ground": { - "scale": [0.2, 0.2, 0.2] - }, - "gui": { - "rotation": [30, 225, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_full_block_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_full_block_model.json deleted file mode 100644 index 7fa7672..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_full_block_model.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parent": "block/cube_all", - "textures": { "all": "engineersdecor:block/clinker_brick/clinker_brick_texture0" } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_inner_roof_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_inner_roof_model.json deleted file mode 100644 index 9e964fd..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_inner_roof_model.json +++ /dev/null @@ -1,163 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "textures": { - "side": "engineersdecor:block/iestyle/ironsheet_roof", - "particle": "engineersdecor:block/iestyle/ironsheet_roof", - "top": "engineersdecor:block/iestyle/ironsheet_roof_top" - }, - "elements": [ - { - "from": [6, 0, 0], - "to": [8, 8, 8], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [14, 0, 0], - "to": [16, 16, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top", "cullface": "up"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 14], - "to": [14, 16, 16], - "faces": { - "north": {"texture": "#top"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"rotation": 270, "texture": "#top", "cullface": "up"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [10, 0, 0], - "to": [12, 12, 12], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 10], - "to": [10, 12, 12], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"rotation": 90, "texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 6], - "to": [6, 8, 8], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 0], - "to": [2, 2, 2], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [12, 0, 0], - "to": [14, 14, 14], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 12], - "to": [12, 14, 14], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"rotation": 270, "texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [8, 0, 0], - "to": [10, 10, 10], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 8], - "to": [8, 10, 10], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"rotation": 90, "texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [4, 0, 0], - "to": [6, 6, 4], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 4], - "to": [6, 6, 6], - "faces": { - "north": {"texture": "#side"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [0, 0, 2], - "to": [4, 4, 4], - "faces": { - "north": {"texture": "#top"}, - "west": {"texture": "#side", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [2, 0, 0], - "to": [4, 4, 2], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_outer_roof_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_outer_roof_model.json deleted file mode 100644 index 492bb6f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_outer_roof_model.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "textures": { - "particle": "engineersdecor:block/iestyle/ironsheet_roof", - "side": "engineersdecor:block/iestyle/ironsheet_roof", - "top": "engineersdecor:block/iestyle/ironsheet_roof_top" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"texture": "#top", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [2, 2, 2], - "to": [16, 4, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [4, 4, 4], - "to": [16, 6, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [6, 6, 6], - "to": [16, 8, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [8, 8, 8], - "to": [16, 10, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [10, 10, 10], - "to": [16, 12, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [12, 12, 12], - "to": [16, 14, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [14, 14, 14], - "to": [16, 16, 16], - "faces": { - "north": {"texture": "#top"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_straight_roof_model.json b/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_straight_roof_model.json deleted file mode 100644 index 5013b30..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/roof/decor_straight_roof_model.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/block", - "textures": { - "side": "engineersdecor:block/iestyle/ironsheet_roof", - "particle": "engineersdecor:block/iestyle/ironsheet_roof", - "top": "engineersdecor:block/iestyle/ironsheet_roof_top" - }, - "elements": [ - { - "from": [2, 2, 0], - "to": [16, 4, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [14, 14, 0], - "to": [16, 16, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top", "cullface": "up"} - } - }, - { - "from": [0, 0, 0], - "to": [16, 2, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top", "cullface": "west"}, - "up": {"texture": "#top"}, - "down": {"texture": "#side", "cullface": "down"} - } - }, - { - "from": [4, 4, 0], - "to": [16, 6, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [6, 6, 0], - "to": [16, 8, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [12, 12, 0], - "to": [16, 14, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [10, 10, 0], - "to": [16, 12, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - }, - { - "from": [8, 8, 0], - "to": [16, 10, 16], - "faces": { - "north": {"texture": "#side", "cullface": "north"}, - "east": {"texture": "#side", "cullface": "east"}, - "south": {"texture": "#side", "cullface": "south"}, - "west": {"texture": "#top"}, - "up": {"texture": "#top"} - } - } - ], - "display": { - "thirdperson_lefthand": { - "rotation": [75, -135, 0], - "translation": [0, 2.5, 0], - "scale": [0.375, 0.375, 0.375] - }, - "gui": { - "rotation": [30, 135, 0], - "scale": [0.625, 0.625, 0.625] - }, - "head": { - "rotation": [0, -90, 0] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_default.json b/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_default.json deleted file mode 100644 index 32b23df..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_default.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - }, - "elements": [{ - "from": [7.9, 7.9, 7.9], "to": [8, 8, 8], "faces": { "down": {"texture": "#wall"} } - }] -} diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_inventory.json b/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_inventory.json deleted file mode 100644 index 25b37f6..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_inventory.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "parent": "block/block", - "ambientocclusion": false, - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - }, - "elements": [ - { - "name": "Center post", - "from": [4, 0, 4], - "to": [12, 16, 12], - "faces": { - "north": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "east": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "south": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "west": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "up": {"uv": [4, 4, 12, 12], "texture": "#wall"}, - "down": {"uv": [4, 4, 12, 12], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [5, 0, 12], - "to": [11, 16, 16], - "faces": { - "north": {"uv": [5, 1, 11, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 1, 4, 16], "texture": "#wall"}, - "south": {"uv": [5, 1, 11, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 1, 16, 16], "texture": "#wall"}, - "up": {"uv": [5, 12, 11, 16], "texture": "#wall"}, - "down": {"uv": [5, 0, 11, 4], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [11, 0, 12], - "to": [12, 1, 16], - "faces": { - "north": {"uv": [4, 15, 5, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 15, 4, 16], "texture": "#wall"}, - "south": {"uv": [11, 15, 12, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 15, 16, 16], "texture": "#wall"}, - "up": {"uv": [11, 12, 12, 16], "texture": "#wall"}, - "down": {"uv": [11, 0, 12, 4], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [5, 0, 0], - "to": [11, 16, 4], - "faces": { - "north": {"uv": [5, 1, 11, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 1, 16, 16], "texture": "#wall"}, - "south": {"uv": [5, 1, 11, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 1, 4, 16], "texture": "#wall"}, - "up": {"uv": [5, 0, 11, 4], "texture": "#wall"}, - "down": {"uv": [5, 12, 11, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [11, 0, 0], - "to": [12, 1, 4], - "faces": { - "north": {"uv": [4, 15, 5, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 15, 16, 16], "texture": "#wall"}, - "south": {"uv": [11, 15, 12, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 15, 4, 16], "texture": "#wall"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#wall"}, - "down": {"uv": [11, 12, 12, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [11, 14, 12], - "to": [12, 16, 16], - "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 0, 4, 2], "texture": "#wall"}, - "south": {"uv": [11, 0, 12, 2], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 0, 16, 2], "texture": "#wall"}, - "up": {"uv": [11, 12, 12, 16], "texture": "#wall"}, - "down": {"uv": [11, 0, 12, 4], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [11, 14, 0], - "to": [12, 16, 4], - "faces": { - "north": {"uv": [4, 0, 5, 2], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 0, 16, 2], "texture": "#wall"}, - "south": {"uv": [11, 0, 12, 2], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 0, 4, 2], "texture": "#wall"}, - "up": {"uv": [11, 0, 12, 4], "texture": "#wall"}, - "down": {"uv": [11, 12, 12, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [4, 0, 12], - "to": [5, 1, 16], - "faces": { - "north": {"uv": [11, 15, 12, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 15, 4, 16], "texture": "#wall"}, - "south": {"uv": [4, 15, 5, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 15, 16, 16], "texture": "#wall"}, - "up": {"uv": [4, 12, 5, 16], "texture": "#wall"}, - "down": {"uv": [4, 0, 5, 4], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [4, 0, 0], - "to": [5, 1, 4], - "faces": { - "north": {"uv": [11, 15, 12, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 15, 16, 16], "texture": "#wall"}, - "south": {"uv": [4, 15, 5, 16], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 15, 4, 16], "texture": "#wall"}, - "up": {"uv": [4, 0, 5, 4], "texture": "#wall"}, - "down": {"uv": [4, 12, 5, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [4, 14, 0], - "to": [5, 16, 4], - "faces": { - "north": {"uv": [11, 0, 12, 2], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [12, 0, 16, 2], "texture": "#wall"}, - "south": {"uv": [4, 0, 5, 2], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [0, 0, 4, 2], "texture": "#wall"}, - "up": {"uv": [4, 0, 5, 4], "texture": "#wall"}, - "down": {"uv": [4, 12, 5, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "Full wall", - "from": [4, 14, 12], - "to": [5, 16, 16], - "faces": { - "north": {"uv": [11, 0, 12, 2], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [0, 0, 4, 2], "texture": "#wall"}, - "south": {"uv": [4, 0, 5, 2], "texture": "#wall", "cullface": "south"}, - "west": {"uv": [12, 0, 16, 2], "texture": "#wall"}, - "up": {"uv": [4, 12, 5, 16], "texture": "#wall"}, - "down": {"uv": [4, 0, 5, 4], "texture": "#wall", "cullface": "down"} - } - } - ], - "display": { - "gui": { - "rotation": [30, 135, 0], - "scale": [0.625, 0.625, 0.625] - }, - "fixed": { - "rotation": [0, 90, 0], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json b/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json deleted file mode 100644 index 3012ac0..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_post.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - }, - "elements": [ - { - "name": "Center post", - "from": [4, 0, 4], - "to": [12, 16, 12], - "faces": { - "north": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "east": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "south": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "west": {"uv": [4, 0, 12, 16], "texture": "#wall"}, - "up": {"uv": [4, 4, 12, 12], "texture": "#wall", "cullface": "up"}, - "down": {"uv": [4, 4, 12, 12], "texture": "#wall", "cullface": "down"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json b/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json deleted file mode 100644 index c39c2e1..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/block/wall/concrete_wall_side.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "credit": "I made this with the Blockbench", - "textures": { - "wall": "engineersdecor:block/concrete/rebar_concrete_texture0", - "particle": "engineersdecor:block/concrete/rebar_concrete_texture0" - }, - "elements": [ - { - "name": "wall", - "from": [5, 0, 0], - "to": [11, 16, 8], - "faces": { - "north": {"uv": [5, 0, 11, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [8, 0, 16, 16], "texture": "#wall"}, - "west": {"uv": [0, 0, 8, 16], "texture": "#wall"}, - "up": {"uv": [5, 0, 11, 8], "texture": "#wall"}, - "down": {"uv": [5, 8, 11, 16], "texture": "#wall"} - } - }, - { - "name": "wall", - "from": [11, 14, 0], - "to": [11.875, 16, 8], - "faces": { - "north": {"uv": [4.25, 0, 5, 1.875], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [8, 0, 16, 1.875], "texture": "#wall"}, - "up": {"uv": [11, 0, 11.75, 8], "texture": "#wall"}, - "down": {"uv": [11, 8, 11.75, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "wall", - "from": [11, 0, 0], - "to": [11.875, 1, 8], - "faces": { - "north": {"uv": [4.125, 15, 5, 16], "texture": "#wall", "cullface": "north"}, - "east": {"uv": [8, 15, 16, 16], "texture": "#wall"}, - "up": {"uv": [11, 0, 11.875, 8], "texture": "#wall"}, - "down": {"uv": [11, 8, 11.875, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "wall", - "from": [4.125, 14, 0], - "to": [5, 16, 8], - "faces": { - "north": {"uv": [11, 0, 11.75, 1.875], "texture": "#wall", "cullface": "north"}, - "west": {"uv": [0, 0, 8, 1.875], "texture": "#wall"}, - "up": {"uv": [4.25, 0, 5, 8], "texture": "#wall"}, - "down": {"uv": [4.25, 8, 5, 16], "texture": "#wall", "cullface": "down"} - } - }, - { - "name": "wall", - "from": [4.125, 0, 0], - "to": [5, 1, 8], - "faces": { - "north": {"uv": [10.875, 15, 11.75, 16], "texture": "#wall", "cullface": "north"}, - "west": {"uv": [0, 15, 8, 16], "texture": "#wall"}, - "up": {"uv": [4.25, 0, 5.125, 8], "texture": "#wall"}, - "down": {"uv": [4.25, 8, 5.125, 16], "texture": "#wall", "cullface": "down"} - } - } - ] -} \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_block.json b/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_block.json deleted file mode 100644 index 62cf8c5..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_block.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/brick/clinker_brick_model0" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_stairs.json deleted file mode 100644 index 8e07eed..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/clinker_brick_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/brick/clinker_brick_stairs" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/concrete_wall.json b/1.13/src/main/resources/assets/engineersdecor/models/item/concrete_wall.json deleted file mode 100644 index 32b7819..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/concrete_wall.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/concrete/concrete_wall_inventory" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_ladder.json b/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_ladder.json deleted file mode 100644 index 330536f..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_ladder.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/ladder/metal_rung_ladder_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_steps.json b/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_steps.json deleted file mode 100644 index e951242..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/metal_rung_steps.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/ladder/metal_rung_steps_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete.json b/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete.json deleted file mode 100644 index dbd6702..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/concrete/rebar_concrete_model0" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_stairs.json deleted file mode 100644 index dd9a672..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/concrete/rebar_concrete_stairs" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_wall.json b/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_wall.json deleted file mode 100644 index 61ad001..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/rebar_concrete_wall.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/concrete/rebar_concrete_wall_inventory" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_block.json b/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_block.json deleted file mode 100644 index 3095b6c..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_block.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/brick/slag_brick_model0" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_stairs.json b/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_stairs.json deleted file mode 100644 index efc9526..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/slag_brick_stairs.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/brick/slag_brick_stairs" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_ladder.json b/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_ladder.json deleted file mode 100644 index b707210..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_ladder.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/ladder/treated_wood_ladder_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_pole.json b/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_pole.json deleted file mode 100644 index 492d632..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_pole.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/pole/straight_pole_up_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_table.json b/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_table.json deleted file mode 100644 index e294add..0000000 --- a/1.13/src/main/resources/assets/engineersdecor/models/item/treated_wood_table.json +++ /dev/null @@ -1 +0,0 @@ -{ "parent": "engineersdecor:block/furniture/treated_wood_table_model" } \ No newline at end of file diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture0.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture0.png deleted file mode 100644 index 5a06481..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture0.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture1.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture1.png deleted file mode 100644 index 1d536e6..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture1.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture2.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture2.png deleted file mode 100644 index 04b7f03..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture2.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture3.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture3.png deleted file mode 100644 index cb6f0f7..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture3.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture4.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture4.png deleted file mode 100644 index 77541ae..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture4.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture5.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture5.png deleted file mode 100644 index a73f43f..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture5.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture6.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture6.png deleted file mode 100644 index 6002fdf..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture6.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture7.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture7.png deleted file mode 100644 index 5b39955..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/clinker_brick/clinker_brick_texture7.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture0.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture0.png deleted file mode 100644 index c0157c1..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture0.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture1.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture1.png deleted file mode 100644 index 5645eab..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture1.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture2.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture2.png deleted file mode 100644 index f1a97db..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture2.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture3.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture3.png deleted file mode 100644 index 6e39b40..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture3.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture4.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture4.png deleted file mode 100644 index 8773119..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture4.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture5.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture5.png deleted file mode 100644 index c9aab19..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture5.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture6.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture6.png deleted file mode 100644 index 99e6367..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture6.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture7.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture7.png deleted file mode 100644 index 8ee5d60..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/concrete/rebar_concrete_texture7.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/ieoriginal/ie_stone_decoration_concrete.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/ieoriginal/ie_stone_decoration_concrete.png deleted file mode 100644 index b19d0ef..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/ieoriginal/ie_stone_decoration_concrete.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof.png deleted file mode 100644 index 23dff87..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof_top.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof_top.png deleted file mode 100644 index a5f0382..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/ironsheet_roof_top.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/steel_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/steel_texture.png deleted file mode 100644 index 9584364..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/steel_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood.png deleted file mode 100644 index a1d0537..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_nailed_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_nailed_texture.png deleted file mode 100644 index 6c7a9c6..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_nailed_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_texture.png deleted file mode 100644 index 3ce7527..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_framed_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_pole_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_pole_texture.png deleted file mode 100644 index 8c50fc8..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_pole_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_rough_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_rough_texture.png deleted file mode 100644 index fccfc82..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/iestyle/treated_wood_rough_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_side_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_side_texture.png deleted file mode 100644 index 533f852..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_side_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_top_texture.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_top_texture.png deleted file mode 100644 index 4605187..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/pole/treated_wood_pole_top_texture.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture0.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture0.png deleted file mode 100644 index 8378625..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture0.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture1.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture1.png deleted file mode 100644 index 1e56869..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture1.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture2.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture2.png deleted file mode 100644 index 8832f88..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture2.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture3.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture3.png deleted file mode 100644 index d1edf88..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture3.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture4.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture4.png deleted file mode 100644 index dea4b97..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture4.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture5.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture5.png deleted file mode 100644 index baa5672..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture5.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture6.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture6.png deleted file mode 100644 index 6895552..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture6.png and /dev/null differ diff --git a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture7.png b/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture7.png deleted file mode 100644 index 966aee4..0000000 Binary files a/1.13/src/main/resources/assets/engineersdecor/textures/block/slag_brick/slag_brick_texture7.png and /dev/null differ diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/_constants.json b/1.13/src/main/resources/data/engineersdecor/recipes/_constants.json deleted file mode 100644 index 3099a1d..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/_constants.json +++ /dev/null @@ -1,89 +0,0 @@ -[ - { - "items": [ - { "item": "minecraft:brick" }, - { "item": "minecraft:nether_brick" } - ], - "name": "engineersdecor:any_brick_ingot" - }, - { - "items": [ - { "item": "minecraft:bricks" }, - { "item": "minecraft:nether_bricks" } - ], - "name": "engineersdecor:any_brick_block" - }, - { - "items": [ - { "item": "minecraft:black_concrete_powder" }, - { "item": "minecraft:blue_concrete_powder" }, - { "item": "minecraft:brown_concrete_powder" }, - { "item": "minecraft:cyan_concrete_powder" }, - { "item": "minecraft:gray_concrete_powder" }, - { "item": "minecraft:green_concrete_powder" }, - { "item": "minecraft:light_blue_concrete_powder" }, - { "item": "minecraft:light_gray_concrete_powder" }, - { "item": "minecraft:lime_concrete_powder" }, - { "item": "minecraft:magenta_concrete_powder" }, - { "item": "minecraft:orange_concrete_powder" }, - { "item": "minecraft:pink_concrete_powder" }, - { "item": "minecraft:purple_concrete_powder" }, - { "item": "minecraft:red_concrete_powder" }, - { "item": "minecraft:white_concrete_powder" }, - { "item": "minecraft:yellow_concrete_powder" }, - { "item": "minecraft:black_concrete" }, - { "item": "minecraft:blue_concrete" }, - { "item": "minecraft:brown_concrete" }, - { "item": "minecraft:cyan_concrete" }, - { "item": "minecraft:gray_concrete" }, - { "item": "minecraft:green_concrete" }, - { "item": "minecraft:light_blue_concrete" }, - { "item": "minecraft:light_gray_concrete" }, - { "item": "minecraft:lime_concrete" }, - { "item": "minecraft:magenta_concrete" }, - { "item": "minecraft:orange_concrete" }, - { "item": "minecraft:pink_concrete" }, - { "item": "minecraft:purple_concrete" }, - { "item": "minecraft:red_concrete" }, - { "item": "minecraft:white_concrete" }, - { "item": "minecraft:yellow_concrete" } - ], - "name": "engineersdecor:concrete" - }, - { - "items": [ - { "item": "minecraft:bone_meal" } - ], - "name": "engineersdecor:any_slag" - }, - { - "items": [ - { "item": "minecraft:iron_nugget" } - ], - "name": "engineersdecor:any_ferro_metal_stick" - }, - { - "items": [ - { "item": "minecraft:iron_nugget" } - ], - "name": "engineersdecor:steel_stick" - }, - { - "items": [ - { "item": "minecraft:stick" } - ], - "name": "engineersdecor:treated_wood_stick" - }, - { - "items": [ - { "item": "minecraft:dark_oak_planks" } - ], - "name": "engineersdecor:treated_wood_planks" - }, - { - "items": [ - { "item": "minecraft:dark_oak_slab" } - ], - "name": "engineersdecor:treated_wood_slab" - } -] \ No newline at end of file diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_recipe.json deleted file mode 100644 index 25f383d..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_recipe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_block" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "BBB", - "BNB", - "BBB" - ], - "key": { - "B": { "constant": "engineersdecor:any_brick_ingot" }, - "N": { "constant": "engineersdecor:any_brick_block" } - }, - "result": { - "item": "engineersdecor:clinker_brick_block", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe.json deleted file mode 100644 index a4cea28..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "C ", - "CC ", - "CCC" - ], - "key": { - "C": { - "item": "engineersdecor:clinker_brick_block" - } - }, - "result": { - "item": "engineersdecor:clinker_brick_stairs", - "count": 9 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json b/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json deleted file mode 100644 index 7cd85bc..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/clinker_brick_stairs_recipe_decompose.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:clinker_brick_block" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "SS", - "SS" - ], - "key": { - "S": { - "item": "engineersdecor:clinker_brick_stairs" - } - }, - "result": { - "item": "engineersdecor:clinker_brick_block", - "count": 3 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_ladder_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_ladder_recipe.json deleted file mode 100644 index 1e457b2..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_ladder_recipe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:metal_rung_ladder", - "later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "S S", - "SSS", - " " - ], - "key": { - "S": { "constant": "engineersdecor:any_ferro_metal_stick" } - }, - "result": { - "item": "engineersdecor:metal_rung_ladder", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_steps_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_steps_recipe.json deleted file mode 100644 index 44abd9f..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/metal_rung_steps_recipe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:metal_rung_steps", -"later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " SS", - "SS ", - " SS" - ], - "key": { - "S": { "constant": "engineersdecor:any_ferro_metal_stick" } - }, - "result": { - "item": "engineersdecor:metal_rung_steps", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_recipe.json deleted file mode 100644 index 8b61f31..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_recipe.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "SCS", - "CSC", - "SCS" - ], - "key": { - "C": { "constant": "engineersdecor:concrete" }, - "S": { "constant": "engineersdecor:steel_stick" } - }, - "result": { - "item": "engineersdecor:rebar_concrete", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_stairs_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_stairs_recipe.json deleted file mode 100644 index 1b05f55..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_stairs_recipe.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "C ", - "CC ", - "CCC" - ], - "key": { - "C": { "item": "engineersdecor:rebar_concrete" } - }, - "result": { - "item": "engineersdecor:rebar_concrete_stairs", - "count": 9 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_wall_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_wall_recipe.json deleted file mode 100644 index 9afdf8d..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/rebar_concrete_wall_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:rebar_concrete_wall" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " ", - "CCC", - "CCC" - ], - "key": { - "C": { - "item": "engineersdecor:rebar_concrete" - } - }, - "result": { - "item": "engineersdecor:rebar_concrete_wall", - "count": 6 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_recipe_with_slag.json b/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_recipe_with_slag.json deleted file mode 100644 index 9f07a06..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_recipe_with_slag.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_block" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "BBB", - "BSB", - "BBB" - ], - "key": { - "B": { "constant": "engineersdecor:any_brick_ingot" }, - "S": { "constant": "engineersdecor:any_slag" } - }, - "result": { - "item": "engineersdecor:slag_brick_block", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_stairs_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_stairs_recipe.json deleted file mode 100644 index 20adf39..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/slag_brick_stairs_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:slag_brick_stairs" - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "C ", - "CC ", - "CCC" - ], - "key": { - "C": { - "item": "engineersdecor:slag_brick_block" - } - }, - "result": { - "item": "engineersdecor:slag_brick_stairs", - "count": 9 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_ladder_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_ladder_recipe.json deleted file mode 100644 index 8db74e1..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_ladder_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_ladder", -"later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "S#S", - "SSS", - "S#S" - ], - "key": { - "S": { "constant": "engineersdecor:treated_wood_stick" }, - "#": { "item": "minecraft:bone_meal" } - }, - "result": { - "item": "engineersdecor:treated_wood_ladder", - "count": 4 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_pole_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_pole_recipe.json deleted file mode 100644 index 8d16ec3..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_pole_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_pole", -"later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - " S ", - " W ", - " W " - ], - "key": { - "W": { "constant": "engineersdecor:treated_wood_planks" }, - "S": { "constant": "engineersdecor:treated_wood_slab" } - }, - "result": { - "item": "engineersdecor:treated_wood_pole", - "count": 6 - } -} diff --git a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_table_recipe.json b/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_table_recipe.json deleted file mode 100644 index d366991..0000000 --- a/1.13/src/main/resources/data/engineersdecor/recipes/treated_wood_table_recipe.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "conditions": [ - { - "type": "engineersdecor:grc", - "result": "engineersdecor:treated_wood_table", -"later_required": ["immersiveengineering:material"] - } - ], - "type": "minecraft:crafting_shaped", - "pattern": [ - "WWW", - "S S", - "S S" - ], - "key": { - "W": { "constant": "engineersdecor:treated_wood_slab" }, - "S": { "item": "engineersdecor:treated_wood_pole" } - }, - "result": { - "item": "engineersdecor:treated_wood_table", - "count": 1 - } -} diff --git a/1.13/src/main/resources/pack.mcmeta b/1.13/src/main/resources/pack.mcmeta deleted file mode 100644 index f642e0f..0000000 --- a/1.13/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "pack": { - "description": "engineersdecor resources", - "pack_format": 4, - "_comment": "A pack_format of 4 requires json lang files. Note: we require v4 pack meta for all mods." - } -} diff --git a/1.13/tasks.js b/1.13/tasks.js deleted file mode 100644 index 69e1a44..0000000 --- a/1.13/tasks.js +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/djs -// Note for reviewers/clones: This file is a auxiliary script for my setup. It's not needed to build the mod. -"use strict"; -const constants = include("../meta/lib/constants.js")(); -const libtask = include("../meta/lib/libtask.js")(constants); -const liblang = include("../meta/lib/liblang.1.13.js")(constants); -var tasks = {}; - -tasks["sync-languages"] = function() { - liblang.sync_languages(); -}; - -libtask.run(tasks, sys.args); diff --git a/1.14/build.gradle b/1.14/build.gradle index ee605f1..0f376da 100644 --- a/1.14/build.gradle +++ b/1.14/build.gradle @@ -1,5 +1,5 @@ // @file build.gradle -// Engineer's decor mod gradle build relay (mc1.13.2) +// Engineer's decor mod gradle build relay (mc1.14.4) buildscript { repositories { maven { url = 'https://files.minecraftforge.net/maven' } diff --git a/1.14/gradle.properties b/1.14/gradle.properties index cc146c6..6465a80 100644 --- a/1.14/gradle.properties +++ b/1.14/gradle.properties @@ -5,7 +5,7 @@ version_minecraft=1.14.4 version_forge_minecraft=1.14.4-28.0.40 version_fml_mappings=20190719-1.14.3 version_jei=1.14.3:6.0.0.8 -version_engineersdecor=1.0.11-b1 +version_engineersdecor=1.0.11-b2 # # jar signing data loaded from signing.properties in the project root. # diff --git a/1.14/readme.md b/1.14/readme.md index cd7131f..b652592 100644 --- a/1.14/readme.md +++ b/1.14/readme.md @@ -10,6 +10,8 @@ Mod sources for Minecraft version 1.14.3. ---- ## Version history + ~ v1.0.11-b2 + - v1.0.11-b1 [A] Added Steel Table [A] Added Treated Wood Side Table [A] Added Exit Sign diff --git a/Makefile b/Makefile index dbbd626..c887f15 100644 --- a/Makefile +++ b/Makefile @@ -14,17 +14,14 @@ dist: default clean: -@cd 1.12; make -s clean - -@cd 1.13; make -s clean -@cd 1.14; make -s clean clean-all: -@cd 1.12; make -s clean-all - -@cd 1.13; make -s clean-all -@cd 1.14; make -s clean-all mrproper: -@cd 1.12; make -s mrproper - -@cd 1.13; make -s mrproper -@cd 1.14; make -s mrproper update-json: @@ -33,7 +30,6 @@ update-json: sanatize: @cd 1.12; make -s sanatize - @cd 1.13; make -s sanatize @cd 1.14; make -s sanatize @make -s update-json diff --git a/meta/update.json b/meta/update.json index f1c7c88..11c0237 100644 --- a/meta/update.json +++ b/meta/update.json @@ -3,8 +3,6 @@ "promos": { "1.12.2-recommended": "1.0.10", "1.12.2-latest": "1.0.11-b1", - "1.13.2-recommended": "", - "1.13.2-latest": "1.0.7-b5", "1.14.4-recommended": "", "1.14.4-latest": "1.0.11-b1" }, @@ -58,21 +56,6 @@ "1.0.0-b2": "[A] Added rebar concrete (steel reinforced, expensive, creeper-proof).", "1.0.0-b1": "[A] Initial structure.\n[A] Added clinker bricks and clinker brick stairs.\n[A] Added slag bricks and slag brick stairs.\n[A] Added metal rung ladder.\n[A] Added staggered metal steps ladder.\n[A] Added treated wood ladder.\n[A] Added treated wood pole.\n[A] Added treated wood table." }, - "1.13.2": { - "1.0.7-b5": "[A] Added translation zh_cn (PR#33, XuyuEre)\n[M] Updated textures.\n[M] Updated 1st/3rd person item model rotations/translations.", - "1.0.7-b4": "[A] Added stained clinker brick block/stairs.", - "1.0.7-b3": "[V] Version assignment: All features of v1.0.7-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-assigned.\n[A] Added \"Factory Area\" sign.\n[M] Sign background colors adapted.\n[M] EN lang file updated (PR#28, Voxelo).", - "1.0.4-b6": "[A] Added Small Electrical Furnace.\n[A] Added Small Waste Incinerator.\n[A] Experimental: Added fluid check valve.\n[A] Experimental: Added fluid redstone controlled valve.\n[A] Experimental: Added fluid redstone analog valve.\n[A] Experimental: Added passive fluid accumulator.", - "1.0.4-b5": "[A] Added Factory Dropper.\n[A] Added \"Caution Defense System Ahead\" sign.", - "1.0.4-b4": "[U] Updated forge dependency: REQUIRES FORGE >= 1.13.2-25.0.214.\n[A] Added sign \"Electrical hazard\"/\"Caution hot wire\".\n[A] Added sign \"Caution dangerous there\" (skull/bones).\n[A] Added horizontal steel double-T support beam with pole connections.", - "1.0.4-b3": "[V] Version assignment: All features of v1.0.4-b3-1.12.2 that can be ported to 1.13.2 implemented/prepared, therefore version re-iterated.\n[A] Lab furnace ported to 1.13.\n[A] Treated wood crafting table: Added crafting table history/quick craft.\n[A] Treated wood stool: Sitting on the stool implemented.\n[A] Steel poles (thick/thin) with support heads/foots added.\n[E] Prepared position dependent texture variation for walls (clinker, slag, rebar concrete), missing one forge feature yet for completion.\n[E] Prepared multi-layer rendering for windows, needs forge feature implementation.", - "1.0.2-b3": "[A] Added treated wood window.\n[A] Added treated wood pole support.\n[A] Added treated wood pole head.\n[A] Added steel framed window.", - "1.0.2-b2": "[A] Added wall decomposition recipes.\n[A] Added slag brick wall.\n[M] Climbing/descending mod ladders is faster when looking up or down and not sneaking.\n[M] Panzer glass material definition changed.", - "1.0.2-b1": "[A] Added Treated wood crafting table.\n[A] Added decomposition recipes for stairs and tiles.\n[N] Note: All v1.0.2-b1-mc1.12.2 blocks are ported to 1.13.2 (alpha -^ beta version).\n[N] Note: Until IE is out for 1.13.2, the recipes are temporary with vanilla items.", - "1.0.0-a3": "[A] Added iron inset light.\n[A] Added rebar concrete tile.\n[A] Added rebar concrete tile stairs.\n[A] Added clinker brick wall.\n[A] Added treated wood stool.\n[A] Added treated window sill.", - "1.0.0-a2": "[A] Added panzer glass.", - "1.0.0-a1": "[A] Initial port to 1.13.2 with Forge beta." - }, "1.14.4": { "1.0.11-b1": "[A] Added Steel Table\n[A] Added Treated Wood Side Table\n[A] Added Exit Sign\n[A] Added Steel Floor Grating\n[M] Sign orientation fixed, only blocked vertical placement.", "1.0.9-b9": "[U] Update to Forge 1.14.4-28.0.40/20190719-1.14.3 for Forge testing.", diff --git a/readme.md b/readme.md index 308bc57..4e4ed35 100644 --- a/readme.md +++ b/readme.md @@ -175,8 +175,6 @@ commits. - [1.12](1.12/readme.md) - - [1.13](1.13/readme.md) - - [1.14](1.14/readme.md) ### Community references diff --git a/tasks.js b/tasks.js index 61a9911..a992372 100644 --- a/tasks.js +++ b/tasks.js @@ -5,7 +5,6 @@ const constants = include("meta/lib/constants.js")(); const libtask = include("meta/lib/libtask.js")(constants); const libassets = include("meta/lib/libassets.js")(constants); const modid = constants.mod_registry_name(); -const with_113 = false; var tasks = {}; tasks["update-json"] = function() { @@ -16,7 +15,6 @@ tasks["update-json"] = function() { }; var update_json_src = []; fs.find(root_dir + "/1.12/meta/", "update*.json", function(path){ update_json_src.push(JSON.parse(fs.readfile(path))); }); - fs.find(root_dir + "/1.13/meta/", "update*.json", function(path){ update_json_src.push(JSON.parse(fs.readfile(path))); }); fs.find(root_dir + "/1.14/meta/", "update*.json", function(path){ update_json_src.push(JSON.parse(fs.readfile(path))); }); for(var i in update_json_src) { const version_update_json = update_json_src[i]; @@ -58,7 +56,6 @@ tasks["sync-main-repository"] = function() { sys.shell("rm -rf documentation meta"); sys.shell("rm -f .gitignore credits.md license Makefile readme.md tasks.js"); cd_main("1.12"); sys.shell("rm -rf meta gradle src"); - cd_main("1.13"); sys.shell("rm -rf meta gradle"); cd_main("1.14"); sys.shell("rm -rf meta gradle src"); cd_dev(); sys.shell("cp -f .gitignore credits.md license Makefile readme.md tasks.js \"" + main_repo_local + "/\"") @@ -68,11 +65,6 @@ tasks["sync-main-repository"] = function() { sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js.* \"" + main_repo_local + "/1.12/\"") sys.shell("cp -r gradle meta src \"" + main_repo_local + "/1.12/\"") } - { - cd_dev("1.13"); - sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js \"" + main_repo_local + "/1.13/\"") - sys.shell("cp -r gradle meta \"" + main_repo_local + "/1.13/\"") - } { cd_dev("1.14"); sys.shell("cp -f .gitignore build.gradle gradle.properties gradlew gradlew.bat Makefile readme.md tasks.js \"" + main_repo_local + "/1.14/\"") @@ -120,7 +112,6 @@ tasks["compare-textures"] = function(args) { } } var ok = true; - if(with_113 && !compare("1.12", "1.13")) ok = false; if(!compare("1.12", "1.14")) ok = false; return ok; }; @@ -157,7 +148,6 @@ tasks["compare-blockstates"] = function(args) { } } var ok = true; - if(with_113 && !compare("1.12", "1.13")) ok = false; if(!compare("1.12", "1.14")) ok = false; return ok; };