summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance5057 <Lance5057@gmail.com>2017-11-30 21:49:33 -0600
committerLance5057 <Lance5057@gmail.com>2017-11-30 21:49:33 -0600
commitefae59792b30e4737636e8e62ac9b06240d3bc5d (patch)
treef768d00c11ecc82105dd6d3d086353753a4f3530
parent47f9237e0afce2fcb2c214b5debdeda331d2d9e1 (diff)
Icons are registering in a shotgun fashion, I have no idea why...
-rw-r--r--.classpath136
-rw-r--r--.project16
-rw-r--r--Tinkers-Defense_Client.launch2
-rw-r--r--Tinkers-Defense_Server.launch2
-rw-r--r--src/main/java/lance5057/tDefense/TinkersDefense.java1
-rw-r--r--src/main/java/lance5057/tDefense/core/items/TDOreDictItem.java40
-rw-r--r--src/main/java/lance5057/tDefense/core/materials/TDMaterials.java382
-rw-r--r--src/main/java/lance5057/tDefense/proxy/ClientProxy.java10
-rw-r--r--src/main/java/lance5057/tDefense/proxy/CommonProxy.java115
-rw-r--r--src/main/resources/assets/tinkersdefense/models/item/dust.json6
-rw-r--r--src/main/resources/assets/tinkersdefense/models/item/gem.json6
-rw-r--r--src/main/resources/assets/tinkersdefense/models/item/grain.json6
-rw-r--r--src/main/resources/assets/tinkersdefense/models/item/ingot.json6
-rw-r--r--src/main/resources/assets/tinkersdefense/models/item/nugget.json6
-rw-r--r--src/main/resources/assets/tinkersdefense/textures/items/dust.pngbin0 -> 303 bytes
-rw-r--r--src/main/resources/assets/tinkersdefense/textures/items/gem.pngbin0 -> 434 bytes
-rw-r--r--src/main/resources/assets/tinkersdefense/textures/items/grain.pngbin0 -> 370 bytes
-rw-r--r--src/main/resources/assets/tinkersdefense/textures/items/ingot.pngbin0 -> 372 bytes
-rw-r--r--src/main/resources/assets/tinkersdefense/textures/items/nugget.pngbin0 -> 270 bytes
19 files changed, 417 insertions, 317 deletions
diff --git a/.classpath b/.classpath
index 3ffaa88..178be88 100644
--- a/.classpath
+++ b/.classpath
@@ -4,71 +4,75 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/api/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/deobf/slimeknights/mantle/Mantle/1.12-1.3.1.22/Mantle-1.12-1.3.1.22.jar" sourcepath="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/deobf/slimeknights/mantle/Mantle/1.12-1.3.1.22/Mantle-1.12-1.3.1.22-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/deobf/slimeknights/TConstruct/1.12-2.7.4.39/TConstruct-1.12-2.7.4.39.jar" sourcepath="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/deobf/slimeknights/TConstruct/1.12-2.7.4.39/TConstruct-1.12-2.7.4.39-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/deobf/mezz/jei/jei_1.12/4.7.5.86/jei_1.12-4.7.5.86.jar" sourcepath="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/deobf/mezz/jei/jei_1.12/4.7.5.86/jei_1.12-4.7.5.86-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/deobf/com/github/Azanor/Baubles/master-SNAPSHOT/Baubles-master-SNAPSHOT.jar" sourcepath="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/deobf/com/github/Azanor/Baubles/master-SNAPSHOT/Baubles-master-SNAPSHOT-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.12-14.21.1.2443/snapshot/20170801/forgeSrc-1.12-14.21.1.2443.jar" sourcepath="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.12-14.21.1.2443/snapshot/20170801/forgeSrc-1.12-14.21.1.2443-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/f7be08ec23c21485b9b5a1cf1654c2ec8c58168d/jsr305-3.0.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/a2926c057ca3b662b9db194c869bdbe7d3bb8aef/jsr305-3.0.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.mojang/patchy/1.1/aef610b34a1be37fa851825f12372b78424d8903/patchy-1.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.mojang/patchy/1.1/5e398295fbcb8fb590e3e3bddace13f659792e50/patchy-1.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/oshi-project/oshi-core/1.1/9ddf7b048a8d701be231c0f4f95fd986198fd2d8/oshi-core-1.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/oshi-project/oshi-core/1.1/1ec1ab1e6ac5a1572edfd0dd9ac95e83684b8a65/oshi-core-1.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/4.4.0/cb208278274bf12ebdb56c61bd7407e6f774d65a/jna-4.4.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/4.4.0/9d45d3dc35711eef7267d8b4fc2c0dc482ef9fd2/jna-4.4.0-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/platform/3.4.0/e3f70017be8100d3d6923f50b3d2ee17714e9c13/platform-3.4.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/platform/3.4.0/2f42653596d0044f0ab456620cba54c9cf53c5ca/platform-3.4.0-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.ibm.icu/icu4j-core-mojang/51.2/63d216a9311cca6be337c1e458e587f99d382b84/icu4j-core-mojang-51.2.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.ibm.icu/icu4j-core-mojang/51.2/814397ccbafff1132758e551c37396c528d7f2d7/icu4j-core-mojang-51.2-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.sf.jopt-simple/jopt-simple/5.0.3/cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a/jopt-simple-5.0.3.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.sf.jopt-simple/jopt-simple/5.0.3/36d4348605fd4605d36c8641495f3e78756e454b/jopt-simple-5.0.3-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/io.netty/netty-all/4.1.9.Final/97860965d6a0a6b98e7f569f3f966727b8db75/netty-all-4.1.9.Final.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/io.netty/netty-all/4.1.9.Final/69b921f5e296428c88c2ea4418e630443a699b06/netty-all-4.1.9.Final-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/21.0/3a3d111be1be1b745edfa7d91678a12d7ed38709/guava-21.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/21.0/b9ed26b8c23fe7cd3e6b463b34e54e5c6d9536d5/guava-21.0-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.5/6c6c702c89bfff3cd9e80b04d668c5e190d588c6/commons-lang3-3.5.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.5/f7d878153e86a1cdddf6b37850e00a9f8bff726f/commons-lang3-3.5-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.5/2852e6e05fbb95076fc091f6d1780f1f8fe35e0f/commons-io-2.5.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.5/caf033a4a7c37b4a8ff3ea084cba591539b0b69/commons-io-2.5-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/4b95f4897fa13f2cd904aee711aeafc0c5295cd8/commons-codec-1.10.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/11fb3d88ae7e3b757d70237064210ceb954a5a04/commons-codec-1.10-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/e12fe1fda814bd348c1579329c86943d2cd3c6a6/jutils-1.0.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/d18678a00b216863206a1bb6190507e02a32971b/jutils-1.0.0-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/c4ba5371a29ac9b2ad6129b1d39ea38750043eff/gson-2.8.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/baf95d8519fc1a11d388f8543cb40cd2bb9d66dc/gson-2.8.0-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.25/9834cdf236c22e84b946bba989e2f94ef5897c3c/authlib-1.5.25.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.25/18840707f662a3236542716fff61c659584f3e6c/authlib-1.5.25-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.10.17/e6a623bf93a230b503b0e3ae18c196fcd5aa3299/realms-1.10.17.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/a698750c16740fd5b3871425f4cb3bbaa87f529d/commons-compress-1.8.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/3caea4421428752206c7a94c3e3097f0c47f1bb8/commons-compress-1.8.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/18f4247ff4572a074444572cee34647c43e7c9c7/httpclient-4.3.3.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/65cba03c4f6207f2885f88206fcf52c53f8d111b/httpclient-4.3.3-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f/commons-logging-1.1.3.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/28bb0405fddaf04f15058fbfbe01fe2780d7d3b6/commons-logging-1.1.3-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/31fbbff1ddbf98f3aa7377c94d33b0447c646b6e/httpcore-4.3.2.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/4809f38359edeea9487f747e09aa58ec8d3a54c5/httpcore-4.3.2-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/7.1.0/9835253257524c1be7ab50c057aa2d418fb72082/fastutil-7.1.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/7.1.0/4a33438326f2fea664656d63d655c349d4131e14/fastutil-7.1.0-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.8.1/e801d13612e22cad62a3f4f3fe7fdbe6334a8e72/log4j-api-2.8.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.8.1/a5edb6b8c77843c8be98e0cb1f875699e76ee122/log4j-api-2.8.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.8.1/4ac28ff2f1ddf05dae3043a190451e8c46b73c31/log4j-core-2.8.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.8.1/a0a7f683da620c345b502fff04d1e46cde2e8d9/log4j-core-2.8.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.mojang/text2speech/1.10.3/48fd510879dff266c3815947de66e3d4809f8668/text2speech-1.10.3.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.mojang/text2speech/1.10.3/404339fe43d1011ee046a249b0ec7ae9ce04a834/text2speech-1.10.3-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.12/111e7bea9c968cdb3d06ef4632bf7ff0824d0f36/launchwrapper-1.12.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.12/fd80cad9a1b967ce2ff20529dc54e520d5338d7/launchwrapper-1.12-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/jline/jline/2.13/2d9530d0a25daffaffda7c35037b046b627bb171/jline-2.13.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/jline/jline/2.13/e290282bf7683ae3307e85bdc5d5e08424dfb893/jline-2.13-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.2/3354e11e2b34215f06dab629ab88e06aca477c19/asm-debug-all-5.2.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.2/ed60d4287d18996bc940f26656c570532b20d863/asm-debug-all-5.2-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.typesafe.akka/akka-actor_2.11/2.3.3/ed62e9fc709ca0f2ff1a3220daa8b70a2870078e/akka-actor_2.11-2.3.3.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.typesafe.akka/akka-actor_2.11/2.3.3/9dbceb71c4fd943b4eb4607847261075a989d47f/akka-actor_2.11-2.3.3-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.typesafe/config/1.2.1/f771f71fdae3df231bcd54d5ca2d57f0bf93f467/config-1.2.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.typesafe/config/1.2.1/bdacf4f82ce9b29cd474bfde2e91eeb0ca623d28/config-1.2.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors-migration_2.11/1.1.0/dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f/scala-actors-migration_2.11-1.1.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors-migration_2.11/1.1.0/6bccac72dae4d369537e313d12087c1ca295e84f/scala-actors-migration_2.11-1.1.0-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-compiler/2.11.1/56ea2e6c025e0821f28d73ca271218b8dd04926a/scala-compiler-2.11.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-compiler/2.11.1/b031d401aabbf7f5f725db500575da3dff90065f/scala-compiler-2.11.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-library_2.11/1.0.2/e517c53a7e9acd6b1668c5a35eccbaa3bab9aac/scala-continuations-library_2.11-1.0.2.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-library_2.11/1.0.2/495afc106eeaa1b3367f6be0bc3768c398e4d360/scala-continuations-library_2.11-1.0.2-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-plugin_2.11.1/1.0.2/f361a3283452c57fa30c1ee69448995de23c60f7/scala-continuations-plugin_2.11.1-1.0.2.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-plugin_2.11.1/1.0.2/c6f3c092ab731f3cf83fdb376ebc465a243c1f4c/scala-continuations-plugin_2.11.1-1.0.2-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-library/2.11.1/e11da23da3eabab9f4777b9220e60d44c1aab6a/scala-library-2.11.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-library/2.11.1/8355e4b6841f772a287167666bad6e9860ac4d3c/scala-library-2.11.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-parser-combinators_2.11/1.0.1/f05d7345bf5a58924f2837c6c1f4d73a938e1ff0/scala-parser-combinators_2.11-1.0.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-parser-combinators_2.11/1.0.1/34d013c02d0b73794ba2911552896dd9c00f34c3/scala-parser-combinators_2.11-1.0.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-reflect/2.11.1/6580347e61cc7f8e802941e7fde40fa83b8badeb/scala-reflect-2.11.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-reflect/2.11.1/d4c5628e197a0d6af8e9b93a9be32190c547bc8a/scala-reflect-2.11.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-swing_2.11/1.0.1/b1cdd92bd47b1e1837139c1c53020e86bb9112ae/scala-swing_2.11-1.0.1.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-swing_2.11/1.0.1/d4bda4281db2ec74b105c5acf2326d160b79164e/scala-swing_2.11-1.0.1-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-xml_2.11/1.0.2/820fbca7e524b530fdadc594c39d49a21ea0337e/scala-xml_2.11-1.0.2.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-xml_2.11/1.0.2/312c3557d1ca0b34820f3b3fc5404a47936ceb26/scala-xml_2.11-1.0.2-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/lzma/lzma/0.0.1/521616dc7487b42bef0e803bd2fa3faf668101d7/lzma-0.0.1.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.sf.trove4j/trove4j/3.0.3/42ccaf4761f0dfdfa805c9e340d99a755907e2dd/trove4j-3.0.3.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.sf.trove4j/trove4j/3.0.3/109c5be93362e6e651e417c51d1863477a22969c/trove4j-3.0.3-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/codecjorbis/20101023/c73b5636faf089d9f00e8732a829577de25237ee/codecjorbis-20101023.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/codecjorbis/20101023/4ca2436396bc14ebd78b7db1d4e11ca607c8705e/codecjorbis-20101023-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/codecwav/20101023/12f031cfe88fef5c1dd36c563c0a3a69bd7261da/codecwav-20101023.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/codecwav/20101023/71ec00b9b9c1a6a2c3a8a25f481a23ddb5b21ddb/codecwav-20101023-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/libraryjavasound/20101123/5c5e304366f75f9eaa2e8cca546a1fb6109348b3/libraryjavasound-20101123.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/libraryjavasound/20101123/945ff5711de27751cf699641d1ea316ba6cf7589/libraryjavasound-20101123-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/librarylwjglopenal/20100824/73e80d0794c39665aec3f62eee88ca91676674ef/librarylwjglopenal-20100824.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/librarylwjglopenal/20100824/ecfc8dac1d41bef748997e4edf563d486923ee1e/librarylwjglopenal-20100824-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/soundsystem/20120107/419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6/soundsystem-20120107.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/com.paulscode/soundsystem/20120107/1b9f4eb11ef11fede7fd76a2e5e8203c2a8adcd/soundsystem-20120107-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput/2.0.5/39c7796b469a600f72380316f6b1f11db6c2c7c4/jinput-2.0.5.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput/2.0.5/82604cfeb87b9ab70ed70aa19a137de8ceb21504/jinput-2.0.5-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl/2.9.4-nightly-20150209/697517568c68e78ae0b4544145af031c81082dfe/lwjgl-2.9.4-nightly-20150209.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl/2.9.4-nightly-20150209/7da2cff65127b558a66e8e38456174161723d3a7/lwjgl-2.9.4-nightly-20150209-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl_util/2.9.4-nightly-20150209/d51a7c040a721d13efdfbd34f8b257b2df882ad0/lwjgl_util-2.9.4-nightly-20150209.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl_util/2.9.4-nightly-20150209/2e3787f55c68a245e994f88755795b3a7684b3/lwjgl_util-2.9.4-nightly-20150209-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/java3d/vecmath/1.5.2/79846ba34cbd89e2422d74d53752f993dcc2ccaf/vecmath-1.5.2.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/java3d/vecmath/1.5.2/42442b23189fbef9353c1751055610b63dd57e85/vecmath-1.5.2-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/ca.weblite/java-objc-bridge/1.0.0/6ef160c3133a78de015830860197602ca1c855d3/java-objc-bridge-1.0.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/ca.weblite/java-objc-bridge/1.0.0/865837a198189aee737019561ece842827f24278/java-objc-bridge-1.0.0-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/655c643309c2f45a56a747fda70e3fadf57e9f11/jansi-1.11.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/2f0e4b53b6b0eec426dad7118bf54b3deb58000b/jansi-1.11-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors/2.11.0/8ccfb6541de179bb1c4d45cf414acee069b7f78b/scala-actors-2.11.0.jar" sourcepath="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors/2.11.0/e1dfa274766d5278166b0d660294fe96396693b2/scala-actors-2.11.0-sources.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/7ff832a6eb9ab6a767f1ade2b548092d0fa64795/jinput-platform-2.0.5-natives-linux.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/385ee093e01f587f30ee1c8a2ee7d408fd732e16/jinput-platform-2.0.5-natives-windows.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/53f9c919f34d2ca9de8c51fc4e1e8282029a9232/jinput-platform-2.0.5-natives-osx.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/931074f46c795d2f7b30ed6395df5715cfd7675b/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/bcab850f8f487c3f4c4dbabde778bb82bd1a40ed/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar"/>
- <classpathentry kind="lib" path="C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.12-14.21.1.2443/start"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/minecraft/deobfedDeps/deobf/mezz/jei/jei_1.12/4.7.5.86/jei_1.12-4.7.5.86.jar" sourcepath="C:/Users/Tyler/.gradle/caches/minecraft/deobfedDeps/deobf/mezz/jei/jei_1.12/4.7.5.86/jei_1.12-4.7.5.86-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/minecraft/deobfedDeps/deobf/com/github/Azanor/Baubles/master-SNAPSHOT/Baubles-master-SNAPSHOT.jar" sourcepath="C:/Users/Tyler/.gradle/caches/minecraft/deobfedDeps/deobf/com/github/Azanor/Baubles/master-SNAPSHOT/Baubles-master-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/minecraft/net/minecraftforge/forge/1.12-14.21.1.2443/snapshot/20170801/forgeSrc-1.12-14.21.1.2443.jar" sourcepath="C:/Users/Tyler/.gradle/caches/minecraft/net/minecraftforge/forge/1.12-14.21.1.2443/snapshot/20170801/forgeSrc-1.12-14.21.1.2443-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/f7be08ec23c21485b9b5a1cf1654c2ec8c58168d/jsr305-3.0.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/a2926c057ca3b662b9db194c869bdbe7d3bb8aef/jsr305-3.0.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.mojang/patchy/1.1/aef610b34a1be37fa851825f12372b78424d8903/patchy-1.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.mojang/patchy/1.1/5e398295fbcb8fb590e3e3bddace13f659792e50/patchy-1.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/oshi-project/oshi-core/1.1/9ddf7b048a8d701be231c0f4f95fd986198fd2d8/oshi-core-1.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/oshi-project/oshi-core/1.1/1ec1ab1e6ac5a1572edfd0dd9ac95e83684b8a65/oshi-core-1.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/4.4.0/cb208278274bf12ebdb56c61bd7407e6f774d65a/jna-4.4.0.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/jna/4.4.0/9d45d3dc35711eef7267d8b4fc2c0dc482ef9fd2/jna-4.4.0-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/platform/3.4.0/e3f70017be8100d3d6923f50b3d2ee17714e9c13/platform-3.4.0.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.dev.jna/platform/3.4.0/2f42653596d0044f0ab456620cba54c9cf53c5ca/platform-3.4.0-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.ibm.icu/icu4j-core-mojang/51.2/63d216a9311cca6be337c1e458e587f99d382b84/icu4j-core-mojang-51.2.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.ibm.icu/icu4j-core-mojang/51.2/814397ccbafff1132758e551c37396c528d7f2d7/icu4j-core-mojang-51.2-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.sf.jopt-simple/jopt-simple/5.0.3/cdd846cfc4e0f7eefafc02c0f5dce32b9303aa2a/jopt-simple-5.0.3.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.sf.jopt-simple/jopt-simple/5.0.3/36d4348605fd4605d36c8641495f3e78756e454b/jopt-simple-5.0.3-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/io.netty/netty-all/4.1.9.Final/97860965d6a0a6b98e7f569f3f966727b8db75/netty-all-4.1.9.Final.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/io.netty/netty-all/4.1.9.Final/69b921f5e296428c88c2ea4418e630443a699b06/netty-all-4.1.9.Final-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/21.0/3a3d111be1be1b745edfa7d91678a12d7ed38709/guava-21.0.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/21.0/b9ed26b8c23fe7cd3e6b463b34e54e5c6d9536d5/guava-21.0-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.5/6c6c702c89bfff3cd9e80b04d668c5e190d588c6/commons-lang3-3.5.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-lang3/3.5/f7d878153e86a1cdddf6b37850e00a9f8bff726f/commons-lang3-3.5-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.5/2852e6e05fbb95076fc091f6d1780f1f8fe35e0f/commons-io-2.5.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/commons-io/commons-io/2.5/caf033a4a7c37b4a8ff3ea084cba591539b0b69/commons-io-2.5-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/4b95f4897fa13f2cd904aee711aeafc0c5295cd8/commons-codec-1.10.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/11fb3d88ae7e3b757d70237064210ceb954a5a04/commons-codec-1.10-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/e12fe1fda814bd348c1579329c86943d2cd3c6a6/jutils-1.0.0.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.jutils/jutils/1.0.0/d18678a00b216863206a1bb6190507e02a32971b/jutils-1.0.0-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/c4ba5371a29ac9b2ad6129b1d39ea38750043eff/gson-2.8.0.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/baf95d8519fc1a11d388f8543cb40cd2bb9d66dc/gson-2.8.0-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.25/9834cdf236c22e84b946bba989e2f94ef5897c3c/authlib-1.5.25.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.mojang/authlib/1.5.25/18840707f662a3236542716fff61c659584f3e6c/authlib-1.5.25-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.mojang/realms/1.10.17/e6a623bf93a230b503b0e3ae18c196fcd5aa3299/realms-1.10.17.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/a698750c16740fd5b3871425f4cb3bbaa87f529d/commons-compress-1.8.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.commons/commons-compress/1.8.1/3caea4421428752206c7a94c3e3097f0c47f1bb8/commons-compress-1.8.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/18f4247ff4572a074444572cee34647c43e7c9c7/httpclient-4.3.3.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/65cba03c4f6207f2885f88206fcf52c53f8d111b/httpclient-4.3.3-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f/commons-logging-1.1.3.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/28bb0405fddaf04f15058fbfbe01fe2780d7d3b6/commons-logging-1.1.3-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/31fbbff1ddbf98f3aa7377c94d33b0447c646b6e/httpcore-4.3.2.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/4809f38359edeea9487f747e09aa58ec8d3a54c5/httpcore-4.3.2-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/7.1.0/9835253257524c1be7ab50c057aa2d418fb72082/fastutil-7.1.0.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/it.unimi.dsi/fastutil/7.1.0/4a33438326f2fea664656d63d655c349d4131e14/fastutil-7.1.0-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.8.1/e801d13612e22cad62a3f4f3fe7fdbe6334a8e72/log4j-api-2.8.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-api/2.8.1/a5edb6b8c77843c8be98e0cb1f875699e76ee122/log4j-api-2.8.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.8.1/4ac28ff2f1ddf05dae3043a190451e8c46b73c31/log4j-core-2.8.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.apache.logging.log4j/log4j-core/2.8.1/a0a7f683da620c345b502fff04d1e46cde2e8d9/log4j-core-2.8.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.mojang/text2speech/1.10.3/48fd510879dff266c3815947de66e3d4809f8668/text2speech-1.10.3.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.mojang/text2speech/1.10.3/404339fe43d1011ee046a249b0ec7ae9ce04a834/text2speech-1.10.3-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.12/111e7bea9c968cdb3d06ef4632bf7ff0824d0f36/launchwrapper-1.12.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.minecraft/launchwrapper/1.12/fd80cad9a1b967ce2ff20529dc54e520d5338d7/launchwrapper-1.12-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/jline/jline/2.13/2d9530d0a25daffaffda7c35037b046b627bb171/jline-2.13.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/jline/jline/2.13/e290282bf7683ae3307e85bdc5d5e08424dfb893/jline-2.13-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.2/3354e11e2b34215f06dab629ab88e06aca477c19/asm-debug-all-5.2.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.ow2.asm/asm-debug-all/5.2/ed60d4287d18996bc940f26656c570532b20d863/asm-debug-all-5.2-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.typesafe.akka/akka-actor_2.11/2.3.3/ed62e9fc709ca0f2ff1a3220daa8b70a2870078e/akka-actor_2.11-2.3.3.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.typesafe.akka/akka-actor_2.11/2.3.3/9dbceb71c4fd943b4eb4607847261075a989d47f/akka-actor_2.11-2.3.3-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.typesafe/config/1.2.1/f771f71fdae3df231bcd54d5ca2d57f0bf93f467/config-1.2.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.typesafe/config/1.2.1/bdacf4f82ce9b29cd474bfde2e91eeb0ca623d28/config-1.2.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors-migration_2.11/1.1.0/dfa8bc42b181d5b9f1a5dd147f8ae308b893eb6f/scala-actors-migration_2.11-1.1.0.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors-migration_2.11/1.1.0/6bccac72dae4d369537e313d12087c1ca295e84f/scala-actors-migration_2.11-1.1.0-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-compiler/2.11.1/56ea2e6c025e0821f28d73ca271218b8dd04926a/scala-compiler-2.11.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-compiler/2.11.1/b031d401aabbf7f5f725db500575da3dff90065f/scala-compiler-2.11.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-library_2.11/1.0.2/e517c53a7e9acd6b1668c5a35eccbaa3bab9aac/scala-continuations-library_2.11-1.0.2.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-library_2.11/1.0.2/495afc106eeaa1b3367f6be0bc3768c398e4d360/scala-continuations-library_2.11-1.0.2-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-plugin_2.11.1/1.0.2/f361a3283452c57fa30c1ee69448995de23c60f7/scala-continuations-plugin_2.11.1-1.0.2.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.plugins/scala-continuations-plugin_2.11.1/1.0.2/c6f3c092ab731f3cf83fdb376ebc465a243c1f4c/scala-continuations-plugin_2.11.1-1.0.2-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-library/2.11.1/e11da23da3eabab9f4777b9220e60d44c1aab6a/scala-library-2.11.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-library/2.11.1/8355e4b6841f772a287167666bad6e9860ac4d3c/scala-library-2.11.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-parser-combinators_2.11/1.0.1/f05d7345bf5a58924f2837c6c1f4d73a938e1ff0/scala-parser-combinators_2.11-1.0.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-parser-combinators_2.11/1.0.1/34d013c02d0b73794ba2911552896dd9c00f34c3/scala-parser-combinators_2.11-1.0.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-reflect/2.11.1/6580347e61cc7f8e802941e7fde40fa83b8badeb/scala-reflect-2.11.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-reflect/2.11.1/d4c5628e197a0d6af8e9b93a9be32190c547bc8a/scala-reflect-2.11.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-swing_2.11/1.0.1/b1cdd92bd47b1e1837139c1c53020e86bb9112ae/scala-swing_2.11-1.0.1.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-swing_2.11/1.0.1/d4bda4281db2ec74b105c5acf2326d160b79164e/scala-swing_2.11-1.0.1-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-xml_2.11/1.0.2/820fbca7e524b530fdadc594c39d49a21ea0337e/scala-xml_2.11-1.0.2.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang.modules/scala-xml_2.11/1.0.2/312c3557d1ca0b34820f3b3fc5404a47936ceb26/scala-xml_2.11-1.0.2-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/lzma/lzma/0.0.1/521616dc7487b42bef0e803bd2fa3faf668101d7/lzma-0.0.1.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.sf.trove4j/trove4j/3.0.3/42ccaf4761f0dfdfa805c9e340d99a755907e2dd/trove4j-3.0.3.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.sf.trove4j/trove4j/3.0.3/109c5be93362e6e651e417c51d1863477a22969c/trove4j-3.0.3-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/codecjorbis/20101023/c73b5636faf089d9f00e8732a829577de25237ee/codecjorbis-20101023.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/codecjorbis/20101023/4ca2436396bc14ebd78b7db1d4e11ca607c8705e/codecjorbis-20101023-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/codecwav/20101023/12f031cfe88fef5c1dd36c563c0a3a69bd7261da/codecwav-20101023.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/codecwav/20101023/71ec00b9b9c1a6a2c3a8a25f481a23ddb5b21ddb/codecwav-20101023-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/libraryjavasound/20101123/5c5e304366f75f9eaa2e8cca546a1fb6109348b3/libraryjavasound-20101123.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/libraryjavasound/20101123/945ff5711de27751cf699641d1ea316ba6cf7589/libraryjavasound-20101123-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/librarylwjglopenal/20100824/73e80d0794c39665aec3f62eee88ca91676674ef/librarylwjglopenal-20100824.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/librarylwjglopenal/20100824/ecfc8dac1d41bef748997e4edf563d486923ee1e/librarylwjglopenal-20100824-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/soundsystem/20120107/419c05fe9be71f792b2d76cfc9b67f1ed0fec7f6/soundsystem-20120107.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/com.paulscode/soundsystem/20120107/1b9f4eb11ef11fede7fd76a2e5e8203c2a8adcd/soundsystem-20120107-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput/2.0.5/39c7796b469a600f72380316f6b1f11db6c2c7c4/jinput-2.0.5.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput/2.0.5/82604cfeb87b9ab70ed70aa19a137de8ceb21504/jinput-2.0.5-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl/2.9.4-nightly-20150209/697517568c68e78ae0b4544145af031c81082dfe/lwjgl-2.9.4-nightly-20150209.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl/2.9.4-nightly-20150209/7da2cff65127b558a66e8e38456174161723d3a7/lwjgl-2.9.4-nightly-20150209-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl_util/2.9.4-nightly-20150209/d51a7c040a721d13efdfbd34f8b257b2df882ad0/lwjgl_util-2.9.4-nightly-20150209.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl_util/2.9.4-nightly-20150209/2e3787f55c68a245e994f88755795b3a7684b3/lwjgl_util-2.9.4-nightly-20150209-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/java3d/vecmath/1.5.2/79846ba34cbd89e2422d74d53752f993dcc2ccaf/vecmath-1.5.2.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/java3d/vecmath/1.5.2/42442b23189fbef9353c1751055610b63dd57e85/vecmath-1.5.2-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/ca.weblite/java-objc-bridge/1.0.0/6ef160c3133a78de015830860197602ca1c855d3/java-objc-bridge-1.0.0.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/ca.weblite/java-objc-bridge/1.0.0/865837a198189aee737019561ece842827f24278/java-objc-bridge-1.0.0-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/655c643309c2f45a56a747fda70e3fadf57e9f11/jansi-1.11.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.fusesource.jansi/jansi/1.11/2f0e4b53b6b0eec426dad7118bf54b3deb58000b/jansi-1.11-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors/2.11.0/8ccfb6541de179bb1c4d45cf414acee069b7f78b/scala-actors-2.11.0.jar" sourcepath="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.scala-lang/scala-actors/2.11.0/e1dfa274766d5278166b0d660294fe96396693b2/scala-actors-2.11.0-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/7ff832a6eb9ab6a767f1ade2b548092d0fa64795/jinput-platform-2.0.5-natives-linux.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/385ee093e01f587f30ee1c8a2ee7d408fd732e16/jinput-platform-2.0.5-natives-windows.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/net.java.jinput/jinput-platform/2.0.5/53f9c919f34d2ca9de8c51fc4e1e8282029a9232/jinput-platform-2.0.5-natives-osx.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/b84d5102b9dbfabfeb5e43c7e2828d98a7fc80e0/lwjgl-platform-2.9.4-nightly-20150209-natives-windows.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/931074f46c795d2f7b30ed6395df5715cfd7675b/lwjgl-platform-2.9.4-nightly-20150209-natives-linux.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/modules-2/files-2.1/org.lwjgl.lwjgl/lwjgl-platform/2.9.4-nightly-20150209/bcab850f8f487c3f4c4dbabde778bb82bd1a40ed/lwjgl-platform-2.9.4-nightly-20150209-natives-osx.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/Documents/Tinkers-Defense/libs/Baubles-1.12-1.5.1-api.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/Documents/Tinkers-Defense/libs/Mantle-1.12-1.3.1.DEV.75b9d4b-deobf.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/Documents/Tinkers-Defense/libs/Mantle-1.12-1.3.1.DEV.75b9d4b-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/Documents/Tinkers-Defense/libs/TConstruct-1.12-2.7.2.DEV.6bffdee-deobf.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/Documents/Tinkers-Defense/libs/TConstruct-1.12-2.7.2.DEV.6bffdee-lib.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/Documents/Tinkers-Defense/libs/TConstruct-1.12-2.7.2.DEV.6bffdee-sources.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/minecraft/deobfedDeps/compileDummy.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/minecraft/deobfedDeps/providedDummy.jar"/>
+ <classpathentry kind="lib" path="C:/Users/Tyler/.gradle/caches/minecraft/net/minecraftforge/forge/1.12-14.21.1.2443/start"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/.project b/.project
index 4697c2a..905c79d 100644
--- a/.project
+++ b/.project
@@ -2,21 +2,23 @@
<projectDescription>
<name>Tinkers-Defense</name>
<comment></comment>
- <projects/>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+ <projects>
+ </projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
- <arguments/>
+ <arguments>
+ </arguments>
</buildCommand>
</buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
<linkedResources>
<link>
- <name>.link1</name>
+ <name>.link0</name>
<type>2</type>
- <location>C:/Users/T/.gradle/caches/minecraft/net/minecraftforge/forge/1.12-14.21.1.2443/start</location>
+ <location>C:/Users/Tyler/.gradle/caches/minecraft/net/minecraftforge/forge/1.12-14.21.1.2443/start</location>
</link>
</linkedResources>
</projectDescription>
diff --git a/Tinkers-Defense_Client.launch b/Tinkers-Defense_Client.launch
index 8ef933c..cb798e1 100644
--- a/Tinkers-Defense_Client.launch
+++ b/Tinkers-Defense_Client.launch
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/><stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Tinkers-Defense"/><stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\Users\T\Documents\Tinkers-Defense\run"/><stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value=" -DFORGE_FORCE_FRAME_RECALC=true"/></launchConfiguration> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/><stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Tinkers-Defense"/><stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\Users\Tyler\Documents\Tinkers-Defense\run"/><stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value=" -DFORGE_FORCE_FRAME_RECALC=true"/></launchConfiguration> \ No newline at end of file
diff --git a/Tinkers-Defense_Server.launch b/Tinkers-Defense_Server.launch
index 3cf3f1c..08bc534 100644
--- a/Tinkers-Defense_Server.launch
+++ b/Tinkers-Defense_Server.launch
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/><stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Tinkers-Defense"/><stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\Users\T\Documents\Tinkers-Defense\run"/><stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value=" -DFORGE_FORCE_FRAME_RECALC=true"/></launchConfiguration> \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/><stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Tinkers-Defense"/><stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\Users\Tyler\Documents\Tinkers-Defense\run"/><stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value=" -DFORGE_FORCE_FRAME_RECALC=true"/></launchConfiguration> \ No newline at end of file
diff --git a/src/main/java/lance5057/tDefense/TinkersDefense.java b/src/main/java/lance5057/tDefense/TinkersDefense.java
index 40b9177..6a734d9 100644
--- a/src/main/java/lance5057/tDefense/TinkersDefense.java
+++ b/src/main/java/lance5057/tDefense/TinkersDefense.java
@@ -315,6 +315,7 @@ public class TinkersDefense {
// {
// ArmorAddon.postInit(e);
// }
+ mats.postInit(e);
parts.postInit(e);
//armor.postInit(e);
tools.postInit(e);
diff --git a/src/main/java/lance5057/tDefense/core/items/TDOreDictItem.java b/src/main/java/lance5057/tDefense/core/items/TDOreDictItem.java
index 9934d1d..6cb6bc6 100644
--- a/src/main/java/lance5057/tDefense/core/items/TDOreDictItem.java
+++ b/src/main/java/lance5057/tDefense/core/items/TDOreDictItem.java
@@ -1,10 +1,11 @@
package lance5057.tDefense.core.items;
+import java.awt.Color;
import java.util.ArrayList;
import java.util.List;
import lance5057.tDefense.core.CoreBase;
-import lance5057.tDefense.util.TDMatHelper;
+import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -14,18 +15,20 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class TDOreDictItem extends Item {
String prefix;
-
+
public List<String> mats = new ArrayList<String>();
+ public List<Integer> colors = new ArrayList<Integer>();
- public TDOreDictItem(String pre, List<String> materials_master) {
+ public TDOreDictItem(String pre, List<String> materials_master, List<Integer> materials_colors) {
setUnlocalizedName(pre + "_meta");
setRegistryName(pre + "_meta");
prefix = pre;
mats = materials_master;
+ colors = materials_colors;
this.setCreativeTab(CoreBase.tab);
this.hasSubtypes = true;
}
-
+
public boolean isOreDict() {
return true;
}
@@ -33,7 +36,7 @@ public class TDOreDictItem extends Item {
public String getOreDictPrefix() {
return prefix;
}
-
+
@SideOnly(Side.CLIENT)
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
@@ -41,16 +44,29 @@ public class TDOreDictItem extends Item {
items.add(new ItemStack(this, 1, i));
}
}
-
- public ItemStack getItembyName(String name)
- {
- for(int i = 0; i < mats.size(); i++)
- {
- if(mats.get(i).equals(name))
- {
+
+ public ItemStack getItembyName(String name) {
+ for (int i = 0; i < mats.size(); i++) {
+ if (mats.get(i).equals(name)) {
return new ItemStack(this, 1, i);
}
}
return null;
}
+
+ public int getColor(ItemStack i) {
+ return colors.get(i.getMetadata());
+ }
+
+ public static class ColorHandler implements IItemColor {
+ @Override
+ public int getColorFromItemstack(ItemStack stack, int tintIndex) {
+ if (tintIndex == 0) {
+ if (stack.getItem() instanceof TDOreDictItem) {
+ return ((TDOreDictItem) stack.getItem()).getColor(stack);
+ }
+ }
+ return 0xFFFFFF;
+ }
+ }
}
diff --git a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java
index 3460dae..5d06384 100644
--- a/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java
+++ b/src/main/java/lance5057/tDefense/core/materials/TDMaterials.java
@@ -37,6 +37,7 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.oredict.OreDictionary;
@@ -99,21 +100,25 @@ public class TDMaterials {
// 0xff0000);
// public static FluidMolten fluidGreenCandy = new FluidMolten("greencandy",
// 0x00ff00);
- public static FluidMolten fluidVile = fluids.put("vile", (FluidMolten) new FluidMolten("vile", 0x111111).setTemperature(0));
+ public static FluidMolten fluidVile = fluids.put("vile",
+ (FluidMolten) new FluidMolten("vile", 0x111111).setTemperature(0));
// public static FluidMolten fluidSinisterium = new
// FluidMolten("sinisterium", 0x210000);
// public static FluidMolten fluidNihilite = new FluidMolten("nihilite",
// 0x000021);
public static FluidMolten fluidVibrant = fluids.put("vibrant", new FluidMolten("vibrant", 0x76ff00));
- public static FluidMolten fluidSlush = fluids.put("slush", (FluidMolten) new FluidMolten("slush", 0xbfefff).setTemperature(0));
- public static FluidMolten fluidQuartz = fluids.put("quartz", (FluidMolten) new FluidMolten("quartz", 0xdddddd).setTemperature(75));
+ public static FluidMolten fluidSlush = fluids.put("slush",
+ (FluidMolten) new FluidMolten("slush", 0xbfefff).setTemperature(0));
+ public static FluidMolten fluidQuartz = fluids.put("quartz",
+ (FluidMolten) new FluidMolten("quartz", 0xdddddd).setTemperature(75));
// public static FluidMolten fluidOrichalcum = new FluidMolten("orichalcum",
// 0xffc700);
// public static FluidMolten fluidPandorium = new FluidMolten("pandorium",
// 0x7f6a00);
- public static FluidMolten fluidChorusJuice = fluids.put("chorusjuice", new FluidMolten("chorusjuice", 0xd982ff));
- public static FluidMolten fluidDragonsBreath = fluids.put("dragonsbreath", new FluidMolten("dragonsbreath", 0x7f00b7));
+ public static FluidMolten fluidChorusJuice = fluids.put("chorusjuice", new FluidMolten("chorusjuice", 0xd982ff));
+ public static FluidMolten fluidDragonsBreath = fluids.put("dragonsbreath",
+ new FluidMolten("dragonsbreath", 0x7f00b7));
// public static FluidMolten fluidRoseGold = new FluidMolten("rosegold",
// 0xff9b84);
// public static FluidMolten fluidPlatinum = new FluidMolten("platinum",
@@ -132,87 +137,78 @@ public class TDMaterials {
List<TDMatHelper> materials_base = new ArrayList<>(Arrays.asList(
new TDMatHelper("aeonsteel", 0xa470e0, fluids.put("aeonsteel", new FluidMolten("aeonsteel", 0xa470e0)))
.setHead(new HeadMaterialStats(500, 15.00f, 4.0f, HarvestLevels.COBALT))
- .setHandle(new HandleMaterialStats(1.1f, 0))
- .setExtra(new ExtraMaterialStats(50))
- .setShield(new ShieldMaterialStats(500, 33))
- .setBow(new BowMaterialStats(0.75f, 1.0f, 2.5f)),
+ .setHandle(new HandleMaterialStats(1.1f, 0)).setExtra(new ExtraMaterialStats(50))
+ .setShield(new ShieldMaterialStats(500, 33)).setBow(new BowMaterialStats(0.75f, 1.0f, 2.5f)),
new TDMatHelper("queensgold", 0xdcff00, fluids.put("queensgold", new FluidMolten("queensgold", 0xdcff00)))
.setHead(new HeadMaterialStats(70, 3.00f, 3.00f, HarvestLevels.IRON))
- .setHandle(new HandleMaterialStats(1.05f, 35))
- .setExtra(new ExtraMaterialStats(20))
- .setShield(new ShieldMaterialStats(70, 33))
- .setBow(new BowMaterialStats(1.1f, 1.0f, 0.5f)),
+ .setHandle(new HandleMaterialStats(1.05f, 35)).setExtra(new ExtraMaterialStats(20))
+ .setShield(new ShieldMaterialStats(70, 33)).setBow(new BowMaterialStats(1.1f, 1.0f, 0.5f)),
new TDMatHelper("dogbearium", 0x6d3300, fluids.put("dogbearium", new FluidMolten("dogbearium", 0x6d3300)))
.setHead(new HeadMaterialStats(150, 5.00f, 9.00f, HarvestLevels.DIAMOND))
- .setHandle(new HandleMaterialStats(0.85f, 75))
- .setExtra(new ExtraMaterialStats(75))
- .setShield(new ShieldMaterialStats(70, 33))
- .setBow(new BowMaterialStats(0.1f, 0.5f, 5.5f)),
- new TDMatHelper("sinisterium", 0x210000, fluids.put("sinisterium",new FluidMolten("sinisterium", 0x210000))),
- new TDMatHelper("nihilite", 0x000021, fluids.put("nihilite",new FluidMolten("nihilite", 0x000021))),
- new TDMatHelper("orichalcum", 0xffc700, fluids.put("orichalcum",new FluidMolten("orichalcum", 0xffc700))),
- new TDMatHelper("pandorium", 0x7f6a00, fluids.put("pandorium",new FluidMolten("pandorium", 0x7f6a00))),
- new TDMatHelper("rosegold", 0xff9b84, fluids.put("rosegold",new FluidMolten("rosegold", 0xff9b84))),
- new TDMatHelper("platinum", 0xe8e8e8, fluids.put("platinum",new FluidMolten("platinum", 0xe8e8e8))),
- new TDMatHelper("brass", 0xdbb332, fluids.put("brass",new FluidMolten("brass", 0xdbb332))),
+ .setHandle(new HandleMaterialStats(0.85f, 75)).setExtra(new ExtraMaterialStats(75))
+ .setShield(new ShieldMaterialStats(70, 33)).setBow(new BowMaterialStats(0.1f, 0.5f, 5.5f)),
+ new TDMatHelper("sinisterium", 0x210000,
+ fluids.put("sinisterium", new FluidMolten("sinisterium", 0x210000))),
+ new TDMatHelper("nihilite", 0x000021, fluids.put("nihilite", new FluidMolten("nihilite", 0x000021))),
+ new TDMatHelper("orichalcum", 0xffc700, fluids.put("orichalcum", new FluidMolten("orichalcum", 0xffc700))),
+ new TDMatHelper("pandorium", 0x7f6a00, fluids.put("pandorium", new FluidMolten("pandorium", 0x7f6a00))),
+ new TDMatHelper("rosegold", 0xff9b84, fluids.put("rosegold", new FluidMolten("rosegold", 0xff9b84))),
+ new TDMatHelper("platinum", 0xe8e8e8, fluids.put("platinum", new FluidMolten("platinum", 0xe8e8e8))),
+ new TDMatHelper("brass", 0xdbb332, fluids.put("brass", new FluidMolten("brass", 0xdbb332))),
// new TDMatHelper("silver", 0x9e9e9e, new FluidMolten("silver",
// 0x9e9e9e)),
- new TDMatHelper("valyriansteel", 0xe2d9e2, fluids.put("valyriansteel",new FluidMolten("valyriansteel", 0xe2d9e2))),
- new TDMatHelper("froststeel", 0xc6dcff, fluids.put("froststeel",new FluidMolten("froststeel", 0xc6dcff))),
- new TDMatHelper("resonatingcrystal", 0xffffff, fluids.put("resonatingcrystal",new FluidMolten("resonatingcrystal", 0xffffff))),
- new TDMatHelper("pureardite", 0xff4300, fluids.put("pureardite",new FluidMolten("pureardite", 0xff4300))),
- new TDMatHelper("purecobalt", 0x547eff, fluids.put("purecobalt",new FluidMolten("purecobalt", 0x547eff))),
- new TDMatHelper("puremanyullyn", 0xd044ff, fluids.put("puremanyullyn",new FluidMolten("puremanyullyn", 0xd044ff))),
+ new TDMatHelper("valyriansteel", 0xe2d9e2,
+ fluids.put("valyriansteel", new FluidMolten("valyriansteel", 0xe2d9e2))),
+ new TDMatHelper("froststeel", 0xc6dcff, fluids.put("froststeel", new FluidMolten("froststeel", 0xc6dcff))),
+ new TDMatHelper("resonatingcrystal", 0xffffff,
+ fluids.put("resonatingcrystal", new FluidMolten("resonatingcrystal", 0xffffff))),
+ new TDMatHelper("pureardite", 0xff4300, fluids.put("pureardite", new FluidMolten("pureardite", 0xff4300))),
+ new TDMatHelper("purecobalt", 0x547eff, fluids.put("purecobalt", new FluidMolten("purecobalt", 0x547eff))),
+ new TDMatHelper("puremanyullyn", 0xd044ff,
+ fluids.put("puremanyullyn", new FluidMolten("puremanyullyn", 0xd044ff))),
new TDMatHelper("glass", 0xffffff, TinkerFluids.glass),
// new TDMatHelper("ice", 0xdcff00, new FluidMolten("queensgold",
// 0xdcff00)),
- new TDMatHelper("purifiedgold", 0xffe242, fluids.put("purifiedgold", new FluidMolten("purifiedgold", 0xffe242))),
- new TDMatHelper("purifiedsilver", 0xefefef, fluids.put("purifiedsilver", new FluidMolten("purifiedsilver", 0xefefef)))));
+ new TDMatHelper("purifiedgold", 0xffe242,
+ fluids.put("purifiedgold", new FluidMolten("purifiedgold", 0xffe242))),
+ new TDMatHelper("purifiedsilver", 0xefefef,
+ fluids.put("purifiedsilver", new FluidMolten("purifiedsilver", 0xefefef)))));
// Jokes
- List<TDMatHelper> materials_joke = new ArrayList<>(
- Arrays.asList(new TDMatHelper("cheese", 0xffe900, fluids.put("cheese",new FluidMolten("cheese", 0xffe900))),
- new TDMatHelper("bread", 0x89732a),
- new TDMatHelper("melon", 0xff77a4)));
+ List<TDMatHelper> materials_joke = new ArrayList<>(Arrays.asList(
+ new TDMatHelper("cheese", 0xffe900, fluids.put("cheese", new FluidMolten("cheese", 0xffe900))),
+ new TDMatHelper("bread", 0x89732a), new TDMatHelper("melon", 0xff77a4)));
// Holiday
List<TDMatHelper> materials_xmas = new ArrayList<>(
- Arrays.asList(new TDMatHelper("redcandy", 0xff0000),
- new TDMatHelper("greencandy", 0x00ff00)));
+ Arrays.asList(new TDMatHelper("redcandy", 0xff0000), new TDMatHelper("greencandy", 0x00ff00)));
// Gems
List<TDMatHelper> materials_gems = new ArrayList<>(
- Arrays.asList(new TDMatHelper("sapphire", 0x6e00ff),
- new TDMatHelper("ruby", 0xff0061, true),
- new TDMatHelper("emerald", 0x16cc4f, true),
- new TDMatHelper("diamond", 0x96ecf2, true),
- new TDMatHelper("starsapphire", 0x6e00ff, true),
- new TDMatHelper("starruby", 0xff0061, true),
- new TDMatHelper("citrine", 0xffe877, true),
- new TDMatHelper("ghasttear", 0xe8fbff, true),
- new TDMatHelper("quartz", 0xede8e8, true),
- new TDMatHelper("glowstonecrystal", 0xfff956, true),
- new TDMatHelper("enderpearl", 0x2bad3a, true),
- new TDMatHelper("amethyst", 0xb436e2, true),
- new TDMatHelper("lapis", 0x4349bc, true),
- new TDMatHelper("topaz", 0xffc551, true),
- new TDMatHelper("garnet", 0x9e1c1c, true),
- new TDMatHelper("opal", 0xe2e2e2, true),
- new TDMatHelper("tanzanite", 0x8860e5, true),
- new TDMatHelper("amber", 0xdba827, true)));
-
- //Cornucopia
- List<TDMatHelper> materials_cornucopia = new ArrayList<>(
- Arrays.asList(new TDMatHelper("gallite", 0x198c09, fluids.put("gallite",new FluidMolten("gallite", 0x198c09))),
- new TDMatHelper("sundrop", 0xfff987, fluids.put("sundrop",new FluidMolten("sundrop", 0xfff987))),
- new TDMatHelper("voidite", 0x450059, fluids.put("voidite",new FluidMolten("voidite", 0x450059))),
- new TDMatHelper("solarium", 0xffff31, fluids.put("solarium",new FluidMolten("solarium", 0xffff31))),
- new TDMatHelper("dragonsteel", 0x55914d, fluids.put("dragonsteel",new FluidMolten("dragonsteel", 0x55914d))),
- new TDMatHelper("blacksteel", 0x383838, fluids.put("blacksteel",new FluidMolten("blacksteel", 0x383838))),
- new TDMatHelper("abyssalium", 0x000633, fluids.put("abyssalium",new FluidMolten("abyssalium", 0x000633))),
- new TDMatHelper("depthsilver", 0x646782, fluids.put("depthsilver",new FluidMolten("depthsilver", 0x646782))),
- new TDMatHelper("moonsilver", 0x777777, fluids.put("moonsilver",new FluidMolten("moonsilver", 0x777777))),
- new TDMatHelper("novagold", 0xffc300, fluids.put("novagold",new FluidMolten("novagold", 0xffc300)))));
+ Arrays.asList(new TDMatHelper("sapphire", 0x6e00ff), new TDMatHelper("ruby", 0xff0061, true),
+ new TDMatHelper("emerald", 0x16cc4f, true), new TDMatHelper("diamond", 0x96ecf2, true),
+ new TDMatHelper("starsapphire", 0x6e00ff, true), new TDMatHelper("starruby", 0xff0061, true),
+ new TDMatHelper("citrine", 0xffe877, true), new TDMatHelper("ghasttear", 0xe8fbff, true),
+ new TDMatHelper("quartz", 0xede8e8, true), new TDMatHelper("glowstonecrystal", 0xfff956, true),
+ new TDMatHelper("enderpearl", 0x2bad3a, true), new TDMatHelper("amethyst", 0xb436e2, true),
+ new TDMatHelper("lapis", 0x4349bc, true), new TDMatHelper("topaz", 0xffc551, true),
+ new TDMatHelper("garnet", 0x9e1c1c, true), new TDMatHelper("opal", 0xe2e2e2, true),
+ new TDMatHelper("tanzanite", 0x8860e5, true), new TDMatHelper("amber", 0xdba827, true)));
+
+ // Cornucopia
+ List<TDMatHelper> materials_cornucopia = new ArrayList<>(Arrays.asList(
+ new TDMatHelper("gallite", 0x198c09, fluids.put("gallite", new FluidMolten("gallite", 0x198c09))),
+ new TDMatHelper("sundrop", 0xfff987, fluids.put("sundrop", new FluidMolten("sundrop", 0xfff987))),
+ new TDMatHelper("voidite", 0x450059, fluids.put("voidite", new FluidMolten("voidite", 0x450059))),
+ new TDMatHelper("solarium", 0xffff31, fluids.put("solarium", new FluidMolten("solarium", 0xffff31))),
+ new TDMatHelper("dragonsteel", 0x55914d,
+ fluids.put("dragonsteel", new FluidMolten("dragonsteel", 0x55914d))),
+ new TDMatHelper("blacksteel", 0x383838, fluids.put("blacksteel", new FluidMolten("blacksteel", 0x383838))),
+ new TDMatHelper("abyssalium", 0x000633, fluids.put("abyssalium", new FluidMolten("abyssalium", 0x000633))),
+ new TDMatHelper("depthsilver", 0x646782,
+ fluids.put("depthsilver", new FluidMolten("depthsilver", 0x646782))),
+ new TDMatHelper("moonsilver", 0x777777, fluids.put("moonsilver", new FluidMolten("moonsilver", 0x777777))),
+ new TDMatHelper("novagold", 0xffc300, fluids.put("novagold", new FluidMolten("novagold", 0xffc300)))));
// // Blood Magic
// List<String> materials_bm = new ArrayList<>(
// Arrays.asList("blankslate", "reinforcedslate", "imbued", "demonic",
@@ -233,11 +229,11 @@ public class TDMaterials {
public static TDOreDictItem grain;
public static TDOreDictItem gem;
-// public static final AbstractTrait axelover = new TraitAxeLover();
-// public static final AbstractTrait dulling = new TraitDulling();
-// public static final AbstractTrait firestarter = new TraitFirestarter();
-// public static final AbstractTrait barbed = new TraitBarbed();
- //public static final AbstractTrait dogtoy = new TraitDogToy();
+ // public static final AbstractTrait axelover = new TraitAxeLover();
+ // public static final AbstractTrait dulling = new TraitDulling();
+ // public static final AbstractTrait firestarter = new TraitFirestarter();
+ // public static final AbstractTrait barbed = new TraitBarbed();
+ // public static final AbstractTrait dogtoy = new TraitDogToy();
static ArrayList<Item> itemList = new ArrayList<Item>();
static ArrayList<Block> blockList = new ArrayList<Block>();
@@ -291,16 +287,16 @@ public class TDMaterials {
this.materials_master.addAll(materials_gems);
if (TinkersDefense.config.materials.enableCornucopiaMaterials)
this.materials_master.addAll(materials_cornucopia);
-// if (TinkersDefense.config.materials.enableTwilightForestMaterials)
-// this.materials_master.addAll(materials_tf);
-// if (TinkersDefense.config.materials.enableBloodMagicMaterials)
-// this.materials_master.addAll(materials_bm);
-// if (TinkersDefense.config.materials.enableHarvestCraftMaterials)
-// this.materials_master.addAll(materials_pam);
+ // if (TinkersDefense.config.materials.enableTwilightForestMaterials)
+ // this.materials_master.addAll(materials_tf);
+ // if (TinkersDefense.config.materials.enableBloodMagicMaterials)
+ // this.materials_master.addAll(materials_bm);
+ // if (TinkersDefense.config.materials.enableHarvestCraftMaterials)
+ // this.materials_master.addAll(materials_pam);
- nugget = new TDOreDictItem("nugget", getMatNames(materials_master));
- dust = new TDOreDictItem("dust", getMatNames(materials_master));
- grain = new TDOreDictItem("grain", getMatNames(materials_master));
+ nugget = new TDOreDictItem("nugget", getMatNames(materials_master), getMatColors(materials_master));
+ dust = new TDOreDictItem("dust", getMatNames(materials_master), getMatColors(materials_master));
+ grain = new TDOreDictItem("grain", getMatNames(materials_master), getMatColors(materials_master));
List<TDMatHelper> gemMaster = new ArrayList<TDMatHelper>();
List<TDMatHelper> ingotMaster = new ArrayList<TDMatHelper>();
@@ -312,8 +308,33 @@ public class TDMaterials {
ingotMaster.add(i);
}
- gem = new TDOreDictItem("gem", getMatNames(gemMaster));
- ingot = new TDOreDictItem("ingot", getMatNames(ingotMaster));
+ gem = new TDOreDictItem("gem", getMatNames(gemMaster), getMatColors(gemMaster));
+ ingot = new TDOreDictItem("ingot", getMatNames(ingotMaster), getMatColors(ingotMaster));
+
+ for (int i = 0; i < ingot.mats.size(); i++) {
+ TinkersDefense.proxy.registerItemRenderer(ingot, i, "ingot");
+ event.getModLog().info("Registered ingot:" + ingot.mats.get(i) + " at metadata: " + i);
+ }
+
+ for (int i = 0; i < gem.mats.size(); i++) {
+ TinkersDefense.proxy.registerItemRenderer(gem, i, "gem");
+ event.getModLog().info("Registered gem:" + gem.mats.get(i) + " at metadata: " + i);
+ }
+
+ for (int i = 0; i < dust.mats.size(); i++) {
+ TinkersDefense.proxy.registerItemRenderer(dust, i, "dust");
+ event.getModLog().info("Registered dust:" + dust.mats.get(i) + " at metadata: " + i);
+ }
+
+ for (int i = 0; i < nugget.mats.size(); i++) {
+ TinkersDefense.proxy.registerItemRenderer(nugget, i, "nugget");
+ event.getModLog().info("Registered nugget:" + nugget.mats.get(i) + " at metadata: " + i);
+ }
+
+ for (int i = 0; i < grain.mats.size(); i++) {
+ TinkersDefense.proxy.registerItemRenderer(grain, i, "grain");
+ event.getModLog().info("Registered grain:" + grain.mats.get(i) + " at metadata: " + i);
+ }
Material.UNKNOWN.addStats(new ShieldMaterialStats(35, 33));
@@ -323,21 +344,24 @@ public class TDMaterials {
// TinkerRegistry.addMaterialStats(Material.UNKNOWN,
// new ShieldMaterialStats(35, 33));
TinkerRegistry.addMaterialStats(TinkerMaterials.wood, new ShieldMaterialStats(35, 33));
- //TinkerMaterials.wood.addTrait(axelover, SHIELD);
+ // TinkerMaterials.wood.addTrait(axelover, SHIELD);
TinkerRegistry.addMaterialStats(TinkerMaterials.stone, new ShieldMaterialStats(120, 33));
// TinkerRegistry.addMaterialTrait(TinkerMaterials.stone, dulling,
// SHIELD);
- //TinkerMaterials.stone.addTrait(dulling, SHIELD);
+ // TinkerMaterials.stone.addTrait(dulling, SHIELD);
TinkerRegistry.addMaterialStats(TinkerMaterials.flint, new ShieldMaterialStats(150, 33));
- //TinkerRegistry.addMaterialTrait(TinkerMaterials.flint, firestarter, SHIELD);
+ // TinkerRegistry.addMaterialTrait(TinkerMaterials.flint, firestarter,
+ // SHIELD);
TinkerRegistry.addMaterialStats(TinkerMaterials.cactus, new ShieldMaterialStats(210, 33));
- //TinkerRegistry.addMaterialTrait(TinkerMaterials.cactus, barbed, SHIELD);
+ // TinkerRegistry.addMaterialTrait(TinkerMaterials.cactus, barbed,
+ // SHIELD);
TinkerRegistry.addMaterialStats(TinkerMaterials.bone, new ShieldMaterialStats(200, 33));
- //TinkerRegistry.addMaterialTrait(TinkerMaterials.bone, dogtoy, SHIELD);
+ // TinkerRegistry.addMaterialTrait(TinkerMaterials.bone, dogtoy,
+ // SHIELD);
TinkerRegistry.addMaterialStats(TinkerMaterials.obsidian, new ShieldMaterialStats(139, 33));
TinkerRegistry.addMaterialStats(TinkerMaterials.prismarine, new ShieldMaterialStats(430, 33));
@@ -374,16 +398,13 @@ public class TDMaterials {
TinkerRegistry.addMaterialStats(TinkerMaterials.electrum, new ShieldMaterialStats(50, 33));
TinkerRegistry.addMaterialStats(TinkerMaterials.steel, new ShieldMaterialStats(540, 33));
-
- for(String s: fluids.keySet())
- {
+
+ for (String s : fluids.keySet()) {
createFluid(s, fluids.get(s));
FluidRegistry.registerFluid(fluids.get(s));
FluidRegistry.addBucketForFluid(fluids.get(s));
-
- }
-
+ }
for (TDMatHelper m : materials_master) {
createMaterial(m);
@@ -391,70 +412,46 @@ public class TDMaterials {
// TAIGA TEST
// Collection<Material> mats = TinkerRegistry.getAllMaterials();
- for (Material i : TinkerRegistry.getAllMaterials()) {
- if (!i.hasStats(SHIELD)) {
- if (i.hasStats(MaterialTypes.HEAD)) {
- int dur = ((HeadMaterialStats) i.getStats(MaterialTypes.HEAD)).durability;
- i.addStats(new ShieldMaterialStats(dur, 33));
+ for (Material m : TinkerRegistry.getAllMaterials()) {
+ if (!m.hasStats(SHIELD)) {
+ if (m.hasStats(MaterialTypes.HEAD)) {
+ int dur = ((HeadMaterialStats) m.getStats(MaterialTypes.HEAD)).durability;
+ m.addStats(new ShieldMaterialStats(dur, 33));
}
}
}
registerClothMaterials();
-
-// createFluid("vibrant", fluidVibrant);
-// FluidRegistry.registerFluid(fluidVibrant);
-// FluidRegistry.addBucketForFluid(fluidVibrant);
-//
-// createFluid("vile", fluidVile);
-// FluidRegistry.registerFluid(fluidVile);
-// FluidRegistry.addBucketForFluid(fluidVile);
-//
-// createFluid("chorusjuice", fluidChorusJuice);
-// FluidRegistry.registerFluid(fluidChorusJuice);
-// FluidRegistry.addBucketForFluid(fluidChorusJuice);
-//
-// createFluid("dragonsbreath", fluidDragonsBreath);
-// FluidRegistry.registerFluid(fluidDragonsBreath);
-// FluidRegistry.addBucketForFluid(fluidDragonsBreath);
-//
-
-
- // integrate(materials, materialIntegrations, deferredMaterials);
-
}
void createMaterial(TDMatHelper tdmat) {
Material mat = new Material(tdmat.name, tdmat.color);
- if(tdmat.isGem)
- {
+ if (tdmat.isGem) {
mat.addItem("gem" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
mat.addItem(gem.getItembyName(tdmat.name), 1, Material.VALUE_Ingot);
- }
- else
+ } else
mat.addItem("ingot" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
mat.addItem("nugget" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
mat.addItem("dust" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
mat.addItem("grain" + tdmat.name.substring(0, 1).toUpperCase() + tdmat.name.substring(1));
-
-
- if(tdmat.isGem)
+
+ if (tdmat.isGem)
mat.setCraftable(true).setCastable(false);
else
mat.setCraftable(false).setCastable(true);
TinkersDefense.proxy.registerMatColor(mat, tdmat.color);
-// if (tdmat.fluid != null) {
-// createFluid(tdmat.name, tdmat.fluid);
-// tdmat.fluid.setTemperature(800);
- FluidMolten f = fluids.get(tdmat.name);
- if(f != null)
- mat.setFluid(f);
-// }
+ // if (tdmat.fluid != null) {
+ // createFluid(tdmat.name, tdmat.fluid);
+ // tdmat.fluid.setTemperature(800);
+ FluidMolten f = fluids.get(tdmat.name);
+ if (f != null)
+ mat.setFluid(f);
+ // }
ItemStack i;
- if(tdmat.isGem)
+ if (tdmat.isGem)
i = gem.getItembyName(tdmat.name);
else
i = ingot.getItembyName(tdmat.name);
@@ -473,11 +470,11 @@ public class TDMaterials {
if (tdm.head != null)
TinkerRegistry.addMaterialStats(m, tdm.head);
else
- TinkerRegistry.addMaterialStats(m, new HeadMaterialStats(0,0,0,0));
+ TinkerRegistry.addMaterialStats(m, new HeadMaterialStats(0, 0, 0, 0));
if (tdm.handle != null)
TinkerRegistry.addMaterialStats(m, tdm.handle);
else
- TinkerRegistry.addMaterialStats(m, new HandleMaterialStats(0,0));
+ TinkerRegistry.addMaterialStats(m, new HandleMaterialStats(0, 0));
if (tdm.extra != null)
TinkerRegistry.addMaterialStats(m, tdm.extra);
else
@@ -524,45 +521,88 @@ public class TDMaterials {
OreDictionary.registerOre(
"gem" + gem.mats.get(i).substring(0, 1).toUpperCase() + gem.mats.get(i).substring(1),
new ItemStack(gem, 1, i));
-
+
TinkerRegistry.registerMelting(Items.CHORUS_FRUIT, fluids.get("chorusjuice"), Material.VALUE_Nugget);
TinkerRegistry.registerMelting(Items.DRAGON_BREATH, fluids.get("dragonsbreath"), Material.VALUE_Ingot);
TinkerRegistry.registerMelting(TinkerCommons.matNecroticBone, fluids.get("vile"), Material.VALUE_Nugget);
TinkerRegistry.registerMelting(new ItemStack(Items.SKULL, 1, 1), fluids.get("vile"), Material.VALUE_Ingot);
- TinkerRegistry.registerMelting(TinkerCommons.matMendingMoss, fluids.get("vibrant"), Material.VALUE_Ingot*2);
+ TinkerRegistry.registerMelting(TinkerCommons.matMendingMoss, fluids.get("vibrant"), Material.VALUE_Ingot * 2);
TinkerRegistry.registerMelting(Blocks.ICE, fluids.get("slush"), Material.VALUE_Ingot);
- TinkerRegistry.registerMelting(Blocks.PACKED_ICE, fluids.get("slush"), Material.VALUE_Ingot*4);
- TinkerRegistry.registerMelting(Blocks.QUARTZ_BLOCK, fluids.get("quartz"), Material.VALUE_Ingot*4);
+ TinkerRegistry.registerMelting(Blocks.PACKED_ICE, fluids.get("slush"), Material.VALUE_Ingot * 4);
+ TinkerRegistry.registerMelting(Blocks.QUARTZ_BLOCK, fluids.get("quartz"), Material.VALUE_Ingot * 4);
TinkerRegistry.registerMelting(Items.QUARTZ, fluids.get("quartz"), Material.VALUE_Ingot);
- TinkerRegistry.registerTableCasting(new ItemStack(Items.QUARTZ, 1, 0), ItemStack.EMPTY, (Fluid)fluids.get("quartz"), Material.VALUE_Ingot);
-
- TinkerRegistry.registerBasinCasting(new ItemStack(Blocks.QUARTZ_BLOCK, 1, 0), ItemStack.EMPTY, (Fluid)fluids.get("quartz"), Material.VALUE_Ingot*4);
- TinkerRegistry.registerBasinCasting(new ItemStack(Blocks.ICE, 1, 0), ItemStack.EMPTY, (Fluid)fluids.get("slush"), Material.VALUE_Ingot);
-
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("aeonsteel"), 4), new FluidStack(fluids.get("chorusjuice"), 1), new FluidStack(TinkerFluids.cobalt, 3));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("queensgold"), 2), new FluidStack(TinkerFluids.gold, 1), new FluidStack(TinkerFluids.knightslime, 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("dogbearium"), 4), new FluidStack(TinkerFluids.ardite, 1), new FluidStack(fluids.get("dragonsbreath"), 3));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("sinisterium"), 6), new FluidStack(TinkerFluids.blood, 1), new FluidStack(fluids.get("vile"), 2), new FluidStack(TinkerFluids.iron, 4));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("nihilite"), 3), new FluidStack(TinkerFluids.cobalt, 1), new FluidStack(fluids.get("vile"), 2));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("orichalcum"), 6), new FluidStack(TinkerFluids.bronze, 4), new FluidStack(fluids.get("vibrant"), 2), new FluidStack(TinkerFluids.gold, 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("pandorium"), 3), new FluidStack(TinkerFluids.ardite, 1), new FluidStack(fluids.get("vibrant"), 2));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("rosegold"), 4), new FluidStack(TinkerFluids.gold, 1), new FluidStack(TinkerFluids.copper, 3));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("brass"), 3), new FluidStack(TinkerFluids.copper, 2), new FluidStack(TinkerFluids.zinc, 2));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("valyriansteel"), 4), new FluidStack(TinkerFluids.steel, 2), new FluidStack(TinkerFluids.obsidian, 2), new FluidStack(fluids.get("dragonsbreath"), 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("froststeel"), 4), new FluidStack(TinkerFluids.steel, 2), new FluidStack(TinkerFluids.cobalt, 2), new FluidStack(fluids.get("slush"), 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("pureardite"), 1), new FluidStack(TinkerFluids.ardite, 1), new FluidStack(fluids.get("dragonsbreath"), 2), new FluidStack(TinkerFluids.blood, 2), new FluidStack(fluids.get("purifiedgold"), 2));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("purecobalt"), 1), new FluidStack(TinkerFluids.cobalt, 1), new FluidStack(fluids.get("dragonsbreath"), 2), new FluidStack(fluids.get("slush"), 2), new FluidStack(fluids.get("purifiedsilver"), 2));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("puremanyullyn"), 2), new FluidStack(fluids.get("pureardite"), 1), new FluidStack(fluids.get("purecobalt"), 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("purifiedgold"), 1), new FluidStack(TinkerFluids.gold, 1), new FluidStack(fluids.get("quartz"), 8), new FluidStack(TinkerFluids.glass, 2), new FluidStack(TinkerFluids.purpleSlime, 2));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("purifiedsilver"), 1), new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("quartz"), 8), new FluidStack(TinkerFluids.glass, 2), new FluidStack(TinkerFluids.purpleSlime, 2));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("solarium"), 1), new FluidStack(TinkerFluids.steel, 1), new FluidStack(fluids.get("sundrop"), 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("dragonsteel"), 1), new FluidStack(TinkerFluids.steel, 1), new FluidStack(fluids.get("gallite"), 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("blacksteel"), 1), new FluidStack(TinkerFluids.steel, 1), new FluidStack(fluids.get("voidite"), 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("abyssalium"), 1), new FluidStack(fluids.get("voidite"), 1), new FluidStack(fluids.get("sundrop"), 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("depthsilver"), 1), new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("abyssalium"), 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("moonsilver"), 1), new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("voidite"), 1));
- TinkerRegistry.registerAlloy(new FluidStack(fluids.get("novagold"), 1), new FluidStack(TinkerFluids.gold, 1), new FluidStack(fluids.get("sundrop"), 1));
+ TinkerRegistry.registerTableCasting(new ItemStack(Items.QUARTZ, 1, 0), ItemStack.EMPTY,
+ (Fluid) fluids.get("quartz"), Material.VALUE_Ingot);
+
+ TinkerRegistry.registerBasinCasting(new ItemStack(Blocks.QUARTZ_BLOCK, 1, 0), ItemStack.EMPTY,
+ (Fluid) fluids.get("quartz"), Material.VALUE_Ingot * 4);
+ TinkerRegistry.registerBasinCasting(new ItemStack(Blocks.ICE, 1, 0), ItemStack.EMPTY,
+ (Fluid) fluids.get("slush"), Material.VALUE_Ingot);
+
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("aeonsteel"), 4),
+ new FluidStack(fluids.get("chorusjuice"), 1), new FluidStack(TinkerFluids.cobalt, 3));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("queensgold"), 2), new FluidStack(TinkerFluids.gold, 1),
+ new FluidStack(TinkerFluids.knightslime, 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("dogbearium"), 4),
+ new FluidStack(TinkerFluids.ardite, 1), new FluidStack(fluids.get("dragonsbreath"), 3));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("sinisterium"), 6),
+ new FluidStack(TinkerFluids.blood, 1), new FluidStack(fluids.get("vile"), 2),
+ new FluidStack(TinkerFluids.iron, 4));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("nihilite"), 3), new FluidStack(TinkerFluids.cobalt, 1),
+ new FluidStack(fluids.get("vile"), 2));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("orichalcum"), 6),
+ new FluidStack(TinkerFluids.bronze, 4), new FluidStack(fluids.get("vibrant"), 2),
+ new FluidStack(TinkerFluids.gold, 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("pandorium"), 3), new FluidStack(TinkerFluids.ardite, 1),
+ new FluidStack(fluids.get("vibrant"), 2));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("rosegold"), 4), new FluidStack(TinkerFluids.gold, 1),
+ new FluidStack(TinkerFluids.copper, 3));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("brass"), 3), new FluidStack(TinkerFluids.copper, 2),
+ new FluidStack(TinkerFluids.zinc, 2));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("valyriansteel"), 4),
+ new FluidStack(TinkerFluids.steel, 2), new FluidStack(TinkerFluids.obsidian, 2),
+ new FluidStack(fluids.get("dragonsbreath"), 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("froststeel"), 4), new FluidStack(TinkerFluids.steel, 2),
+ new FluidStack(TinkerFluids.cobalt, 2), new FluidStack(fluids.get("slush"), 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("pureardite"), 1),
+ new FluidStack(TinkerFluids.ardite, 1), new FluidStack(fluids.get("dragonsbreath"), 2),
+ new FluidStack(TinkerFluids.blood, 2), new FluidStack(fluids.get("purifiedgold"), 2));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("purecobalt"), 1),
+ new FluidStack(TinkerFluids.cobalt, 1), new FluidStack(fluids.get("dragonsbreath"), 2),
+ new FluidStack(fluids.get("slush"), 2), new FluidStack(fluids.get("purifiedsilver"), 2));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("puremanyullyn"), 2),
+ new FluidStack(fluids.get("pureardite"), 1), new FluidStack(fluids.get("purecobalt"), 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("purifiedgold"), 1),
+ new FluidStack(TinkerFluids.gold, 1), new FluidStack(fluids.get("quartz"), 8),
+ new FluidStack(TinkerFluids.glass, 2), new FluidStack(TinkerFluids.purpleSlime, 2));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("purifiedsilver"), 1),
+ new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("quartz"), 8),
+ new FluidStack(TinkerFluids.glass, 2), new FluidStack(TinkerFluids.purpleSlime, 2));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("solarium"), 1), new FluidStack(TinkerFluids.steel, 1),
+ new FluidStack(fluids.get("sundrop"), 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("dragonsteel"), 1),
+ new FluidStack(TinkerFluids.steel, 1), new FluidStack(fluids.get("gallite"), 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("blacksteel"), 1), new FluidStack(TinkerFluids.steel, 1),
+ new FluidStack(fluids.get("voidite"), 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("abyssalium"), 1),
+ new FluidStack(fluids.get("voidite"), 1), new FluidStack(fluids.get("sundrop"), 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("depthsilver"), 1),
+ new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("abyssalium"), 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("moonsilver"), 1),
+ new FluidStack(TinkerFluids.silver, 1), new FluidStack(fluids.get("voidite"), 1));
+ TinkerRegistry.registerAlloy(new FluidStack(fluids.get("novagold"), 1), new FluidStack(TinkerFluids.gold, 1),
+ new FluidStack(fluids.get("sundrop"), 1));
+
+ }
+
+ @Subscribe
+ public void postInit(FMLPostInitializationEvent event) {
+ TinkersDefense.proxy.registerItemColorHandler(new TDOreDictItem.ColorHandler(), ingot);
+ TinkersDefense.proxy.registerItemColorHandler(new TDOreDictItem.ColorHandler(), gem);
+ TinkersDefense.proxy.registerItemColorHandler(new TDOreDictItem.ColorHandler(), dust);
+ TinkersDefense.proxy.registerItemColorHandler(new TDOreDictItem.ColorHandler(), nugget);
+ TinkersDefense.proxy.registerItemColorHandler(new TDOreDictItem.ColorHandler(), grain);
}
@SubscribeEvent
diff --git a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
index ea2a3c7..52aebf2 100644
--- a/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/ClientProxy.java
@@ -20,6 +20,8 @@ import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.StateMapperBase;
+import net.minecraft.client.renderer.color.IItemColor;
+import net.minecraft.client.renderer.color.ItemColors;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.client.resources.IReloadableResourceManager;
import net.minecraft.item.Item;
@@ -317,6 +319,14 @@ public class ClientProxy extends CommonProxy {
Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register(Item.getItemFromBlock(block), meta,
new ModelResourceLocation(Reference.MOD_ID + ":" + file, "inventory"));
}
+
+ @Override
+ public void registerItemColorHandler(IItemColor c, Item i)
+ {
+ ItemColors itemcolors = Minecraft.getMinecraft().getItemColors();
+ itemcolors.registerItemColorHandler(c, i);
+ }
+
public static class FluidStateMapper extends StateMapperBase implements ItemMeshDefinition {
diff --git a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
index a6b34ae..23505fd 100644
--- a/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
+++ b/src/main/java/lance5057/tDefense/proxy/CommonProxy.java
@@ -6,6 +6,9 @@ import lance5057.tDefense.armor.items.straps.ItemStrapsInv;
import lance5057.tDefense.armor.items.straps.StrapsContainer;
import lance5057.tDefense.armor.items.straps.StrapsGui;
import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.color.IItemColor;
+import net.minecraft.client.renderer.color.ItemColors;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.util.EnumHand;
@@ -20,97 +23,91 @@ import slimeknights.tconstruct.library.tools.ToolCore;
import slimeknights.tconstruct.library.tools.ToolPart;
@Mod.EventBusSubscriber(modid = Reference.MOD_ID)
-public class CommonProxy implements IGuiHandler
-{
- //public static ModifierSoulHandler SoulHandler = null;
-
- public void preInit()
- {
+public class CommonProxy implements IGuiHandler {
+ // public static ModifierSoulHandler SoulHandler = null;
+
+ public void preInit() {
}
- public void init()
- {
-
+ public void init() {
+
}
- public void registerTileEntitySpecialRenderer()
- {
+ public void registerTileEntitySpecialRenderer() {
}
-
- public void reloadRenderers()
- {
+
+ public void reloadRenderers() {
}
public void postInit() {
// TODO Auto-generated method stub
-
+
}
- public void registerToolModel(ToolCore tool)
- {
-
+ public void registerToolModel(ToolCore tool) {
+
}
-
- public void registerPartModel(ToolPart part)
- {
-
+
+ public void registerPartModel(ToolPart part) {
+
}
-
- public void registerMatColor(Material mat, int color)
- {
-
+
+ public void registerMatColor(Material mat, int color) {
+
}
-
+
@Override
- public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
- {
-// if(ID == TinkersDefense.GUI_CREST_INV)
-// return new Container_CrestMount(player.inventory,
-// (TileEntity_CrestMount) world.getTileEntity(new BlockPos(x, y, z)));
-// if(ID == TinkersDefense.GUI_ANVIL_INV)
-// return new Container_FinishingAnvil(player.inventory,
-// (TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
- if(ID == TinkersDefense.GUI_STRAPS_INV)
- return new StrapsContainer(player, player.inventory, new ItemStrapsInv(player.getHeldItem(EnumHand.MAIN_HAND)));
+ public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+ // if(ID == TinkersDefense.GUI_CREST_INV)
+ // return new Container_CrestMount(player.inventory,
+ // (TileEntity_CrestMount) world.getTileEntity(new BlockPos(x, y, z)));
+ // if(ID == TinkersDefense.GUI_ANVIL_INV)
+ // return new Container_FinishingAnvil(player.inventory,
+ // (TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
+ if (ID == TinkersDefense.GUI_STRAPS_INV)
+ return new StrapsContainer(player, player.inventory,
+ new ItemStrapsInv(player.getHeldItem(EnumHand.MAIN_HAND)));
return null;
}
@Override
- public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
- {
-// if(ID == TinkersDefense.GUI_CREST_INV)
-// return new Gui_CrestMount(player.inventory,
-// (TileEntity_CrestMount) world.getTileEntity(new BlockPos(x, y, z)));
-// if(ID == TinkersDefense.GUI_ANVIL_INV)
-// return new Gui_FinishingAnvil(player.inventory,
-// (TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
- if(ID == TinkersDefense.GUI_STRAPS_INV)
- return new StrapsGui((StrapsContainer) new StrapsContainer(player, player.inventory, new ItemStrapsInv(player.getHeldItem(EnumHand.MAIN_HAND))));
+ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+ // if(ID == TinkersDefense.GUI_CREST_INV)
+ // return new Gui_CrestMount(player.inventory,
+ // (TileEntity_CrestMount) world.getTileEntity(new BlockPos(x, y, z)));
+ // if(ID == TinkersDefense.GUI_ANVIL_INV)
+ // return new Gui_FinishingAnvil(player.inventory,
+ // (TileEntity_FinishingAnvil) world.getTileEntity(x, y, z));
+ if (ID == TinkersDefense.GUI_STRAPS_INV)
+ return new StrapsGui((StrapsContainer) new StrapsContainer(player, player.inventory,
+ new ItemStrapsInv(player.getHeldItem(EnumHand.MAIN_HAND))));
return null;
}
-
- public void registerItemRenderer(Item item, int meta, String id)
- {
-
+
+ public void registerItemRenderer(Item item, int meta, String id) {
+
}
-
- public void registerFluidModels(Fluid fluid)
- {
-
+
+ public void registerFluidModels(Fluid fluid) {
+
}
-
- public void registerItemBlockRenderer(Block block, int meta, String file)
+
+ public void registerItemBlockRenderer(Block block, int meta, String file) {
+
+ }
+
+ public void registerItemColorHandler(IItemColor c, Item i)
{
}
-
+
@SubscribeEvent
public static void registerItems(RegistryEvent.Register<Item> event) {
TinkersDefense.mats.registerItems(event);
- TinkersDefense.parts.registerItems(event);
+ TinkersDefense.parts.registerItems(event);
TinkersDefense.tools.registerItems(event);
}
}
diff --git a/src/main/resources/assets/tinkersdefense/models/item/dust.json b/src/main/resources/assets/tinkersdefense/models/item/dust.json
new file mode 100644
index 0000000..ca4941b
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/dust.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "tinkersdefense:items/dust"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/gem.json b/src/main/resources/assets/tinkersdefense/models/item/gem.json
new file mode 100644
index 0000000..8bbe97d
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/gem.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "tinkersdefense:items/gem"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/grain.json b/src/main/resources/assets/tinkersdefense/models/item/grain.json
new file mode 100644
index 0000000..e57d798
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/grain.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "tinkersdefense:items/grain"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/ingot.json b/src/main/resources/assets/tinkersdefense/models/item/ingot.json
new file mode 100644
index 0000000..52c638f
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/ingot.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "tinkersdefense:items/ingot"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/models/item/nugget.json b/src/main/resources/assets/tinkersdefense/models/item/nugget.json
new file mode 100644
index 0000000..f0efd2e
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/models/item/nugget.json
@@ -0,0 +1,6 @@
+{
+ "parent": "item/generated",
+ "textures": {
+ "layer0": "tinkersdefense:items/nugget"
+ }
+} \ No newline at end of file
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/dust.png b/src/main/resources/assets/tinkersdefense/textures/items/dust.png
new file mode 100644
index 0000000..520028e
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/dust.png
Binary files differ
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/gem.png b/src/main/resources/assets/tinkersdefense/textures/items/gem.png
new file mode 100644
index 0000000..7beed0e
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/gem.png
Binary files differ
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/grain.png b/src/main/resources/assets/tinkersdefense/textures/items/grain.png
new file mode 100644
index 0000000..6999cfd
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/grain.png
Binary files differ
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/ingot.png b/src/main/resources/assets/tinkersdefense/textures/items/ingot.png
new file mode 100644
index 0000000..9b1779e
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/ingot.png
Binary files differ
diff --git a/src/main/resources/assets/tinkersdefense/textures/items/nugget.png b/src/main/resources/assets/tinkersdefense/textures/items/nugget.png
new file mode 100644
index 0000000..864112f
--- /dev/null
+++ b/src/main/resources/assets/tinkersdefense/textures/items/nugget.png
Binary files differ